13 Mar, 2014
3 commits
-
(ActionItem2928)
-
(ActionItem3021)
12 Mar, 2014
3 commits
-
-Added tests for ban user -Added also tests for activate/deactivate users -Added also tests for set admin role (ActionItem3021) Signed-off-by: Alex Campelo <campelo.al1@gmail.com> Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
-
(ActionItem3021) Signed-off-by: Alex Campelo <campelo.al1@gmail.com> Signed-off-by: Gustavo Jaruga <darksshades@hotmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
-
(ActionItemAI3021) Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
10 Mar, 2014
1 commit
07 Mar, 2014
1 commit
-
Conflicts: app/controllers/my_profile/profile_themes_controller.rb test/unit/comment_test.rb vendor/plugins/action_tracker_has_comments/init.rb
05 Mar, 2014
1 commit
-
Ai2943 Container Block Fixes Fix broken edition for container block with the new css for sideboxes view.
28 Feb, 2014
1 commit
-
…gama/noosfero into ActionItem2909-SortUsersAlphabetically
13 Feb, 2014
1 commit
12 Feb, 2014
1 commit
11 Feb, 2014
4 commits
-
(ActionItem2995)
-
Also adding a new assert helper to test the order of a collection without assuming all elements inside it. (ActionItem2996)
-
Don't render layout for javascript format This is the default behaviour for Rails when rendering .js.erb files. Check http://stackoverflow.com/questions/4060300/when-rendering-js-erb-file-it-renders-layout-with-the-javascript-is-it-a-bug
10 Feb, 2014
2 commits
-
…into unb-gama/noosfero-AI2897-environment_theme
05 Feb, 2014
1 commit
-
This is the default behaviour for Rails when rendering .js.erb files. Check http://stackoverflow.com/questions/4060300/when-rendering-js-erb-file-it-renders-layout-with-the-javascript-is-it-a-bug
31 Jan, 2014
1 commit
-
…into merge-requests/367 Conflicts: app/views/content_viewer/view_page.rhtml
28 Jan, 2014
1 commit
-
…into merge-requests/358
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>
21 Jan, 2014
2 commits
-
…into merge-requests/339 Conflicts: app/models/block.rb public/designs/icons/tango/style.css test/unit/block_test.rb
-
…into merge-requests/337 Conflicts: app/controllers/public/catalog_controller.rb app/helpers/application_helper.rb app/helpers/catalog_helper.rb app/views/catalog/index.rhtml public/stylesheets/application.css
19 Jan, 2014
2 commits
-
- Added pagination to versions - Treating access denied and not found (ActionItem2822)
18 Jan, 2014
6 commits
-
Removed setting as versioned column revert button is following the pattern styling link-this-page (ActionItem2822)
-
(ActionItem2822)
-
Also included revision number on cache key Signed-off-by: Daniela Feitosa (ActionItem2822)
-
(ActionItem2822) Signed-off-by: Daniela Feitosa Signed-off-by: Ana Losnak <analosnak@gmail.com> Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
16 Jan, 2014
1 commit
15 Jan, 2014
4 commits
-
Conflicts: test/functional/cms_controller_test.rb test/unit/profile_test.rb
-
(ActionItem2909) Signed-off-by: Alex Campelo <campelo.al1@gmail.com> Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> SIgned-off-by: Gabriela Navarro <navarro1703@gmail.com>
-
- Also fixed db/schema (ActionItem2852)
-
Conflicts: app/models/person.rb db/schema.rb