03 Apr, 2014

1 commit


22 Jan, 2014

1 commit


21 Jan, 2014

1 commit


15 Jul, 2013

1 commit


26 Jun, 2013

1 commit


17 Jun, 2013

1 commit


01 Jun, 2013

1 commit


21 May, 2013

1 commit


17 May, 2013

1 commit


09 May, 2013

1 commit


06 Mar, 2013

1 commit


28 Feb, 2013

1 commit


12 Dec, 2012

1 commit


11 Dec, 2012

1 commit


13 Sep, 2012

1 commit


07 Aug, 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


21 May, 2012

1 commit


04 Apr, 2012

1 commit


03 Apr, 2012

1 commit


13 Mar, 2012

1 commit


24 Feb, 2012

1 commit


19 Feb, 2012

2 commits

  • 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
     
  • Conflicts:
    	INSTALL
    	app/models/environment_finder.rb
    	config/environments/cucumber.rb
    	debian/control
    	features/step_definitions/noosfero_steps.rb
    	test/unit/forum_helper_test.rb
    Rafael Martins
     

27 Jan, 2012

1 commit


30 Dec, 2011

1 commit

  •    * 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

3 commits


22 Dec, 2011

1 commit


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)
    Rodrigo Souto
     

16 Aug, 2011

1 commit


18 May, 2011

1 commit

  • Change acts_as_searcheable to always index schema_path. If multitenancy
    if off or the database isn't PostgreSQL, then schema_path method returns
    an empty string and is not used at find_by_contents.
    
    Change find_by_contents adding options separating options from paginate,
    solr and rails's find. With Solr search capabilities, combined search
    (solr + rails find) won't be necessary in the future.
    Also change find_by_contents to return a hash where there are the
    facets found and also the results.
    
    Related tests pass with this change
    Braulio Bhavamitra
     

12 May, 2011

1 commit


11 May, 2011

2 commits


27 Apr, 2011

1 commit

  •    * 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
     

26 Oct, 2010

1 commit


15 Aug, 2010

1 commit