Software Público Brasileiro

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

• 06f96ca8   fix conflit with add_members_community Browse Dir »
  Leandro Santos

  2015-07-01 18:10:44 -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  

29 Jun, 2015

2 commits

• 4ac8b06a   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	public/stylesheets/tasks.css

  Victor Costa

  2015-06-29 16:45:17 -0300  
• e21366f1   Improve listing of processed tasks Browse Dir »
  Victor Costa

  2015-06-29 16:42:56 -0300  

25 Jun, 2015

1 commit

• 3e3dcb24   Put limit on tag search Browse Dir »
  Braulio Bhavamitra

  2015-06-25 23:12:12 -0300  

17 Jun, 2015

4 commits

• 5ee24034   Refactoring article content visualization ... Browse Dir »

    - Added image label
    - Added image to article body
    - Changed some minor positioning
  
  Signed-off-by: André Bernardes <andrebsguedes@gmail.com>
  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: Fábio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
  Signed-off-by: Tallys Martins <tallysmartins@gmail.com>

  André Guedes

  2015-06-17 15:19:06 -0300  
• 122ef265   Merge branch 'email_template' into production Browse Dir »
  Victor Costa

  2015-06-17 14:24:37 -0300  
• f55f3ef9   Add new permission to manage email templates Browse Dir »
  Victor Costa

  2015-06-17 14:23:54 -0300  
• 01a73fbc   Merge branch 'email_template' into production ... Browse Dir »

  Conflicts:
  	Gemfile
  	public/proposal-app
  	public/stylesheets/application.css

  Victor Costa

  2015-06-17 11:01:44 -0300  

16 Jun, 2015

3 commits

• 364e52a3   Merge branch 'master' into production ... Browse Dir »

  1

  Conflicts:
  	lib/noosfero/plugin.rb

  Victor Costa

  2015-06-16 18:16:44 -0300  
• bff21134   Define multiple types for email templates Browse Dir »
  Victor Costa

  2015-06-16 15:10:16 -0300  
• d215b232   Option to choose template to send email to members Browse Dir »
  Victor Costa

  2015-06-16 11:10:38 -0300  

12 Jun, 2015

3 commits

• dbea8847   Refactor deprecated code for date to use rails method ... Browse Dir »

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

  Gabriela Navarro

  2015-06-12 13:33:36 -0300  
• b8629708   Add date format option for articles from the environment ... Browse Dir »

  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>

  Gabriela Navarro

  2015-06-12 13:03:20 -0300  
• 769eb2c5   Add new visualization option for blog posts. ... Browse Dir »

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

  David Silva

  2015-06-12 13:03:20 -0300  

11 Jun, 2015

3 commits

• 8a4841d6   Fix functional and integration broken tests ... Browse Dir »

  Signed-off-by: André Guedes <andrebsguedes@gmail.com>
  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>

  Arthur Esposte

  2015-06-11 14:21:45 -0300  
• 2540b45c   Fix tests related to privacity ... Browse Dir »

  Signed-off-by: André Guedes <andrebsguedes@gmail.com>
  Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com>
  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>

  André Guedes

  2015-06-11 14:21:45 -0300  
• 2c72cbbf   Handle access denied to not logged user properly Browse Dir »
  Arthur Esposte

  2015-06-11 14:21:45 -0300  

08 Jun, 2015

1 commit

• 97e657da   organizations: remove mistaken enabled? method Browse Dir »
  Rodrigo Souto

  2015-06-08 15:54:52 -0300  

05 Jun, 2015

3 commits

• 8f30d072   merging with master Browse Dir »
  Leandro Santos

  2015-06-05 12:06:10 -0300  
• 9bfd45df   Store the person that closes a task Browse Dir »
  Victor Costa

  2015-06-05 11:13:24 -0300  
• d7d222b8   Merge branch 'task_taggable' into production Browse Dir »
  Leandro Santos

  2015-06-05 08:38:13 -0300  

03 Jun, 2015

10 commits

• 72ec6ae5   Refactor in tasks.js to create a singleton 'Task', show success icon after save … ... Browse Dir »

  …each tag and tasks.css changes

  Michel Felipe

  2015-06-03 17:52:33 -0300  
• 379c7653   fix conflit with task_taggable branch Browse Dir »
  Leandro Santos

  2015-06-03 17:28:45 -0300  
• d555951e   Merge branch 'master' into production Browse Dir »
  Leandro Santos

  2015-06-03 17:26:02 -0300  
• f5aeac9a   adding search task specific for task controler to make permission control Browse Dir »
  Leandro Santos

  2015-06-03 17:24:26 -0300  
• f176dfb2   Merge branch 'production' of gitlab.com:participa/noosfero into production Browse Dir »
  Victor Costa

  2015-06-03 17:04:27 -0300  
• cf889378   Fix redirection for profile with a custom domain ... Browse Dir »

  1

  Set profile to nil rather than delete the key so the nil value will
  take precedence over the value stored in request object.

  Victor Costa

  2015-06-03 17:04:17 -0300  
• 5fb63731   consider permission to close tasks Browse Dir »
  Leandro Santos

  2015-06-03 15:37:47 -0300  
• f6185329   refactoring some tasks controller tests Browse Dir »
  Leandro Santos

  2015-06-03 11:24:41 -0300  
• 4aa45dd8   Handle related suggestions when a profile is destroyed Browse Dir »
  Arthur Esposte

  2015-06-03 08:15:26 -0300  
• 7e162ba3   Added unit and functional tests of tags in tasks Browse Dir »
  Michel Felipe

  2015-06-03 07:33:49 -0300  

02 Jun, 2015

2 commits

• eeb89429   Merge branch 'master' into production Browse Dir »
  Leandro Santos

  2015-06-02 20:36:25 -0300  
• b39a1a37   merging with master Browse Dir »
  Leandro Santos

  2015-06-02 14:15:49 -0300  

01 Jun, 2015

1 commit

• d01c42a2   New permission 'view_tasks' that allow only tasks visualization Browse Dir »
  Victor Costa

  2015-06-01 16:51:16 -0300  

30 May, 2015

1 commit

• 3b63b2e9   removing reponsible filter from person task management Browse Dir »
  Leandro Santos

  2015-05-30 22:07:24 -0300