17 Apr, 2015

3 commits


13 Apr, 2015

1 commit


09 Apr, 2015

1 commit


08 Apr, 2015

2 commits


11 Mar, 2015

1 commit


10 Mar, 2015

3 commits


09 Mar, 2015

2 commits


06 Mar, 2015

1 commit


05 Mar, 2015

1 commit


03 Mar, 2015

1 commit


27 Feb, 2015

3 commits


24 Feb, 2015

1 commit


05 Feb, 2015

1 commit


04 Feb, 2015

2 commits


03 Feb, 2015

2 commits


02 Feb, 2015

2 commits


29 Jan, 2015

1 commit


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
     

27 Jan, 2015

1 commit


20 Jan, 2015

1 commit


19 Jan, 2015

1 commit


15 Jan, 2015

1 commit

  • When this is merged, the script at
    script/move-translations-to-plugins.rb must be executed to move the
    translations that are currently in the core to their respective plugins,
    i.e. to initialize each plugin .po file with their existing translated
    strings, excluding translations that already exist in the core.
    
    Going forward those duplicated translations should be replaced by calls
    to c_(), which will do the same as _() but won't be extracted for
    translation.
    Antonio Terceiro
     

13 Jan, 2015

1 commit


12 Jan, 2015

1 commit


09 Jan, 2015

3 commits


06 Jan, 2015

1 commit


05 Jan, 2015

1 commit