13 Aug, 2015

1 commit


10 Aug, 2015

1 commit


28 Jul, 2015

1 commit


18 Jun, 2015

1 commit


11 Jun, 2015

1 commit


24 Feb, 2015

1 commit


30 Jan, 2015

1 commit


29 Jan, 2015

3 commits


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

5 commits


26 Jan, 2015

5 commits


22 Jan, 2015

1 commit


21 Jan, 2015

5 commits

  • Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: Aurélio A. Heckert <aurelio@colivre.coop.br>
    Arthur Esposte
     
  • Article privacity to followers
    
    https://gitlab.com/participa/noosfero/issues/324
    
    Feitos para amigos de perfis de pessoas também!
    
    See merge request !422
    Antonio Terceiro
     
  • Fixed block
    
    Make a specific block fixed on a position. Only the environment admin can move and specify this option for the block
    
    https://gitlab.com/noosfero/noosfero/issues/26
    
    See merge request !380
    Antonio Terceiro
     
  • 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
     
  • Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
    Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
    Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
    Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
    Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
    Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
    Gabriela Navarro
     

20 Jan, 2015

2 commits

  • Ai3287 deactive and active profile
    
    Feature: https://noosfero.org/Development/ActionItem3287
    
    This patch add the activate/deactivate feature for organizations. It also add a new administrator feature to manage organizations status in admin pannel.
    
    See merge request !357
    Antonio Terceiro
     
  • (ActionItem3287)
    It can be done while edit a profile or in environment administration panel
    
    Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
    Signed-off-by: David Carlos <ddavidcarlos1392@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>
    Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
    Signed-off-by: Parley Martins <parley@outlook.com>
    Fabio Teixeira
     

19 Jan, 2015

2 commits


14 Jan, 2015

1 commit


13 Jan, 2015

1 commit


12 Jan, 2015

2 commits


07 Jan, 2015

3 commits


16 Dec, 2014

2 commits