Software Público Brasileiro

11 Aug, 2014

1 commit

• 782b123f   Fix header/footer disable feature visualization logic ... Browse File »

  (ActionItem3251)
  
  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

  David Silva

  2014-08-11 20:35:24 +0000  

13 May, 2014

1 commit

• 23914711   Merge branch 'master' into rails3 ... Browse File »

  Conflicts:
  	app/helpers/application_helper.rb
  	app/helpers/layout_helper.rb
  	app/models/community.rb
  	app/models/enterprise.rb
  	app/models/product_category.rb
  	app/views/account/change_password.html.erb
  	config/boot.rb
  	config/environment.rb
  	config/routes.rb
  	lib/noosfero/plugin.rb
  	test/unit/enterprise_activation_test.rb
  	test/unit/person_notifier_test.rb

  Rodrigo Souto

  2014-05-13 10:43:37 -0300  

11 Feb, 2014

1 commit

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

  Conflicts:
  	app/views/profile_themes/add_css.rhtml
  	app/views/profile_themes/add_image.rhtml
  	app/views/profile_themes/css_editor.rhtml
  	app/views/profile_themes/edit.rhtml
  	app/views/profile_themes/new.rhtml
  	app/views/themes/add_css.html.erb
  	app/views/themes/add_css.rhtml
  	app/views/themes/add_image.html.erb
  	app/views/themes/add_image.rhtml
  	app/views/themes/css_editor.html.erb
  	app/views/themes/css_editor.rhtml
  	app/views/themes/edit.html.erb
  	app/views/themes/edit.rhtml
  	app/views/themes/index.html.erb
  	app/views/themes/new.html.erb
  	app/views/themes/new.rhtml
  	test/factories.rb
  	test/functional/profile_themes_controller_test.rb

  Rodrigo Souto

  2014-02-11 18:00:35 -0300  

28 Jan, 2014

1 commit

• 46e64d51   rails3: output the result of form_tag Browse File »
  Victor Costa

  2014-01-28 16:15:09 -0300  

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  

25 Dec, 2012

2 commits

• 86ecb14f   Finish removal of the deprecated terminology thing Browse File »

  2
  Antonio Terceiro

  2012-12-25 21:33:53 -0300  
• 645651de   Rename *.rhtml -> *.html.erb ... Browse File »

  *.rhtml is deprecated in Rails 3

  Antonio Terceiro

  2012-12-25 15:13:43 -0300