Thiago Ribeiro / Noosfero

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

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

31 Oct, 2013

1 commit

419bcf2a filter_html: parse only sources that have macros ... Browse File »

This solves every problem related with Hpticot breaking pages since the
parse was happening on the MainBlock too. But this does not changes the
fact tha Hpricot is currently dead and we should move on to nokogiri.

(ActionItem2873)

2013-10-31 17:40:53 -0300

23 Jul, 2013

1 commit

f6e7559f rails3: make html of RawHTMLBlock mass-assignable Browse File »

Antonio Terceiro
2013-07-23 07:24:36 -0300

24 Apr, 2013

1 commit

81fd61af Html_safe on the raw_html_block ... Browse File »
```
The problem only happens on production environment...

(ActionItem2658)
```
Rodrigo Souto
2013-04-24 20:25:02 -0300

09 Feb, 2012

1 commit

e2fcf1a6 Making BlogArchiveBlock consider view permissions ... Browse File »

  * Needed to rewrite the signature of all the method 'content' of all
  blocks.

  Pair-programmed with: Rodrigo Souto <rodrigo@colivre.coop.br>

(ActionItem1549)

2012-02-09 16:45:18 -0200

26 Aug, 2010

1 commit

417935cc Add a Raw HTML block ... Browse File »
```
(ActionItem1652)
```
Antonio Terceiro
2010-08-26 19:22:22 -0300