Thiago Ribeiro / Noosfero

11 Feb, 2014

1 commit

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

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

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

27 Jan, 2014

3 commits

9e954d8c Merge branch 'master' into custom-forms ... Browse Dir »

Conflicts:
	plugins/custom_forms/test/functional/custom_forms_plugin_myprofile_controller_test.rb
	plugins/custom_forms/views/custom_forms_plugin_myprofile/_form.html.erb
	plugins/custom_forms/views/custom_forms_plugin_profile/show.html.erb
	po/pt/noosfero.po

2014-01-27 18:06:57 -0300

45a88ecf custom-forms-helper: encapsulate disabled logic and select default value Browse Dir »

Rodrigo Souto
2014-01-27 20:51:58 +0000
4b5140d0 Show different messages for expired forms ... Browse Dir »
```
(ActionItem2969)
```
Larissa Reis
2014-01-27 12:37:45 -0300

20 Jan, 2014

5 commits

bfc0d0ed Prevents new forms to be saved with select field without alternatives ... Browse Dir »

  I had to put the validation for the length of alternatives in the
  Field model because, since we are using Single Table Inheritance,
  we are creating Field objects with the type as a param instead of
  creating SelectField objects. This way, subclass' validation are
  skipped.

  I kept the validation in the SelectField model as well, because we
  also edit existing SelectField objects.

(ActionItem2960)

2014-01-20 14:05:17 -0300

e66ee1cd Replaces ruby code with sql code in migration Browse Dir »

Larissa Reis
2014-01-20 02:03:23 -0300
6de768c4 custom-forms: update answers with the alternatives ids Browse Dir »

Rodrigo Souto
2014-01-20 01:21:37 -0300
23419734 custom-forms: replace ruby code by sql on migration Browse Dir »

Rodrigo Souto
2014-01-20 01:21:32 -0300
fde04c88 custom-forms: remove unnecessary length validation of select_field Browse Dir »

Rodrigo Souto
2014-01-20 01:21:25 -0300

19 Jan, 2014

6 commits

18cc9a00 Changes datepicker style to improve UI Browse Dir »

Larissa Reis
2014-01-19 14:09:41 -0300
def86bdb Field Name with required-field css Browse Dir »

Larissa Reis
2014-01-19 14:07:19 -0300
4cd283ce Change Period for a more explicative label Browse Dir »

Larissa Reis
2014-01-19 13:25:51 -0300
e2a131a6 Fixes field name style in mozilla Browse Dir »

Larissa Reis
2014-01-19 13:02:28 -0300
e9b19a7a Validates period range Browse Dir »

Larissa Reis
2014-01-19 04:52:23 -0300
c5fe417b Puts label and checkbox horizontally aligned Browse Dir »

Larissa Reis
2014-01-19 03:18:43 -0300

18 Jan, 2014

1 commit

0c76f5c5 Align actions icons from form list in the left Browse Dir »

Larissa Reis
2014-01-18 02:03:40 -0300

09 Jan, 2014

1 commit

6adc8bc2 Merge branch 'master' into rails3 ... Browse Dir »

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

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