Software Público Brasileiro

21 May, 2015

1 commit

• f8a595c3   Merge branch 'master' into production ... Browse Dir »

  Conflicts:
  	app/views/content_viewer/_article_toolbar.html.erb

  Victor Costa

  2015-05-21 14:28:17 -0300  

19 May, 2015

1 commit

• 1f0a296a   Updated db schema Browse Dir »
  Daniela Feitosa

  2015-05-19 17:04:08 -0300  

13 May, 2015

6 commits

• 0096a365   seeds: load plugin seeds instead of opening a new runner for each one Browse Dir »
  Rodrigo Souto

  2015-05-13 18:22:28 -0300  
• 35872e74   seeds: ensure RAILS_ENV is defined Browse Dir »
  Rodrigo Souto

  2015-05-13 18:22:28 -0300  
• b985a36e   Add seed file for Noosfero with support to plugins custom seed file. ... Browse Dir »

  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

  Gabriela Navarro

  2015-05-13 18:22:28 -0300  
• 920a3d73   content_privacy: further optimizations on migration Browse Dir »
  Rodrigo Souto

  2015-05-13 17:21:25 -0300  
• 617f3a2f   Changed migration to use find_each batch update Browse Dir »
  André Guedes

  2015-05-13 16:33:41 -0300  
• 9360f04a   Add migration to change default private profile content ... Browse Dir »

  Signed-off-by: Alvaro Fernando <alvarofernandoms@gmail.com>
  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
  Signed-off-by: Eduardo Vital <vitaldu@gmail.com>
  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
  Signed-off-by: Luciano Prestes <lucianopcbr@gmail.com>
  Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

  Gabriela Navarro

  2015-05-13 16:32:28 -0300  

12 May, 2015

4 commits

• ea5d6c29   merging with master Browse Dir »
  Leandro Santos

  2015-05-12 21:45:22 -0300  
• 9132007f   Applying merge request revisions ... Browse Dir »

  Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
  Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>

  André Guedes

  2015-05-12 13:15:35 -0300  
• 59c6019c   Migrate for add the fourth box. ... Browse Dir »

  Migrate for add the fourth box to existing enviroments and profiles.
  
  Signed-off-by: Thiago Ribeiro <thiagitosouza@hotmail.com>

  Thiago Ribeiro

  2015-05-12 13:15:35 -0300  
• 248c0b7e   Update schema to add profile_id on role table ... Browse Dir »

  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

  Gabriela Navarro

  2015-05-12 12:47:43 +0000  

08 May, 2015

2 commits

• 8bcf8c4f   Added permission to manage_custom_roles and started test for the controller ... Browse Dir »

  Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
  Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
  Signed-off-by: André Bernardes <andrebsguedes@gmail.com>

  André Guedes

  2015-05-08 16:13:55 -0300  
• 77ffeee2   Added custom roles management for organizations ... Browse Dir »

  Signed-off-by: Hebert Douglas <hebertdougl@gmail.com>
  Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
  Signed-off-by: André Bernardes <andrebsguedes@gmail.com>

  André Guedes

  2015-05-08 16:13:55 -0300  

22 Apr, 2015

1 commit

• 50e88e2f   Revert "Merge branch 'fix_migration' into 'stable'" ... Browse Dir »

  This reverts commit f99f59236b594a7ce10894c97821b1d60364086d, reversing
  changes made to 6736c36dea7396555087da22fe45f001a289a944.

  Evandro Junior

  2015-04-22 12:05:42 -0300  

20 Apr, 2015

1 commit

• 4c937832   fix migration Browse Dir »
  Evandro Junior

  2015-04-20 17:53:16 -0300  

16 Apr, 2015

1 commit

• 42e1b8af   Merge branch 'master' into next Browse Dir »
  Antonio Terceiro

  2015-04-16 09:35:16 -0300  

13 Apr, 2015

4 commits

• 14f2a5e8   Fix merge with api Browse Dir »
  Victor Costa

  2015-04-13 14:47:11 -0300  
• 8a6d7d69   Merge branch 'api' into stable ... Browse Dir »

  Conflicts:
  	config.ru
  	lib/noosfero/plugin.rb

  Victor Costa

  2015-04-13 14:36:36 -0300  
• 9c4dd907   Merge branch 'next' into stable ... Browse Dir »

  Conflicts:
  	app/helpers/layout_helper.rb
  	app/views/layouts/_javascript.html.erb

  Victor Costa

  2015-04-13 14:02:20 -0300  
• 37c45c16   fix conflit with next Browse Dir »
  Leandro Santos

  2015-04-13 09:19:47 -0300  

10 Apr, 2015

1 commit

• d31ddc20   schema.rb: update Browse Dir »
  Braulio Bhavamitra

  2015-04-10 09:59:53 -0300  

09 Apr, 2015

3 commits

• 7dba8f99   fixing conflit Browse Dir »
  Leandro Santos

  2015-04-09 08:19:02 -0300  
• a08cccb5   renaming setting to settings Browse Dir »
  Leandro Santos

  2015-04-09 08:12:21 -0300  
• 68e50a17   fixing conflit with next Browse Dir »
  Leandro Santos

  2015-04-09 07:00:53 -0300  

08 Apr, 2015

3 commits

• c11cfb6d   Merge branch 'next' into stable Browse Dir »
  Leandro Santos

  2015-04-08 21:55:05 -0300  
• 54d9eb37   Add settings field for comments. Now it will be possible to use acts_as_having_fields for comments Browse Dir »
  Leandro Santos

  2015-04-08 21:51:05 -0300  
• beb6bfa0   fix-yaml-migration: use find_each to reduce memory consumption Browse Dir »
  Rodrigo Souto

  2015-04-08 12:10:12 -0300  

24 Mar, 2015

3 commits

• 7fa02316   api: renaming private token migration Browse Dir »
  Leandro Santos

  2015-03-24 21:09:55 -0300  
• 6bc2576f   adding authentication and entity mananegement Browse Dir »
  Leandro Santos

  2015-03-24 20:53:02 -0300  
• 8047cb18   adding private token information to users Browse Dir »
  Leandro Santos

  2015-03-24 20:53:02 -0300  

19 Mar, 2015

1 commit

• 3e5d8c76   Merge branch 'serpro-context' into stable ... Browse Dir »

  Conflicts:
  	app/models/profile.rb
  	app/views/profile_editor/edit.html.erb

  Victor Costa

  2015-03-19 17:52:01 -0300  

16 Mar, 2015

1 commit

• be674ec9   Merge branch 'softwarepublico/noosfero-secret_comunity' into next ... Browse Dir »

  See merge request !481

  Antonio Terceiro

  2015-03-16 16:26:55 -0300  

27 Feb, 2015

3 commits

• 0acacf51   Merge branch 'master' into stable Browse Dir »
  Leandro Santos

  2015-02-27 11:31:41 -0300  
• c5b5a296   db/schema.rb: update Browse Dir »
  Antonio Terceiro

  2015-02-27 11:06:34 -0300  
• f5ff10a3   Update version of acts-as-taggable-on ... Browse Dir »

  See merge request !421
  
  Signed-off-by: Victor Costa <vfcosta@gmail.com>
  Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>

  Victor Costa

  2015-02-27 11:06:12 -0300  

26 Feb, 2015

2 commits

• 0d3ca253   fix conflit with master Browse Dir »
  Leandro Santos

  2015-02-26 10:38:14 -0300  
• 49716023   Add Secret type to communities' privacy options ... Browse Dir »

  - created 'secret' attribute for profiles
  - redefined scope for secret communities
  
  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: Álvaro Fernando <alvarofernandoms@gmail.com>
  Signed-off-by: Dylan Guedes <djmgguedes@gmail.com>
  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Filipe Ribeiro <firibeiro77@live.com>
  Signed-off-by: Pedro de Lyra <pedrodelyra@gmail.com>
  Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

  Filipe Ribeiro de Morais

  2015-02-26 12:53:07 +0000  

25 Feb, 2015

2 commits

• b0d14e87   Revert "db/schema.rb: update" ... Browse Dir »

  This reverts commit 025643a62df719a6cfe63f5927d45585d655a1da.

  Antonio Terceiro

  2015-02-25 18:17:52 -0300  
• 025643a6   db/schema.rb: update Browse Dir »

  6
  Antonio Terceiro

  2015-02-25 12:29:39 -0300