20 Mar, 2013
1 commit
-
…into merge-requests/267 Conflicts: features/signup.feature features/step_definitions/noosfero_steps.rb Making tests on signup wait for the bot trap time and use selenium.
15 Mar, 2013
1 commit
-
…into merge-requests/160
08 Mar, 2013
1 commit
07 Mar, 2013
1 commit
-
Cucumber and selenium tests from plugins weren't running: I: no tests to run test:noosfero_plugins:cucumber I: no tests to run test:noosfero_plugins:selenium
06 Mar, 2013
1 commit
05 Mar, 2013
1 commit
28 Jan, 2013
1 commit
19 Jan, 2013
3 commits
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
2 commits
03 Jan, 2013
1 commit
20 Dec, 2012
1 commit
10 Dec, 2012
4 commits
07 Dec, 2012
1 commit
03 Dec, 2012
3 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
1 commit
01 Nov, 2012
1 commit
-
Conflicts: db/schema.rb test/functional/cms_controller_test.rb test/unit/article_test.rb
25 Oct, 2012
2 commits
-
…into merge-requests/233 Conflicts: test/integration/routing_test.rb
24 Oct, 2012
1 commit
22 Oct, 2012
1 commit
-
This patch extends the infra developed on the spaminator branch to build generic settings for plugin by allowing the setting to be instatiated with any model that supports settings (and respond to the method settings). This way a plugin can have any number of settings over any model instance like a Profile or an Article and not only the Environment. !! This might conflict with the commit that introduces this idea !! !! The commit is 7afc68410de26905e442714857effa3e3a13ad1a !!
21 Oct, 2012
1 commit
15 Oct, 2012
2 commits
-
…into merge-requests/218 Conflicts: lib/noosfero/plugin.rb
07 Oct, 2012
1 commit
-
…into merge-requests/213 Conflicts: app/controllers/application_controller.rb app/helpers/application_helper.rb app/views/content_viewer/_comment.rhtml app/views/content_viewer/view_page.rhtml lib/noosfero/plugin.rb test/functional/content_viewer_controller_test.rb test/unit/comment_test.rb
01 Oct, 2012
2 commits
-
Conflicts: po/pt/noosfero.po public/javascripts/application.js
13 Sep, 2012
1 commit
11 Sep, 2012
1 commit
06 Sep, 2012
2 commits
05 Sep, 2012
1 commit