09 Jan, 2014

1 commit

  • 6adc8bc2   Merge branch 'master' into rails3 ... Browse File » 
    Conflicts:
	app/controllers/my_profile/memberships_controller.rb
	app/helpers/application_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/category.rb
	app/models/change_password.rb
	app/models/comment.rb
	app/models/environment.rb
	app/models/event.rb
	app/models/profile.rb
	app/models/recent_documents_block.rb
	app/models/region.rb
	app/models/task.rb
	app/models/uploaded_file.rb
	app/views/account/forgot_password.html.erb
	app/views/events/_events_by_day.html.erb
	app/views/profile/_person_profile.html.erb
	app/views/shared/_manage_enterprises.html.erb
	config/environment.rb
	config/initializers/plugins.rb
	config/routes.rb
	db/schema.rb
	debian/control
	lib/noosfero/plugin.rb
	test/unit/article_test.rb
	test/unit/category_test.rb
	test/unit/change_password_test.rb
	test/unit/cms_helper_test.rb
	test/unit/comment_test.rb
	test/unit/content_viewer_helper_test.rb
	test/unit/event_test.rb
	test/unit/folder_helper_test.rb
	test/unit/person_test.rb
	test/unit/price_detail_test.rb
	test/unit/profile_helper_test.rb
	test/unit/recent_documents_block_test.rb
	test/unit/scrap_test.rb
	test/unit/user_mailer_test.rb
	vendor/plugins/action_tracker_has_comments/init.rb
	vendor/plugins/delayed_job/lib/delayed/worker.rb
	vendor/plugins/noosfero_caching/init.rb
    Rodrigo Souto
     

27 Nov, 2013

1 commit

21 Nov, 2013

1 commit

19 Nov, 2013

1 commit

05 Nov, 2013

1 commit

31 Oct, 2013

1 commit

10 Oct, 2013

1 commit

05 Sep, 2013

1 commit

12 Dec, 2012

1 commit

04 Nov, 2012

1 commit

29 Oct, 2012

1 commit

27 Oct, 2012

1 commit

24 Aug, 2012

1 commit

23 Aug, 2012

2 commits

08 Aug, 2012

1 commit

18 Jul, 2012

1 commit

21 Jun, 2012

1 commit

19 May, 2012

1 commit

15 May, 2012

1 commit

20 Feb, 2012

1 commit

19 Feb, 2012

2 commits

04 Jan, 2012

1 commit

30 Dec, 2011

1 commit

  • 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
     

22 Dec, 2011

1 commit

27 Nov, 2011

1 commit

  • d35779c0   Merge branch 'master' into rails-2.3.5 ... Browse File » 
    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
     

11 Oct, 2011

1 commit

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
     

16 Aug, 2011

1 commit

10 Aug, 2011

1 commit

09 Aug, 2011

3 commits

28 Jul, 2011

1 commit

26 Jul, 2011

1 commit

14 Jul, 2011

1 commit

13 Jul, 2011

1 commit

12 Jul, 2011

1 commit

20 Jun, 2011

1 commit