30 Nov, 2012
5 commits
-
Sorry, couldn't organize thing in micro-commits... =/
27 Nov, 2012
1 commit
-
Conflicts: test/functional/cms_controller_test.rb test/unit/article_test.rb
16 Nov, 2012
1 commit
15 Nov, 2012
1 commit
07 Nov, 2012
3 commits
-
This reverts commit b8920a1e95ef9e9d54527de691fbeb1b1921a27f. Conflicts: app/models/user.rb
-
Conflicts: debian/changelog lib/noosfero.rb
06 Nov, 2012
2 commits
-
This reverts commit 521420587c18163c55c790a2f5241489260cea38. is_template is not defined on stable version yet: "NoMethodError: undefined method `is_template?'"
04 Nov, 2012
9 commits
-
Conflicts: app/sweepers/article_sweeper.rb db/schema.rb test/unit/environment_test.rb
-
Added tests Added background on edition of profile to be easier to know which field the checkbox is related (ActionItem1717)
01 Nov, 2012
5 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
-
Conflicts: app/views/content_viewer/view_page.rhtml public/stylesheets/application.css
29 Oct, 2012
3 commits
-
Added field sigup_welcome_text on environment New tab on admin panel to edit the text When the environment doesn't have a text, will use the default text Added content_type to email (ActionItem2497)
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
7 commits
-
(ActionItem2388)
-
…into merge-requests/241
-
(ActionItem2495)
-
…into merge-requests/236
-
…into merge-requests/233 Conflicts: test/integration/routing_test.rb
24 Oct, 2012
2 commits
-
Conflicts: app/helpers/forms_helper.rb app/models/box.rb app/views/box_organizer/edit.rhtml db/schema.rb test/unit/box_test.rb
-
Conflicts: app/helpers/forms_helper.rb