15 Mar, 2013
3 commits
-
…into merge-requests/253
-
…into merge-requests/171
07 Mar, 2013
1 commit
04 Mar, 2013
1 commit
-
(ActionItem2606)
18 Feb, 2013
1 commit
-
…into merge-requests/272
30 Jan, 2013
2 commits
-
(ActionItem2560)
26 Jan, 2013
3 commits
23 Jan, 2013
1 commit
-
ActionItem2556
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
08 Jan, 2013
1 commit
07 Jan, 2013
1 commit
-
…nto merge-requests/95 Since this patch is very old, I needed to fix the correction in the model a little. Also replaced the "profile2" variable name used to "author". Conflicts: app/models/comment.rb test/unit/comment_notifier_test.rb
03 Jan, 2013
4 commits
-
(ActionItem2529)
02 Jan, 2013
1 commit
-
…into merge-requests/260
28 Dec, 2012
2 commits
27 Dec, 2012
1 commit
20 Dec, 2012
3 commits
-
(ActionItem2522)
-
(ActionItem2521)
-
…into merge-requests/255
19 Dec, 2012
1 commit
18 Dec, 2012
1 commit
-
Also logging spammer when comment is marked as spam
12 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
30 Nov, 2012
4 commits
27 Nov, 2012
2 commits
-
Conflicts: test/functional/cms_controller_test.rb test/unit/article_test.rb