19 Feb, 2012
5 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)
24 Jan, 2012
1 commit
-
(ActionItem2070)
23 Jan, 2012
2 commits
-
…into merge-requests/116
18 Jan, 2012
1 commit
-
(ActionItem2244)
17 Jan, 2012
1 commit
-
. Also fixing some typos (ActionItem1565)
16 Jan, 2012
2 commits
-
This reverts commit 5ee0d0eebb51c4507e19adc86c9c8f1edd994a30.
11 Jan, 2012
1 commit
-
Adds gravatar_support.feature (selenium tests) and new path for cucumber
10 Jan, 2012
4 commits
-
When the year is empty, it ends up as 1 in the date object.
-
…nto merge-requests/91
-
Conflicts: features/step_definitions/noosfero_steps.rb
09 Jan, 2012
1 commit
-
The profile has a new attribute to define if the guest must be automaticaly redirected to the article translation or not. Closes ActionItem2121
04 Jan, 2012
2 commits
-
Conflicts: features/step_definitions/noosfero_steps.rb
30 Dec, 2011
1 commit
-
* new table production_costs * environment and enterprises can have them * new table price_details * products have price details with a cost and a price * updated db/schema * included method to display the total value of inputs * included partials to display and edit price details * allowing users to create new cost from select * manage_products.js to separate js codes from application.js * numbers_only_javascript * created a partial with the js needed to allow only numbers on some fields * price composition bar is updated when an user edit some price (ActionItem1413)
24 Dec, 2011
4 commits
23 Dec, 2011
1 commit
-
* Reusing code to add zoom to product's images * Changing strings to allow translation * Removing whitespaces (ActionItem2111)