19 Mar, 2015
2 commits
-
Conflicts: app/models/profile.rb app/views/profile_editor/edit.html.erb
-
Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com> Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br> See merge request !489
28 Jan, 2015
1 commit
-
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
15 Jan, 2015
1 commit
-
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.
25 Aug, 2014
1 commit
24 Feb, 2014
1 commit
16 Dec, 2013
1 commit