19 Feb, 2012
2 commits
-
Conflicts: app/controllers/application.rb app/controllers/public/browse_controller.rb app/helpers/application_helper.rb app/helpers/display_helper.rb app/models/environment_finder.rb app/models/product.rb app/views/layouts/_javascript.rhtml app/views/layouts/application-ng.rhtml public/javascripts/application.js public/stylesheets/application.css test/functional/browse_controller_test.rb test/functional/search_controller_test.rb vendor/plugins/acts_as_solr_reloaded/lib/tasks/solr.rake
-
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
31 Jan, 2012
5 commits
27 Jan, 2012
3 commits
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb
26 Jan, 2012
2 commits
19 Jan, 2012
1 commit
-
…into merge-requests/109
17 Jan, 2012
1 commit
-
…nto merge-requests/99
10 Jan, 2012
2 commits
08 Jan, 2012
1 commit
-
(ActionItem2204)
24 Dec, 2011
4 commits
-
- Standardized search for all entities type - New category search based on a facet view
22 Dec, 2011
4 commits
-
This reverts commit 4ea10045f11f94f241774158e542cdc3842b02c9.
-
This reverts commit 4e223943ab159d8fa7faf4b042ec3121d74ed32e. Conflicts: app/controllers/my_profile/profile_members_controller.rb config/solr.yml.dist features/step_definitions/noosfero_steps.rb lib/tasks/test.rake test/functional/profile_members_controller_test.rb test/unit/category_finder_test.rb
21 Dec, 2011
3 commits
-
The fact that tables matching /_plugin_/ were being excluded from db/schema.rb broke the tests, because the test database was being created without the necessary tables. And db/schema.rb was already not left untouched anyway, since several plugins add columns to existing Noosfero tables ...
-
- Added 2 new HOTSPOT: profile_data_extras and head_ending (ActionItem2208)
20 Dec, 2011
1 commit
-
(ActionItem2215)
19 Dec, 2011
1 commit
18 Dec, 2011
3 commits
09 Dec, 2011
1 commit
-
Conflicts: debian/changelog test/unit/dates_helper_test.rb
07 Dec, 2011
1 commit
06 Dec, 2011
1 commit
-
…nto merge-requests/49
04 Dec, 2011
1 commit
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
24 Nov, 2011
1 commit