08 Jun, 2015

2 commits

02 Jun, 2015

1 commit

28 May, 2015

1 commit

12 May, 2015

1 commit

23 Mar, 2015

1 commit

12 Mar, 2015

4 commits

11 Mar, 2015

5 commits

10 Mar, 2015

1 commit

27 Feb, 2015

1 commit

26 Feb, 2015

1 commit

24 Feb, 2015

2 commits

22 Feb, 2015

1 commit

11 Feb, 2015

1 commit

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

21 Jan, 2015

1 commit

  • 5d28b4b3   Add ability to mark blocks as fixed ... Browse Dir » 
    Fixed blocks can't be modified by regular users, but only by
administrators. The main use case is defining a few blocks in the user
or community templates, so that users and communities can't remove or
change them.

Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Signed-off-by: Gustavo Jaruga <darksshades@gmail.com>
    Fabio Teixeira
     

16 Dec, 2014

4 commits

01 Sep, 2014

1 commit

25 Aug, 2014

1 commit

22 Aug, 2014

1 commit

19 Aug, 2014

2 commits

18 Aug, 2014

1 commit

12 Aug, 2014

2 commits

11 Aug, 2014

1 commit

05 Aug, 2014

1 commit

04 Aug, 2014

1 commit

30 Jul, 2014

1 commit