24 Apr, 2014
1 commit
-
Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb plugins/shopping_cart/test/functional/shopping_cart_plugin_controller_test.rb plugins/shopping_cart/test/functional/shopping_cart_plugin_myprofile_controller_test.rb
21 Jan, 2014
1 commit
-
…into merge-requests/337 Conflicts: app/controllers/public/catalog_controller.rb app/helpers/application_helper.rb app/helpers/catalog_helper.rb app/views/catalog/index.rhtml public/stylesheets/application.css
07 Oct, 2013
1 commit
-
…into merge-requests/328 Conflicts: app/controllers/public/catalog_controller.rb
17 Jun, 2013
1 commit
-
related to ActionItem896
14 Jun, 2013
1 commit
-
Also adds the ProductCategoriesBlock to list the catalog anywhere. ActionItem896
01 Jun, 2013
1 commit
-
The disable_* settings for environment are incoherent with the user interface and with the code itself. This changes correct only one incoherent setting as an example how to do with all others.
04 Mar, 2013
1 commit
-
(ActionItem2606)
01 Mar, 2013
1 commit
-
Enterprises's catalog is loaded through helper class and uses different loading strategy (loading category or doesn't loadindg) and css style on different views (on enterprises/catalog show breadcomb; on homepage doesn't show) (!ActionItem2600)
18 Oct, 2012
1 commit
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
30 Jul, 2010
1 commit
-
…roducts and the user access the catalog the system crash or works slowly. (ActionItem1595)
17 Jul, 2010
1 commit
-
Fixing categories selection and fixing width of sideboxes in leftbar and rightbar templates Added themes to jquery-ui (ActionItem1392)
04 Sep, 2008
1 commit
-
Changes: * Implemented require_ssl and refuse_ssl in ApplicationController * Changed AccountController to require SSL + pointing to HTTPS in login forms * Changed PublicController to refuse SSL, and fixed all controllers in app/controllers/public to inherit from it (with some exceptions). * Changed MyProfileController to require SSL Side-effects: * Some controllers had been changed in an unappropriated way for the new SSL requirement. * Some tests changed to reflect the new SSL requirements. * Needed to tweak content_viewer controller to deal with SSL URL's: + Fixed detection of user coming from public view that was broke by the SSL thing. * adapted enterprise_registration tests git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2458 3f533792-8f58-4932-b0fe-aaf55b0a4547
18 Aug, 2008
1 commit
-
The environment admin can now disable management of products for its enterprises. It disables together button of control panel, link of profile info block, link of profile page, access to manage products controller and catalog controller. Also do not let enterprises create products blocks and change the initial blocks for an enterprise to not contain a products block. git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2402 3f533792-8f58-4932-b0fe-aaf55b0a4547
17 Jun, 2008
1 commit
-
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2036 3f533792-8f58-4932-b0fe-aaf55b0a4547
30 Nov, 2007
1 commit
-
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@992 3f533792-8f58-4932-b0fe-aaf55b0a4547