Software Público Brasileiro

03 Nov, 2015

2 commits

• b8bc9b1d   Merge branch 'next' into staging Browse Dir »
  Leandro Santos

  2015-11-03 17:54:16 -0300  
• ba65e5b7   Merge branch 'master' into next Browse Dir »
  Leandro Santos

  2015-11-03 14:46:01 -0300  

28 Oct, 2015

1 commit

• 973c28a3   Fixes spread permission ... Browse Dir »

  These permissions were mistakenly removed in a merge. Fixes #142

  Larissa Reis

  2015-10-28 18:20:20 -0300  

13 Oct, 2015

1 commit

• 66c7b785   Block store: improve usability of adding/moving blocks ... Browse Dir »

  Signed-off-by: Victor Costa <vfcosta@gmail.com>
  Signed-off-by: Francisco Marcelo de Araújo Lima Júnior <francisco.lima-junior@serpro.gov.br>
  
  Conflicts:
  	app/controllers/my_profile/profile_design_controller.rb
  	app/helpers/boxes_helper.rb
  	app/helpers/layout_helper.rb
  	app/views/layouts/_javascript.html.erb
  	public/stylesheets/application.css
  	test/functional/environment_design_controller_test.rb
  	test/functional/profile_design_controller_test.rb

  Victor Costa

  2015-10-13 13:10:58 -0300  

30 Sep, 2015

1 commit

• d66aa24c   merging with master Browse Dir »
  Leandro Santos

  2015-09-30 20:12:05 -0300  

24 Sep, 2015

1 commit

• ef41c154   Allow user to remove article or profile image ... Browse Dir »

  2

  Additional improvements include:
  
  - Makes 'Remove Image' checkbox optional
  - Very ugly css hack to hide duplicated labels in some forms. I couldn't
  find another way to avoid the labels generated by labelled_form_for nor
  could I skip adding labels inside the helper since it's supposed to be
  generic.

  Larissa Reis

  2015-09-24 12:38:04 -0300  

22 Sep, 2015

1 commit

• 06bf7862   merging with master Browse Dir »
  Leandro Santos

  2015-09-22 16:12:48 -0300  

14 Sep, 2015

1 commit

• 3d111ca7   Add option to block appearence edit ... Browse Dir »

  - Add before_filter for check permission for open edit header and footer page
  - Change environment feature name of disable_appearance to enable_appearance
  - Update cucumber test change_appearance.feature
  
  Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
  Signed-off-by: Luciano Prestes Cavalcanti <lucianopcbr@gmail.com>
  Signed-off-by: Omar Junior <omarroinuj@gmail.com>
  Signed-off-by: vitorbaraujo <vitornga15@gmail.com>
  Signed-off-by: Victor Matias Navarro <victor.matias.navarro@gmail.com>

  Luciano Prestes

  2015-09-14 14:49:09 -0300  

04 Sep, 2015

2 commits

• db0d70fc   Merge branch 'master' into api Browse Dir »
  Antonio Terceiro

  2015-09-04 16:05:04 -0300  
• 41536a31   Merge branch 'master' into staging Browse Dir »
  Victor Costa

  2015-09-04 14:34:46 -0300  

02 Sep, 2015

1 commit

• 04576c7e   Fix clone article behavior ... Browse Dir »

  Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
  Signed-off-by: DylanGuedes <djmgguedes@gmail.com>
  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Omar Júnior <omarroinuj@gmail.com>
  Signed-off-by: Simiao Carvalho <simiaosimis@gmail.com>
  Signed-off-by: Tallys Martins <tallysmartins@gmail.com>
  Signed-off-by: Vítor Barbosa <vitornga15@gmail.com>

  Vitor Barbosa de Araujo

  2015-09-02 14:53:57 -0300  

13 Aug, 2015

1 commit

• eb070c85   fixing conflit with master Browse Dir »
  Leandro Santos

  2015-08-13 17:44:13 -0300  

12 Aug, 2015

1 commit

• 6c114d19   favorite_enterprises: fix typo (fix product_test) Browse Dir »
  Braulio Bhavamitra

  2015-08-12 22:23:44 -0300  

10 Aug, 2015

2 commits

• e22aa922   Fix mock abused test Browse Dir »
  Braulio Bhavamitra

  2015-08-10 20:43:07 -0300  
• 6573492a   Environment permisson to delete a profile. ... Browse Dir »

  Add environment permission to not allow user to delete a profile
  
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
  Signed-off-by: Thiago Ribeiro <thiagitosouza@gmail.com>

  Thiago Ribeiro

  2015-08-10 15:10:55 -0300  

06 Aug, 2015

2 commits

• c4d4eae3   Remove interpolation from translatable strings ... Browse Dir »

  Also added test/unit/i18n_test.rb which will warn us if any others pop
  up.

  Antonio Terceiro

  2015-08-06 18:47:21 -0300  
• 0b70895d   Change private_token from session to user creation ... Browse Dir »

  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
  Signed-off-by: Luciano Prestes Cavalcanti <luciano@luciano.luciano>

  Luciano Prestes

  2015-08-06 20:01:52 +0000  

27 Jul, 2015

1 commit

• a1038fbb   merge with branch fix-vunerabilities-found-with-breakman Browse Dir »
  Ábner Silva de Oliveira

  2015-07-27 12:19:00 -0300  

25 Jul, 2015

1 commit

• 9fc15501   HOTFIX: fix tests Browse Dir »
  Leandro Santos

  2015-07-25 12:58:14 -0300  

22 Jul, 2015

1 commit

• 86d0f595   fix to sql injections vulnerabilities identified using brakeman Browse Dir »

  1
  Ábner Silva de Oliveira

  2015-07-22 13:26:04 -0300  

17 Jul, 2015

4 commits

• a6472ba8   Merge branch 'processed_tasks' into production Browse Dir »
  Victor Costa

  2015-07-17 16:46:00 -0300  
• 347d0ca2   Merge branch 'production' of gitlab.com:participa/noosfero into production Browse Dir »
  Ábner Silva de Oliveira

  2015-07-17 15:23:37 -0300  
• 0c93a29d   merge with master - changed to keep tasks filter after tasks close action Browse Dir »
  Ábner Silva de Oliveira

  2015-07-17 15:23:11 -0300  
• 0a6daa95   changed to keep the filter applyed to tasks after action close Browse Dir »
  Ábner Silva de Oliveira

  2015-07-17 15:16:44 -0300  

16 Jul, 2015

1 commit

• fa6ea4bd   Merge branch 'email_template' into production ... Browse Dir »

  Conflicts:
  	app/views/admin_panel/index.html.erb

  Victor Costa

  2015-07-16 14:53:46 -0300  

15 Jul, 2015

2 commits

• 331869b0   Manage environment email templates Browse Dir »
  Victor Costa

  2015-07-15 19:33:23 -0300  
• 2c762593   Display available templates filtered by owner type Browse Dir »
  Victor Costa

  2015-07-15 18:14:32 -0300  

14 Jul, 2015

2 commits

• dc939427   fix merge conflit Browse Dir »
  Leandro Santos

  2015-07-14 00:13:43 -0300  
• 42406135   pass the correct search task parameters Browse Dir »

  1
  Leandro Santos

  2015-07-14 00:05:49 -0300  

13 Jul, 2015

2 commits

• a0b75618   merging with master Browse Dir »
  Leandro Santos

  2015-07-13 23:35:44 -0300  
• 338c6e02   Fix task controller protection Browse Dir »
  Victor Costa

  2015-07-13 20:17:28 -0300  

12 Jul, 2015

1 commit

• 89b9b4d9   fix conflit with master Browse Dir »
  Leandro Santos

  2015-07-12 10:31:19 -0300  

06 Jul, 2015

2 commits

• 933d3771   Merge branch 'email_template' into production ... Browse Dir »

  Conflicts:
  	app/models/article.rb
  	test/functional/tasks_controller_test.rb

  Victor Costa

  2015-07-06 17:03:26 -0300  
• 8a4dc901   Choose email template when accept a task Browse Dir »
  Victor Costa

  2015-07-06 17:00:43 -0300  

03 Jul, 2015

1 commit

• ea468c0e   Merge branch 'block-admin-mail' into production ... Browse Dir »

  Conflicts:
  	app/models/event.rb
  	app/models/profile.rb
  	po/fr/noosfero.po

  Victor Costa

  2015-07-03 10:45:54 -0300  

01 Jul, 2015

3 commits

• 4a932d4a   Refactor list of processed tasks Browse Dir »
  Victor Costa

  2015-07-01 11:22:16 -0300  
• 0cc41947   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	app/controllers/my_profile/tasks_controller.rb
  	app/views/tasks/processed.html.erb
  	test/functional/tasks_controller_test.rb

  Victor Costa

  2015-07-01 10:22:39 -0300  
• 0abe320c   Refactor processed task filter Browse Dir »
  Victor Costa

  2015-07-01 10:18:46 -0300  

30 Jun, 2015

2 commits

• 334c1ebd   Filter processed tasks by who closes it Browse Dir »
  Victor Costa

  2015-06-30 15:09:27 -0300  
• 39e1c4ef   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	app/controllers/my_profile/tasks_controller.rb

  Victor Costa

  2015-06-30 12:21:03 -0300