10 Feb, 2014
1 commit
-
…into unb-gama/noosfero-AI2897-environment_theme
29 Jan, 2014
3 commits
28 Jan, 2014
2 commits
-
…into merge-requests/366 Conflicts: INSTALL script/install-dependencies/debian-squeeze.sh
-
…pa/noosfero-AI2786-like
23 Jan, 2014
4 commits
-
Conflicts: public/stylesheets/application.css
-
-Changed update_attribute to setting the attribute then 'save!' -Removed some whitespaces -The file controller/themes_controller.rb is needed because it is inherited by controller/my_profile/profile_themes_controller.rb and controller/admin/environment_themes_controller.rb, it is a generalization. Before this functionality was created, there was only one file called controller/my_profile/themes_controller.rb. (ActionItem2897) Signed-off-by: Alex de Souza <campelo.al1@gmail.com> Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com>
-
(ActionItem896)
22 Jan, 2014
1 commit
-
…into merge-requests/342 Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
21 Jan, 2014
1 commit
-
…into merge-requests/339 Conflicts: app/models/block.rb public/designs/icons/tango/style.css test/unit/block_test.rb
19 Jan, 2014
2 commits
-
- Added pagination to versions - Treating access denied and not found (ActionItem2822)
18 Jan, 2014
2 commits
-
(ActionItem2822) Signed-off-by: Daniela Feitosa Signed-off-by: Ana Losnak <analosnak@gmail.com> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
17 Jan, 2014
1 commit
15 Jan, 2014
3 commits
-
Conflicts: test/functional/cms_controller_test.rb test/unit/profile_test.rb
-
- Also included new db/schema - Removed unused partial (ActionItem2513)
-
(ActionItem2513) Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Tales Martins <tales.martins@gmail.com> Signed-off-by: Carlos Andre <carlos.andre.souza@msn.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
13 Jan, 2014
3 commits
07 Jan, 2014
2 commits
-
Conflicts: db/schema.rb test/unit/person_test.rb
06 Jan, 2014
2 commits
-
Conflicts: test/functional/memberships_controller_test.rb test/unit/person_test.rb
03 Jan, 2014
1 commit
02 Jan, 2014
1 commit
-
(ActionItem2910)
30 Dec, 2013
1 commit
18 Dec, 2013
2 commits
16 Dec, 2013
2 commits
-
…into merge-requests/425
13 Dec, 2013
2 commits
-
Enable options to display the main block at all pages and all pages except in the homepage.
12 Dec, 2013
3 commits
-
…into merge-requests/410
-
(ActionItem2849) Signed-off-by: Marcos Ramos <ms.ramos@outlook.com Signed-off-by: Valéssio Brito <contato@valessiobrito.com.br> Signed-off-by: Victor Hugo Alves de Carvalho <victorhugodf.ac@gmail.com>
03 Dec, 2013
1 commit
-
AI2824