17 Jan, 2014

1 commit

  • The following improvements have been made:
      - Created action that displays sub-organization and
      super organizations of a given organization.
      - Created a block that display related organizations.
      - List mother organizations to person's membership if
      he/she is member of a sub-organization.
    
    (ActionItem2499)
    (ActionItem2825)
    
    Signed-off-by: Arthur Del Esposte <athurmde@yahoo.com.br>
    Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
    Signed-off-by: Daniel Bucher <daniel.bucher88@gmail.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Marcos Ramos <ms.ramos@outlook.com>
    Daniel
     

20 Jul, 2012

1 commit


19 Jul, 2012

1 commit

  • Conflicts:
    	app/models/article.rb
    	app/models/profile.rb
    	app/models/uploaded_file.rb
    	public/javascripts/application.js
    	public/stylesheets/application.css
    	test/unit/article_test.rb
    	test/unit/category_finder_test.rb
    	test/unit/enterprise_test.rb
    Daniela Feitosa
     

18 Jul, 2012

1 commit


05 Jul, 2012

1 commit


15 Jun, 2012

1 commit


17 May, 2012

4 commits


19 Feb, 2012

1 commit

  • 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
    Rafael Martins
     

07 Feb, 2012

1 commit


24 Jan, 2012

1 commit


16 Jan, 2012

2 commits


24 Dec, 2011

2 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
    Rafael Martins
     

15 Feb, 2011

1 commit


26 Jan, 2011

1 commit

  • + Multi-processing tasks.
      + Graciously show/hide functions with the smooth slide of
      + Jquery. ^^
      + Using Unobtrusive Javascript.
      + Customized messages for each task type.
      + Button "Set all to approve/reject/skip".
      + Icons related to the task action.
    
      * Missing
        - Need to make selenium tests.
    
    (ActionItem1527)
    Rodrigo Souto
     

18 Jan, 2011

1 commit

  • * Adds another "Post a comment" top button that redirects to the bottom
    * "Post a comment" button is left-aligned
    * Removal confirmation message changed to cover replies
    * Removes background and border from the remove icon
    * The remove icon appears only on mouse over
    * Works in all major browsers
    * Highlights the author reply as the same way as the author comment
    
    (ActionItem1771)
    Caio Almeida
     

11 Jan, 2011

1 commit


07 Jan, 2011

1 commit


17 Dec, 2010

1 commit


16 Dec, 2010

1 commit


10 Dec, 2010

1 commit


26 Oct, 2010

4 commits


11 Sep, 2010

2 commits


04 Sep, 2010

1 commit


02 Sep, 2010

1 commit


15 Aug, 2010

1 commit


13 Aug, 2010

1 commit


12 Aug, 2010

1 commit


06 Aug, 2010

2 commits


13 Jul, 2010

1 commit