20 Feb, 2012
1 commit
19 Feb, 2012
3 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
3 commits
-
…into merge-requests/113
-
…into merge-requests/124
08 Feb, 2012
1 commit
-
* In app/controller/admin/users_controller.rb uses a User.find() method call that uses a :include argument to load the needed Persons with a single sql instead of one sql consult per user. * Only call User.find() if the format is csv or xml, to avoid making the huge sql consult every time the user loads the page. * With this change, the downloading time of a users list on csv format decreased 63%, while on xml format decreased 30%. * I've got no guarantee it's enough time to avoid timeout in production server, though. * Not tested on debian. (ActionItem2241)
07 Feb, 2012
1 commit
06 Feb, 2012
1 commit
31 Jan, 2012
2 commits
27 Jan, 2012
1 commit
-
Conflicts: app/helpers/application_helper.rb debian/changelog vendor/plugins/monkey_patches/touch/init.rb
24 Jan, 2012
1 commit
-
(ActionItem2070)
16 Jan, 2012
2 commits
-
This reverts commit 5ee0d0eebb51c4507e19adc86c9c8f1edd994a30.
10 Jan, 2012
1 commit
-
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
4 commits
-
Conflicts: features/step_definitions/noosfero_steps.rb
30 Dec, 2011
2 commits
-
* 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
15 commits
-
Also only search on the current environment
-
- Standardized search for all entities type - New category search based on a facet view
-
Map balloons are now loaded by Ajax and have their own controller and views.
-
It will be readded later where it is used: on the search controller
-
- 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
22 Dec, 2011
1 commit
-
* Moved JS to public/js/catalog.js * Modified app/model/product for better readability * New file with JS previously from app/views/catalog/index * Bits of static CSS from app/views/catalog/index * Reorganized bits of static CSS and moved JS into public * Removed price composition features from browse_catalog * Changed view to reflect removing Product price composition * Changed Product to not return price composition yet * This will work only after AI1413 Changed feature to reflect the image id change * Changed the image id to "product-image-link" to avoid conflict * Changed product order on the catalog from id to name * Moved some tests from unit to feature * test/unit/enterprise_homepage_test had view tests New steps to support new features * Commented some failing @selenium scenarios * Added FIXME comments with probable reasons * Commented out failing scenarios with known reasons * Fixed a broken scenario on features/browse_enterprises * Fixed features/admin_categories * New step for clicking and sleep X seconds A few steps to support the updated feature * Updated the browsing catalog feature * Added a few id's on tags to help the testing * Two images used on the catalog features * Corrected small typo. * New features for browsing catalgos, a new step to support the features and a small modification on the catalog view partial. * New feature for browsing enterprises and testing the 'products' link * A few changes on steps to support the new feature. * New feature for browsing enterprise catalogs. * Fixed a small typo on #product-list and the number of items per page. * Fixed expected number of products per page and expected tag for product price. * Removed one test from catalog that doesn't make sense on the new layout. * Fixed enterprise_homepage_test; test cases with 'display' on the title will be moved to another context (controller or view). * Commented one of the functional test cases: --- test_should_back_when_update_address_fail(MapsControllerTest) * Remove separation lines between products * Fixed 2 test cases on HighlightBlocksTest: * 'should_list_images_randomically' had only 3 mocked figures, but five are being handled; * 'should_not_list_non_existant_image' wasn't expecting a call for the non- existant image, but this call is made and should return nil. * Fix price display and layout * Fix oversized price line * Fix bar css * Fix height of catalog boxes * Fix layout * Fix unit getter * Improve css for no-image * Add no image label * Beautiful catalog for enterprises