20 Jul, 2012

2 commits


15 Jun, 2012

1 commit


26 May, 2012

1 commit


19 May, 2012

1 commit


16 May, 2012

2 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
     

15 Mar, 2012

1 commit


08 Mar, 2012

1 commit


25 Feb, 2012

1 commit


24 Feb, 2012

2 commits


19 Feb, 2012

1 commit


09 Feb, 2012

1 commit


31 Jan, 2012

2 commits


04 Jan, 2012

1 commit


30 Dec, 2011

2 commits

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

22 Dec, 2011

1 commit


11 Dec, 2011

1 commit


27 Nov, 2011

1 commit

  • Conflicts:
    	app/controllers/admin_controller.rb
    	app/controllers/application.rb
    	app/controllers/public/account_controller.rb
    	app/controllers/public/content_viewer_controller.rb
    	lib/noosfero/i18n.rb
    	test/functional/account_controller_test.rb
    	test/functional/admin_controller_test.rb
    	test/unit/contact_test.rb
    	test/unit/profile_test.rb
    Antonio Terceiro
     

12 Oct, 2011

1 commit


11 Oct, 2011

1 commit


10 Oct, 2011

2 commits

  • * 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
     
  • (ActionItem2075)
    Caio SBA
     

16 Aug, 2011

2 commits


13 Aug, 2011

1 commit


11 Aug, 2011

2 commits


09 Aug, 2011

7 commits


08 Aug, 2011

1 commit