19 Nov, 2014

1 commit


26 Aug, 2012

1 commit


21 Aug, 2012

1 commit


10 Aug, 2012

1 commit


09 Aug, 2012

1 commit

  •    * Licenses only can be removed with method 'post'
       * Fixing truncate calls to stop displaying deprecation warnings
       * Added buttons to add a new license and to go back to admin panel
       * Added new db/schema
    
    (ActionItem2379)
    Daniela Feitosa
     

08 Aug, 2012

2 commits


07 Aug, 2012

2 commits


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

4 commits


21 Jun, 2012

1 commit


20 May, 2012

1 commit


19 May, 2012

1 commit


17 May, 2012

7 commits


25 Apr, 2012

1 commit


17 Apr, 2012

1 commit


15 Apr, 2012

1 commit


03 Apr, 2012

3 commits


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
     

08 Mar, 2012

1 commit


29 Feb, 2012

1 commit


24 Feb, 2012

3 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
     

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

2 commits