Charles Oliveira / noosfero

03 Feb, 2015

2 commits

9c9d11b0 Merge branch 'site_tour' into stable ... Browse Dir »

Conflicts:
	plugins/site_tour/lib/site_tour_plugin/tour_block.rb
	plugins/site_tour/public/edit_tour_block.css
	plugins/site_tour/public/main.js
	plugins/site_tour/test/functional/site_tour_plugin_admin_controller_test.rb
	plugins/site_tour/test/unit/site_tour_plugin_test.rb
	plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block.html.erb
	plugins/site_tour/views/box_organizer/site_tour_plugin/_tour_block_group_item.html.erb
	plugins/site_tour/views/tour_actions.html.erb

2015-02-03 19:01:46 -0300

770e633f site_tour: support label translation Browse Dir »

Victor Costa
2015-02-03 18:35:28 -0300

28 Jan, 2015

1 commit

d9a3fdb3 Merge branch 'master' into stable ... Browse Dir »

Conflicts:
	app/helpers/article_helper.rb
	app/helpers/boxes_helper.rb
	app/models/article.rb
	app/models/block.rb
	app/views/content_viewer/view_page.html.erb
	db/schema.rb
	plugins/community_track/views/blocks/_track_list_more.html.erb
	plugins/community_track/views/box_organizer/community_track_plugin/_track_list_block.html.erb
	public/javascripts/article.js
	test/unit/block_test.rb
	test/unit/person_notifier_helper_test.rb

2015-01-28 15:22:56 -0300

15 Jan, 2015

3 commits

ebc8be8c `rake updatepo` run Browse Dir »

Antonio Terceiro
2015-01-15 13:23:41 -0200

d4587481 Deduplicate strings from plugins ... Browse Dir »

I have deduplicated every message in plugin code that was already in the
core. Going forward, plugins should use c_() is they want to reuse the
message from the core. If they want to force their own translation, they
should probably use _('plugin_name|The message') to avoid overriding
translations from the core.

2015-01-15 13:23:41 -0200