08 Jul, 2013

1 commit

01 Jul, 2013

1 commit

28 Jun, 2013

3 commits

27 Jun, 2013

1 commit

11 Apr, 2013

1 commit

12 Mar, 2013

1 commit

22 Feb, 2013

1 commit

20 Feb, 2013

1 commit

21 Oct, 2012

1 commit

01 Oct, 2012

1 commit

30 Sep, 2012

1 commit

28 Sep, 2012

1 commit

11 Sep, 2012

1 commit

21 Aug, 2012

2 commits

15 Aug, 2012

1 commit

  • 65fdd587   Makes the comment box in wall grow ... Browse File » 
      I did a little refactor in the already existent script to
  limited_text_area so the part that grows the textarea can be reused
  elsewhere, e.g. the comment box in the wall.

  Since I was modifying the limited_text_area function again, I re-did
  here the fix to the bug in Chrome browsers where the textarea would
  grow with every key press. So this merge request also fix the
  ActionItem2288.

(ActionItem2405)
    Larissa Reis
     

31 Jul, 2012

1 commit

19 Jul, 2012

1 commit

  • 75524307   Merging AI1826 with master ... Browse File » 
    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

2 commits

09 Jul, 2012

1 commit

22 May, 2012

2 commits

21 May, 2012

2 commits

17 May, 2012

2 commits

19 Feb, 2012

1 commit

  • 50def845   Merge remote branch 'noosfero-bsc/new-search-merge' ... Browse File » 
    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
     

26 Jan, 2012

1 commit

27 Dec, 2011

1 commit

24 Dec, 2011

3 commits

22 Dec, 2011

1 commit

  • c11ada20   Redesigned Catalog ... Browse File » 
       *  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
     

02 Dec, 2011

1 commit

31 Oct, 2011

1 commit

26 Oct, 2011

1 commit

10 Oct, 2011

1 commit