23 Apr, 2013
1 commit
-
Also fixing a typo
14 Mar, 2013
1 commit
19 Jan, 2013
1 commit
17 Jan, 2013
1 commit
-
Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb plugins/shopping_cart/lib/shopping_cart_plugin.rb plugins/shopping_cart/lib/shopping_cart_plugin/mailer.rb plugins/shopping_cart/views/shopping_cart_plugin/buy.html.erb plugins/shopping_cart/views/shopping_cart_plugin/mailer/customer_notification.html.erb plugins/shopping_cart/views/shopping_cart_plugin/mailer/supplier_notification.html.erb
16 Jan, 2013
1 commit
15 Jan, 2013
1 commit
03 Jan, 2013
3 commits
20 Dec, 2012
1 commit
-
(ActionItem2521)
19 Dec, 2012
1 commit
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
27 Nov, 2012
1 commit
-
Conflicts: test/functional/cms_controller_test.rb test/unit/article_test.rb
15 Nov, 2012
1 commit
08 Nov, 2012
1 commit
-
(ActionItem2439)
07 Nov, 2012
1 commit
04 Nov, 2012
5 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
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
3 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
-
(ActionItem2388)