08 Oct, 2015

1 commit


04 Feb, 2015

1 commit


03 Feb, 2015

1 commit

  • Conflicts:
    	app/controllers/my_profile/profile_editor_controller.rb
    	app/helpers/search_helper.rb
    	app/models/invitation.rb
    	app/models/person.rb
    	app/views/cms/view.html.erb
    	app/views/templates/index.html.erb
    	plugins/community_track/views/content_viewer/_step_item.html.erb
    	test/functional/home_controller_test.rb
    	test/unit/person_test.rb
    	test/unit/profile_test.rb
    Rodrigo Souto
     

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
    Victor Costa
     

16 Jan, 2015

1 commit


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.
    Antonio Terceiro
     

05 Jan, 2015

2 commits


20 Nov, 2014

1 commit


05 Nov, 2014

1 commit


30 Sep, 2014

1 commit


08 Aug, 2014

3 commits


25 Feb, 2014

1 commit


17 Jan, 2014

1 commit


17 Dec, 2013

5 commits


28 Nov, 2013

1 commit


27 Nov, 2013

3 commits


23 Nov, 2013

1 commit


21 Nov, 2013

2 commits