24 Apr, 2013
1 commit
-
…into merge-requests/259 Conflicts: app/controllers/admin/environment_design_controller.rb
20 Apr, 2013
1 commit
17 Apr, 2013
1 commit
-
Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb
05 Apr, 2013
2 commits
-
ActionItem2217
22 Mar, 2013
1 commit
15 Mar, 2013
1 commit
04 Mar, 2013
2 commits
-
(ActionItem2606)
30 Jan, 2013
1 commit
26 Jan, 2013
2 commits
23 Jan, 2013
2 commits
-
ActionItem2556
22 Jan, 2013
1 commit
21 Jan, 2013
1 commit
-
…pment into ActionItem2544
19 Jan, 2013
2 commits
-
ActionItem2540
15 Jan, 2013
1 commit
03 Jan, 2013
1 commit
20 Dec, 2012
1 commit
-
(ActionItem2521)
03 Dec, 2012
2 commits
-
Conflicts: lib/noosfero/plugin/settings.rb test/unit/plugin_settings_test.rb
-
…into merge-requests/248 Conflicts: app/models/person.rb app/views/catalog/index.rhtml public/stylesheets/application.css test/functional/catalog_controller_test.rb
30 Nov, 2012
1 commit
27 Nov, 2012
1 commit
-
Conflicts: test/functional/cms_controller_test.rb test/unit/article_test.rb
15 Nov, 2012
1 commit
07 Nov, 2012
1 commit
04 Nov, 2012
3 commits
-
Conflicts: app/sweepers/article_sweeper.rb db/schema.rb test/unit/environment_test.rb
01 Nov, 2012
4 commits
-
Features: * Move Article * Language Selection * Work Assignment Plugin
-
Conflicts: db/schema.rb test/functional/cms_controller_test.rb test/unit/article_test.rb
-
Conflicts: app/helpers/forms_helper.rb app/sweepers/article_sweeper.rb
-
Conflicts: db/schema.rb test/unit/environment_test.rb
29 Oct, 2012
2 commits
27 Oct, 2012
1 commit
-
Added field redirection_after_login on profiles and environments New db/schema Added a select to choose option to redirect on admin panel and on profile control panel (ActionItem2369)
25 Oct, 2012
3 commits
-
…into merge-requests/241