05 May, 2014

1 commit


18 Mar, 2014

2 commits


15 Jan, 2014

1 commit


27 Jun, 2013

1 commit


20 Feb, 2013

1 commit


24 Oct, 2012

1 commit


23 Oct, 2012

1 commit


21 Oct, 2012

1 commit


10 Sep, 2012

1 commit


23 Aug, 2012

1 commit


18 Jul, 2012

1 commit


20 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
     

14 Mar, 2012

1 commit


08 Mar, 2012

2 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
     

27 Jan, 2012

1 commit


24 Jan, 2012

1 commit


16 Jan, 2012

2 commits


08 Jan, 2012

1 commit


04 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
     

28 Dec, 2011

1 commit


26 Dec, 2011

1 commit


24 Dec, 2011

6 commits


22 Dec, 2011

1 commit


21 Dec, 2011

2 commits


08 Dec, 2011

1 commit


24 Nov, 2011

1 commit


21 Nov, 2011

1 commit