17 Apr, 2012

1 commit

15 Apr, 2012

1 commit

05 Apr, 2012

1 commit

03 Apr, 2012

1 commit

15 Mar, 2012

2 commits

24 Feb, 2012

1 commit

21 Feb, 2012

1 commit

20 Feb, 2012

1 commit

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
     

06 Feb, 2012

1 commit

19 Jan, 2012

1 commit

30 Dec, 2011

2 commits

  • 5ad46e23   Integration of AI1413 with AI2111 Browse File »
    Daniela Feitosa
     
  • 87ef45c5   Added feature to describe the costs of a product ... Browse File » 
       * 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
     

24 Dec, 2011

6 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
     

10 Oct, 2011

1 commit

  • 619223c6   Bsc Plugin ... Browse File » 
    * 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
     

12 May, 2011

1 commit

10 May, 2011

1 commit

27 Apr, 2011

1 commit

  • 1ebe4f84   Added feature to describe the costs of a product ... Browse File »
    2 
       * 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

(ActionItem1413)
    Daniela Feitosa
     

25 Feb, 2011

1 commit

15 Aug, 2010

1 commit

14 Aug, 2010

1 commit

22 Jul, 2010

1 commit

17 Jul, 2010

1 commit

13 Jul, 2010

1 commit

12 May, 2010

1 commit

  • 688faaee   Fields verification filters malformed html correctly ... Browse File » 
    * The field verification now occurs before de validation.
	* Fields that uses the full filter escape residual '<' and '>' after
	  filtering wellformed tags.
	* Fields that uses white_list filter only escape the '<' and '>'
	  symbols if the tag is not wellformed.
	* This patch only fixes the fields that were before being
	  filtered. A full field verification is need to check the way each
	  field must be filtered.

(ActionItem1491)
    Rodrigo Souto
     

30 Nov, 2009

1 commit

02 Sep, 2009

1 commit

23 Jul, 2009

1 commit

15 Aug, 2008

1 commit

  • c15a029c   ActionItem616: stop showing private content on seraches ... Browse File » 
      added the common method public? to trace public content and made it
not be shown in search results. Know issue: the numbers of total results
is wrong when private content would be retrived if it were public

git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@2398 3f533792-8f58-4932-b0fe-aaf55b0a4547
    MoisesMachado
     

10 Jul, 2008

2 commits

04 Jul, 2008

1 commit

03 Jul, 2008

1 commit