24 Mar, 2015
1 commit
25 Feb, 2014
1 commit
03 Jan, 2014
2 commits
16 Dec, 2013
1 commit
21 Aug, 2013
1 commit
24 Apr, 2013
1 commit
-
…into merge-requests/259 Conflicts: app/controllers/admin/environment_design_controller.rb
17 Apr, 2013
2 commits
-
Basically html_safe in some places that the stable branch had. Conflicts: app/models/article_block.rb app/models/tags_block.rb
16 Apr, 2013
1 commit
15 Apr, 2013
2 commits
-
ActionItem2608
-
ActionItem2608 Note: tests for users templates were made in the previous commit.
12 Apr, 2013
1 commit
-
ActionItem2608
05 Apr, 2013
1 commit
-
ActionItem2217
03 Apr, 2013
2 commits
-
…into merge-requests/275 Conflicts: test/unit/application_helper_test.rb
27 Mar, 2013
1 commit
15 Mar, 2013
1 commit
04 Mar, 2013
1 commit
-
(ActionItem2606)
18 Feb, 2013
1 commit
-
…into merge-requests/272
06 Feb, 2013
1 commit
-
closes ActionItem2567
30 Jan, 2013
2 commits
-
(ActionItem2560)
26 Jan, 2013
2 commits
22 Jan, 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
08 Jan, 2013
1 commit
03 Jan, 2013
3 commits
27 Dec, 2012
1 commit
-
It looks to me that this fixes all the problems that would happen at load time.
25 Dec, 2012
1 commit
23 Dec, 2012
1 commit
20 Dec, 2012
1 commit
-
(ActionItem2521)
19 Dec, 2012
1 commit
03 Dec, 2012
1 commit
-
Conflicts: lib/noosfero/plugin/settings.rb test/unit/plugin_settings_test.rb