17 Dec, 2015
23 commits
-
(cherry picked from commit 148be8b6607f9ae29c1783793d87ff5e72c703f3)
-
(cherry picked from commit 6fb4392c2cb4e9b12b53e68dd7d3cce9d34d2d4d)
-
Conflicts: src/noosfero-spb/noosfero-spb-theme/css/community-pages.css
-
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
-
Conflicts: src/noosfero-spb/noosfero-spb-theme/css/news-page.css
-
Signed-off-by: Bruna Moreira <brunanayaramlima@gmail.com> Signed-off-by: Juliana Hilario <julianahdesousa@gmail.com>
-
Conflicts: src/noosfero-spb/noosfero-spb-theme/css/news-page.css
-
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> Signed-off-by: ArthurJahn <stutrzbecher@gmail.com> Signed-off-by: Bruna Moreira <brunanayaramlima@gmail.com> Signed-off-by: Juliana Hilario <julianahdesousa@gmail.com> Signed-off-by: Melissa Wen <melissa.srw@gmail.com> Signed-off-by: Pedro de Lyra Pereira <pedrodelyra@gmail.com> Conflicts solved: src/noosfero-spb/noosfero-spb-theme/css/search-pages.css
-
(cherry picked from commit de89ab95e102b86746efff35e6ed2b78d056f658)
-
(cherry picked from commit 0906bb6dab44aada8bada2ab1e15bd200e306ba4)
-
Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> (cherry picked from commit c9b158c7eed1be7e0dfa311d4dce4b861b4a64a5)
-
(cherry picked from commit 083c4e4aa26c0c7aa4c8c0eaeb2e6a566f5f4ba7)
-
- Adds message to warn that a rating has an institution with active ratings - Adds one hotspot to insert content on ratings task and another one to ratings container (used on ratings page and ratings block) - Adds number_to_human method to get better visualization for numbers - Makes the software tasks page closer to the prototype (changes in the divs, sizes and aligns). Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com> (cherry picked from commit 15a66159b6989ce6eb154fd9deed7160b9b8af12)
-
- Move software statistics from blocks table to softwares table - Update methods called on view to display software statistics - Software now automagically sums saved_resources and benefited people when the task is accepted - Adds one hotspot to insert content on ratings task and another one to ratings container (used on ratings page and ratings block) - Removes statistic block fields that are no longer used - Adds number_to_human method to get better visualization for numbers - Makes the software tasks page closer to the prototype (changes in the divs, sizes and aligns). - Fixed broken tests on software_profile_editor_controller Signed-off-by: Dylan Guedes <djmgguedes@gmail.com> Signed-off-by: Gabriel Silva <gabriel93.silva@gmail.com> Signed-off-by: Gustavo Coelho <gust.rod.coelho@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Tallys Martins <tallysmartins@gmail.com> Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com> (cherry picked from commit 53ef4b9015a78e895d869c755b2ab202fa266e4a)
03 Dec, 2015
6 commits
-
(cherry picked from commit b7d62204ec8eed133225f52472cf69f6f65753f1)
-
Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> (cherry picked from commit dce5c218a5c6f47111f340bffccceaa7efa9a5e0)
-
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> (cherry picked from commit 536d928816d7c6bac393142cb287319806d196bc)
-
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> (cherry picked from commit 6f2cc74ea7def2454531baebab64f1a4127150f9)
-
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> (cherry picked from commit c896d5f4cbd5265703e9f570d6d12099b32cc70b)
02 Dec, 2015
7 commits
-
- Added endpoint for Institution in gov_user - Removed community data from SoftwareInfo in software_communities - Software community endpoint restructured Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> (cherry picked from commit 69653c9105b7fbedd01814b17db62e9c930f0c9e)
-
solution - #412 (cherry picked from commit c73f1bbf2fe44d9e9dc5dccc110ff35f17f1c30b)
-
(cherry picked from commit 824fdd6dce229149c0943d0bfdba0a51e8e8bb3c)
-
(cherry picked from commit 80febdec65223ec1fb94837370e26e20c0897afb)
-
(cherry picked from commit 39a81339221392b6198ded567029b4326d2429ae)
-
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com> (cherry picked from commit 30933c38daf225e2508ac2cf14584491c6095cb5)
-
Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com> (cherry picked from commit 233bad74b659f283f61c64fac798bbfc0675a852)
25 Nov, 2015
3 commits
-
Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com> (cherry picked from commit 0d4a8d9838dadcbf6b54fb058fc04c6be71ee4f7) (cherry picked from commit dfd6263e9d63b98d7199991458492789aeaa4c79)
-
- Fix software edit informations - Fix software communities: better error handling Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br> Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com> Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com> (cherry picked from commit dc4912dfaf4d51d47ddc88967f5b6965b5221b5f)
-
Signed-off-by: Marcos Ronaldo <marcos.rpj2@gmail.com> Signed-off-by: Simião Carvalho <simiaosimis@gmail.com> (cherry picked from commit c31fef048a61dff9ed08b65db64f6e3becd9e1a9)
16 Nov, 2015
1 commit
-
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> (cherry picked from commit 97647ee7bfa4b936f57d377ce7d63f8c9c59cee5)