11 Jul, 2013
1 commit
-
…into merge-requests/291
20 Mar, 2013
1 commit
18 Mar, 2013
1 commit
13 Mar, 2013
1 commit
27 Feb, 2013
3 commits
-
Conflicts: app/models/comment.rb app/views/layouts/application-ng.rhtml test/unit/category_test.rb
20 Dec, 2012
1 commit
-
(ActionItem2521)
07 Nov, 2012
1 commit
04 Nov, 2012
2 commits
-
Conflicts: app/sweepers/article_sweeper.rb db/schema.rb test/unit/environment_test.rb
01 Nov, 2012
3 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
29 Oct, 2012
2 commits
25 Oct, 2012
1 commit
24 Oct, 2012
1 commit
03 Oct, 2012
1 commit
04 Sep, 2012
1 commit
23 Aug, 2012
1 commit
20 Jul, 2012
2 commits
-
(solr brings everything with an empty query string)
-
Conflicts: app/controllers/my_profile/cms_controller.rb
15 Jun, 2012
1 commit
26 May, 2012
1 commit
-
Conflicts: INSTALL test/unit/article_test.rb
19 May, 2012
1 commit
-
Mocking Solr disable indexing and search, so it speeds tests that don't need solr. Tests that need searches have to call TestSolr.enable
16 May, 2012
2 commits
-
(ActionItem2345)
16 Mar, 2012
1 commit
-
Conflicts: INSTALL app/helpers/application_helper.rb app/views/account/signup.rhtml app/views/layouts/application-ng.rhtml app/views/search/_product.rhtml debian/control debian/noosfero.install debian/noosfero.links features/step_definitions/noosfero_steps.rb script/production
08 Mar, 2012
1 commit
-
I had to change a lot of plugin hotspot tests that depended on heavy/evil mocking and stubbing to pass. (ActionItem2315)
25 Feb, 2012
1 commit
-
Conflicts: app/controllers/application.rb debian/changelog plugins/bsc/lib/bsc_plugin.rb plugins/shopping_cart/lib/shopping_cart_plugin.rb
19 Feb, 2012
1 commit
-
Conflicts: INSTALL app/models/environment_finder.rb config/environments/cucumber.rb debian/control features/step_definitions/noosfero_steps.rb test/unit/forum_helper_test.rb
09 Feb, 2012
1 commit
-
* Included alert confirmation to delete link on content viewer and cms. * Removed the destroy page, since it was useless. Pair-programmed with: Rodrigo Souto <rodrigo@colivre.coop.br> (ActionItem1524)
31 Jan, 2012
2 commits
22 Dec, 2011
1 commit
-
This reverts commit 4a1e090a5e3d20bb88fe587183699a00fe27d356.
27 Nov, 2011
1 commit
-
Conflicts: app/controllers/admin_controller.rb app/controllers/application.rb app/controllers/public/account_controller.rb app/controllers/public/content_viewer_controller.rb lib/noosfero/i18n.rb test/functional/account_controller_test.rb test/functional/admin_controller_test.rb test/unit/contact_test.rb test/unit/profile_test.rb
10 Oct, 2011
1 commit
-
(ActionItem2075)
16 Aug, 2011
1 commit
-
This reverts commit 2220fe167d588fa1ca900dcef497a875c22b989c. There are some problems with solr (ActionItem1958)
13 Aug, 2011
1 commit
-
Conflicts: app/controllers/my_profile/cms_controller.rb test/functional/cms_controller_test.rb