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
24 Feb, 2012
1 commit
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
2 commits
-
* 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)
07 Feb, 2012
1 commit
-
* Also removing the folder colorbox from stylesheets. (ActionItem2132)
27 Jan, 2012
1 commit
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb
26 Jan, 2012
3 commits
-
(ActionItem2125)
-
…nto merge-requests/60 Conflicts: test/unit/application_helper_test.rb (ActionItem2125)
24 Jan, 2012
1 commit
-
(ActionItem2070)
23 Jan, 2012
1 commit
18 Jan, 2012
1 commit
-
(ActionItem2244)
16 Jan, 2012
2 commits
-
This reverts commit 5ee0d0eebb51c4507e19adc86c9c8f1edd994a30.
10 Jan, 2012
1 commit
04 Jan, 2012
3 commits
-
Conflicts: features/step_definitions/noosfero_steps.rb
-
In Rails 2.3 the memcache driver already supports adding timeout to cache keys.
24 Dec, 2011
4 commits
-
- Start search refactoring to a action based controller, like the BrowseController - Region, city and other advanced options removed in favor of facets - Add search contents menu Contents (or Articles) like people one. - Removed browse controller and views. They will unified with the refactored search controller and views. - Initial category search changes, see subsequent commits
23 Dec, 2011
1 commit
-
* Reusing code to add zoom to product's images * Changing strings to allow translation * Removing whitespaces (ActionItem2111)
22 Dec, 2011
1 commit
-
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
07 Dec, 2011
1 commit
27 Nov, 2011
4 commits
-
Also, removed explicit :previous_label and :next_label from calls to the pagination_links helper that used the same string as the default ones already provided by the helper. This needs will_paginate from Debian Squeeze at least.
-
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
22 Nov, 2011
1 commit
17 Nov, 2011
1 commit
31 Oct, 2011
2 commits
-
closes ActionItem2125
-
closes ActionItem2124
25 Oct, 2011
1 commit
-
Included new named_scopes for browsing contents: * more_recent * more_comments * more_views A named_scope to filter only text articles * text_articles Included new browse_contents_menu on base theme (ActionItem2069)
11 Oct, 2011
1 commit
-
Libs added * jquery-validation * colorbox * recaptcha (ActionItem2074)
10 Oct, 2011
1 commit
-
* Refactoring profile management to use tokeninput * Also, adding support of tokeninput to the core * Adding attributes validated and cnpj to enterprise * Environment option to define enterprise as validated by defaul * Making profile namedscopes consider subclasses too * Adapting enterprise icon and identification to meet Bsc expectations * Adapting profile info actions to meet Bsc expectations * Adapting control panel buttons to meet Bsc expectations * Adapting core product to meed Bsc expectations * Adding and fixing plugin hotspots (ActionItem2085, ActionItem2087, ActionItem2086, ActionItem2088)