27 Feb, 2013
2 commits
-
Conflicts: app/models/comment.rb app/views/layouts/application-ng.rhtml test/unit/category_test.rb
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
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
2 commits
-
(ActionItem2529)
02 Jan, 2013
1 commit
-
…into merge-requests/260
28 Dec, 2012
2 commits
27 Dec, 2012
1 commit
20 Dec, 2012
1 commit
-
(ActionItem2522)
18 Dec, 2012
1 commit
-
Also logging spammer when comment is marked as spam
13 Dec, 2012
2 commits
-
* first: returns the first non-blank result * first_plugin: returns the first plugin that answers true * dispatch_plugins: returns all plugins that answers true
12 Dec, 2012
2 commits
11 Dec, 2012
2 commits
-
Starting pluginization of solr!
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
16 Nov, 2012
1 commit
08 Nov, 2012
1 commit
-
(ActionItem2439)
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
5 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
1 commit
-
Features: * Move Article * Language Selection * Work Assignment Plugin