Software Público Brasileiro

26 Jan, 2015

1 commit

• 144eab47   test/*: use require_relative for test_helper ... Browse File »

  This needs to be done for all plugins as well, but it's more complicated
  there because several plugins have their own test_helper (which will
  also load the core test_helper).

  Antonio Terceiro

  2015-01-26 14:22:25 -0200  

11 Feb, 2014

1 commit

• e9fea38f   Merge branch 'master' into rails3-merge ... Browse File »

  Conflicts:
  	app/controllers/my_profile/cms_controller.rb
  	app/controllers/public/content_viewer_controller.rb
  	app/helpers/application_helper.rb
  	app/helpers/article_helper.rb
  	app/helpers/catalog_helper.rb
  	app/helpers/comment_helper.rb
  	app/models/article.rb
  	app/models/enterprise.rb
  	app/models/members_block.rb
  	app/models/person.rb
  	app/models/profile.rb
  	app/views/blocks/profile_info.html.erb
  	app/views/blocks/profile_info_actions/community.html.erb
  	config/initializers/dependencies.rb
  	config/routes.rb
  	db/schema.rb
  	debian/control
  	lib/noosfero/plugin.rb
  	lib/tasks/plugins.rake
  	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
  	script/sample-products
  	test/functional/catalog_controller_test.rb
  	test/functional/manage_products_controller_test.rb
  	test/functional/map_balloon_controller_test.rb
  	test/functional/profile_controller_test.rb
  	test/functional/search_controller_test.rb
  	test/unit/box_test.rb
  	test/unit/cms_helper_test.rb
  	test/unit/enterprise_test.rb
  	test/unit/environment_test.rb
  	test/unit/featured_products_block_test.rb
  	test/unit/person_test.rb
  	test/unit/product_category_test.rb
  	test/unit/product_test.rb
  	test/unit/profile_test.rb
  	test/unit/user_test.rb
  	vendor/plugins/monkey_patches/methods_from_fake_arel/init.rb

  Rodrigo Souto

  2014-02-11 17:35:19 -0300  

22 Jan, 2014

1 commit

• 99c4da00   Merge commit 'refs/merge-requests/342' of git://gitorious.org/noosfero/noosfero … ... Browse File »

  …into merge-requests/342
  
  Conflicts:
  	plugins/shopping_cart/controllers/shopping_cart_plugin_controller.rb

  Rodrigo Souto

  2014-01-22 22:03:11 +0000  

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

  2014-01-09 15:17:55 +0000  

03 Aug, 2013

1 commit

• 70ba11a8   rails3: fix PriceDetail unit tests Browse File »
  Antonio Terceiro

  2013-08-03 12:49:50 -0300  

15 Jul, 2013

1 commit

• 196faf05   Add STI, serialized field and rename enterprise_id Browse File »
  Braulio Bhavamitra

  2013-07-15 09:08:27 -0300  

29 May, 2013

1 commit

• 2249f490   Makes price details to work with "other costs" ... Browse File »

  closes ActionItem2519

  Aurélio A. Heckert

  2013-05-29 15:50:37 -0300  

15 Aug, 2012

1 commit

• d6b940e9   Fixed test Browse File »
  Daniela Feitosa

  2012-08-15 00:45:46 -0300  

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

  2011-12-30 16:44:36 -0200  

12 May, 2011

1 commit

• fe61ff4d   Revert "Added feature to describe the costs of a product" ... Browse Dir »

  2

  This reverts commit 1ebe4f84dc0910b6ded065b60ed0e58612a93659.
  
  Conflicts:
  
  	features/step_definitions/noosfero_steps.rb
  	test/functional/manage_products_controller_test.rb

  Daniela Feitosa

  2011-05-12 00:48:31 -0300  

27 Apr, 2011

1 commit

• 1ebe4f84   Added feature to describe the costs of a product ... Browse File »

  2

     * 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

  2011-04-27 13:39:03 -0300