10 Dec, 2015
1 commit
09 Dec, 2015
2 commits
08 Dec, 2015
11 commits
-
(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
07 Dec, 2015
7 commits
-
(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)
-
Signed-off-by: Macartur Sousa <macartur.sc@gmail.com>
04 Dec, 2015
6 commits
-
This reverts commit 75ac7fa38d6f4c6c26a17c539359ce6ca0fc3e38.
-
This reverts commit 9ae30d6c543b88cfa37b3be94b2328a686ee2e60.
-
This reverts commit d93b189832d820a41f88caff1c393d111d2b29b2.
-
This reverts commit b3876839e61f6548aa74898c4f2fd0c676fe9e0d.
-
This reverts commit 546fbdb09a88a5a138e408d307471721d65c1556.
03 Dec, 2015
13 commits
-
Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com> Signed-off-by: Simião Carvalho <simiaosimis@gmail.com>
-
Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
-
Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com> Signed-off-by: Luiz Oliveira <ziuloliveira@gmail.com>
-
Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com>
-
Signed-off-by: Matheus Fernandes <matheus.souza.fernandes@gmail.com> Signed-off-by: Lucas Kanashiro <kanashiro.duarte@gmail.com> Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
-
(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: Carlos Oliveira <carlospecter@gmail.com>
-
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
-
Signed-off-by: Carlos Oliveira <carlospecter@gmail.com>
-
Signed-off-by: Carlos Oliveira <carlosoliveira@duzeru.org> Signed-off-by: Bruna Moreira <brunanayaramlima@gmail.com>
-
Signed-off-by: Carlos Oliveira <carlosoliveira@duzeru.org> Signed-off-by: Bruna Moreira <brunanayaramlima@gmail.com>