07 Mar, 2012
1 commit
24 Feb, 2012
14 commits
-
* Use correct 'domain' from environment * Use find to get article
-
* Changed 'find_in' for the corresponding search action * Updated google maps urls
-
Change Google API version to V3 and implements city and state validations for Brazil case.
23 Feb, 2012
1 commit
21 Feb, 2012
1 commit
-
* General, products and enterprise
20 Feb, 2012
3 commits
-
* A wrong 'browse' route (replaced with 'search') * Lack of an 'expect' on the CmsControllerTest
-
* A few syntax problems * Removed tests for removed models * Replaced 'browse' with 'search' controller * Created EnterpriseHomepageHelperTest * Fixes to work with Solr
19 Feb, 2012
6 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
-
…into merge-requests/113
08 Feb, 2012
1 commit
-
…into merge-requests/121
06 Feb, 2012
1 commit
-
(ActionItem2273)
01 Feb, 2012
1 commit
-
Prevents themes page to crash when approved_themes() finds a non theme entity inside themes dir. Closes ActionItem2269
31 Jan, 2012
2 commits
27 Jan, 2012
4 commits
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb
-
Those were obtained from the `rails-2.3` branch of https://github.com/svenfuchs/rails-i18n
26 Jan, 2012
3 commits
-
(ActionItem2125)
-
…nto merge-requests/60 Conflicts: test/unit/application_helper_test.rb (ActionItem2125)