30 Mar, 2014
1 commit
-
(ActionItem3070)
29 Jan, 2014
1 commit
22 Jan, 2014
1 commit
-
…into merge-requests/342 Conflicts: plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb
26 Nov, 2013
1 commit
15 Jul, 2013
1 commit
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.
13 May, 2013
1 commit
04 Mar, 2013
1 commit
-
(ActionItem2606)
03 Jan, 2013
2 commits
03 Dec, 2012
1 commit
-
…into merge-requests/248 Conflicts: app/models/person.rb app/views/catalog/index.rhtml public/stylesheets/application.css test/functional/catalog_controller_test.rb
08 Nov, 2012
1 commit
-
(ActionItem2439)
18 Oct, 2012
1 commit
04 Jan, 2012
1 commit
-
Conflicts: features/step_definitions/noosfero_steps.rb
22 Dec, 2011
2 commits
-
(ActionItem2111)
-
* 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
11 Dec, 2011
1 commit
27 Nov, 2011
1 commit
-
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
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)
10 May, 2011
1 commit
-
Signed-off-by: Daniela Soares Feitosa <danielafeitosa@colivre.coop.br>
03 Apr, 2011
1 commit
-
Conflicts: test/unit/image_gallery_test.rb
03 Mar, 2011
1 commit
-
- No more to 'catalog' controller But this will change in ActionItem1469 (ActionItem1907)
22 Feb, 2011
1 commit
13 Jan, 2011
1 commit
-
(ActionItem1686)
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)
16 Jul, 2010
1 commit
-
Conflicts: test/functional/catalog_controller_test.rb test/functional/profile_design_controller_test.rb
13 Jul, 2010
1 commit
-
- Old interface for category selection was removed - Allow nil for product name - Procuct category is mandatory for new products - Optimizing some functional tests - Categories have attribute to set if accept or no products (ActionItem1391)
08 Jul, 2010
1 commit
10 Aug, 2009
1 commit
-
created a new helper link_to_product_category and used in: * catalog page * product show page * manage product show page * manage product index on consumption list * extracted from the search controller on listing products
04 Feb, 2009
1 commit
24 Nov, 2008
1 commit
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
29 Apr, 2008
2 commits
-
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1726 3f533792-8f58-4932-b0fe-aaf55b0a4547
-
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1724 3f533792-8f58-4932-b0fe-aaf55b0a4547
24 Apr, 2008
1 commit
-
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1697 3f533792-8f58-4932-b0fe-aaf55b0a4547
08 Apr, 2008
1 commit
-
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@1645 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