11 Feb, 2014
1 commit
-
Conflicts: app/controllers/my_profile/cms_controller.rb app/controllers/public/content_viewer_controller.rb app/helpers/application_helper.rb app/helpers/article_helper.rb app/helpers/catalog_helper.rb app/helpers/comment_helper.rb app/models/article.rb app/models/enterprise.rb app/models/members_block.rb app/models/person.rb app/models/profile.rb app/views/blocks/profile_info.html.erb app/views/blocks/profile_info_actions/community.html.erb config/initializers/dependencies.rb config/routes.rb db/schema.rb debian/control lib/noosfero/plugin.rb lib/tasks/plugins.rake plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb script/sample-products test/functional/catalog_controller_test.rb test/functional/manage_products_controller_test.rb test/functional/map_balloon_controller_test.rb test/functional/profile_controller_test.rb test/functional/search_controller_test.rb test/unit/box_test.rb test/unit/cms_helper_test.rb test/unit/enterprise_test.rb test/unit/environment_test.rb test/unit/featured_products_block_test.rb test/unit/person_test.rb test/unit/product_category_test.rb test/unit/product_test.rb test/unit/profile_test.rb test/unit/user_test.rb vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb
04 Feb, 2014
1 commit
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
11 Jul, 2013
1 commit
-
…into merge-requests/264 Conflicts: app/controllers/public/catalog_controller.rb app/views/catalog/index.rhtml
14 Jun, 2013
1 commit
-
Also adds the ProductCategoriesBlock to list the catalog anywhere. ActionItem896
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
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
3 commits
-
(ActionItem1996)
-
* Hot Spots: - Catalog item extra content - Stylesheet - JS - Application body extra content - Product info extra content * Plugin new methods - Public name - Public path * Plugin manager - Fixing map and adding collect method * Fixes: - Expand template method
17 Jul, 2010
1 commit
-
Fixing categories selection and fixing width of sideboxes in leftbar and rightbar templates Added themes to jquery-ui (ActionItem1392)
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
06 Jan, 2009
2 commits
22 Dec, 2008
1 commit
30 Nov, 2007
1 commit
-
git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@992 3f533792-8f58-4932-b0fe-aaf55b0a4547