18 Jul, 2012

1 commit


26 May, 2012

1 commit


25 May, 2012

1 commit


20 May, 2012

1 commit


10 May, 2012

1 commit


05 May, 2012

1 commit


09 Apr, 2012

1 commit


16 Mar, 2012

1 commit

  • Conflicts:
    	INSTALL
    	app/helpers/application_helper.rb
    	app/views/account/signup.rhtml
    	app/views/layouts/application-ng.rhtml
    	app/views/search/_product.rhtml
    	debian/control
    	debian/noosfero.install
    	debian/noosfero.links
    	features/step_definitions/noosfero_steps.rb
    	script/production
    Daniela Feitosa
     

09 Mar, 2012

1 commit


24 Feb, 2012

1 commit


23 Feb, 2012

1 commit


21 Feb, 2012

1 commit


19 Feb, 2012

1 commit


07 Feb, 2012

1 commit


27 Jan, 2012

1 commit


10 Jan, 2012

1 commit


09 Jan, 2012

1 commit


04 Jan, 2012

1 commit


30 Dec, 2011

2 commits

  • (ActionItem1413)
    Daniela Feitosa
     
  •    * 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)
    Daniela Feitosa
     

22 Dec, 2011

4 commits

  • Antonio Terceiro
     
  • (ActionItem2111)
    Daniela Feitosa
     
  •    *  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
    Rafael Martins
     
  • This reverts commit 4e223943ab159d8fa7faf4b042ec3121d74ed32e.
    
    Conflicts:
    
    	app/controllers/my_profile/profile_members_controller.rb
    	config/solr.yml.dist
    	features/step_definitions/noosfero_steps.rb
    	lib/tasks/test.rake
    	test/functional/profile_members_controller_test.rb
    	test/unit/category_finder_test.rb
    Braulio Bhavamitra
     

10 Oct, 2011

2 commits

  • * 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)
    Rodrigo Souto
     
  • (ActionItem2075)
    Caio SBA
     

30 Sep, 2011

1 commit


17 Aug, 2011

1 commit


16 Aug, 2011

1 commit


13 Aug, 2011

1 commit


11 Aug, 2011

1 commit


26 Jul, 2011

1 commit


02 Jun, 2011

1 commit


27 May, 2011

2 commits


12 May, 2011

2 commits


09 May, 2011

2 commits


04 May, 2011

1 commit

  • I've made a selenium test suite for all the problems I've noticed so far, that are the following:
    
    * Profile control panel links in profile image block and profile information block
    * Link to user profile in user bar
    * Link to user control panel in user bar
    * 'Go to the home page' button on not found page, that should link to profile home page or
    to environment home page
    
    So I've made the tests, ran them, fixed the problems, and ran the tests again.
    
    (ActionItem1465)
    Caio SBA