Software Público Brasileiro

08 Jul, 2015

3 commits

• df9cc0e2   Merge branch 'api' into production ... Browse Dir »

  Conflicts:
  	Gemfile

  Evandro Junior

  2015-07-08 19:05:52 -0300  
• 486eb678   erge changes Browse Dir »
  Ábner Silva de Oliveira

  2015-07-08 17:20:37 -0300  
• 2b942cdf   merge with noosfero api branch Browse Dir »
  Ábner Silva de Oliveira

  2015-07-08 17:06:37 -0300  

07 Jul, 2015

6 commits

• f42c8282   Support for Serpro captcha backend Browse Dir »
  Evandro Junior

  2015-07-07 17:14:51 -0300  
• 5b6a4ead   Merge branch 'email_template' into production Browse Dir »
  Victor Costa

  2015-07-07 15:24:13 -0300  
• ba00654d   Fix acceptance templates for suggest article task Browse Dir »
  Victor Costa

  2015-07-07 15:23:43 -0300  
• c4d1dd86   Merge branch 'api' into production ... Browse Dir »

  Conflicts:
  	test/fixtures/article_followers.yml

  Victor Costa

  2015-07-07 11:04:20 -0300  
• 20c6f6e1   Merge branch 'email_template' into production Browse Dir »
  Victor Costa

  2015-07-07 10:18:02 -0300  
• 0f9307fe   Move email template selection to task partials Browse Dir »
  Victor Costa

  2015-07-07 10:16: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  

04 Jul, 2015

1 commit

• 52ba8997   api: consider admin role when querying visible people for given person Browse Dir »
  Larissa Reis

  2015-07-04 02:46:29 -0300  

03 Jul, 2015

3 commits

• 5ce42844   Working with environment settings instead of yaml ... Browse Dir »

  ready for Serpro's captcha

  Evandro Junior

  2015-07-03 18:58:47 -0300  
• 8a3a7150   Removes 2 duplicates methods and fixes 1 Browse Dir »
  Evandro Junior

  2015-07-03 11:24:30 -0300  
• 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

7 commits

• 7370a285   Implemented the administrator task notification option - removed debug Browse Dir »
  Carlos Purificação

  2015-07-01 19:39:46 -0300  
• 06f96ca8   fix conflit with add_members_community Browse Dir »
  Leandro Santos

  2015-07-01 18:10:44 -0300  
• 3331bbc7   Implemented the administrator task notification option Browse Dir »
  Carlos Purificação

  2015-07-01 16:28:48 -0300  
• 9549e2e0   Merge branch 'processed_tasks' into production Browse Dir »
  Victor Costa

  2015-07-01 10:43:50 -0300  
• 47e76e0b   Small fix on list of processed tasks Browse Dir »
  Victor Costa

  2015-07-01 10:43:28 -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

11 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  
• 0ff5e77c   Filter processed tasks by who closes it Browse Dir »
  Victor Costa

  2015-06-30 12:20:12 -0300  
• c0bd7efb   Merge branch 'processed_tasks' into production Browse Dir »
  Victor Costa

  2015-06-30 11:54:24 -0300  
• e92fc4ac   Filter processed tasks by who closes it Browse Dir »
  Victor Costa

  2015-06-30 11:52:05 -0300  
• e2cc01db   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	app/controllers/my_profile/tasks_controller.rb
  	public/stylesheets/tasks.css

  Victor Costa

  2015-06-30 11:42:43 -0300  
• 62a74f33   Improve listing of processed tasks Browse Dir »
  Victor Costa

  2015-06-30 11:41:54 -0300  
• 3d9ba6b1   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	app/views/tasks/processed.html.erb
  	public/stylesheets/tasks.css

  Victor Costa

  2015-06-30 11:34:19 -0300  
• 6905648c   Improve listing of processed tasks Browse Dir »
  Victor Costa

  2015-06-30 11:32:42 -0300  
• 786d3c66   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	app/views/tasks/processed.html.erb
  	public/stylesheets/tasks.css

  Victor Costa

  2015-06-30 10:52:31 -0300  
• e9c22c7f   Improve listing of processed tasks Browse Dir »
  Victor Costa

  2015-06-30 10:35:35 -0300  

29 Jun, 2015

7 commits

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

  2015-06-29 17:16:45 -0300  
• ac25637b   Small change on processed tasks view Browse Dir »
  Victor Costa

  2015-06-29 17:16:31 -0300  
• 4012f329   Merge branch 'processed_tasks' into production Browse Dir »
  Victor Costa

  2015-06-29 17:09:36 -0300  
• 05361395   Improve processed tasks view Browse Dir »
  Victor Costa

  2015-06-29 17:09:23 -0300  
• 67e29ed1   Merge branch 'processed_tasks' into production Browse Dir »
  Victor Costa

  2015-06-29 17:02:54 -0300  
• b1b40ef3   Fix task type scope Browse Dir »
  Victor Costa

  2015-06-29 17:02:31 -0300  
• 4ac8b06a   Merge branch 'processed_tasks' into production ... Browse Dir »

  Conflicts:
  	public/stylesheets/tasks.css

  Victor Costa

  2015-06-29 16:45:17 -0300