Software Público Brasileiro

01 Jul, 2015

7 commits

• ddb3e686   fix wrong merge Browse Code »
  Leandro Santos

  2015-07-01 18:37:25 -0300  
• 06f96ca8   fix conflit with add_members_community Browse Code »
  Leandro Santos

  2015-07-01 18:10:44 -0300  
• 9549e2e0   Merge branch 'processed_tasks' into production Browse Code »
  Victor Costa

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

  2015-07-01 10:43:28 -0300  
• 1f4d8228   Update po files Browse Code »
  Victor Costa

  2015-07-01 10:37:56 -0300  
• 0cc41947   Merge branch 'processed_tasks' into production ... Browse Code »

  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 Code »
  Victor Costa

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

30 Jun, 2015

12 commits

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

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

  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 Code »
  Victor Costa

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

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

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

  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 Code »
  Victor Costa

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

  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 Code »
  Victor Costa

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

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

  Victor Costa

  2015-06-30 10:52:31 -0300  
• aadacf0e   Update proposals discussion plugin Browse Code »
  Victor Costa

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

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

29 Jun, 2015

16 commits

• 4d97466d   Merge branch 'processed_tasks' into production Browse Code »
  Victor Costa

  2015-06-29 17:25:05 -0300  
• 013cb185   Improve processed tasks view Browse Code »
  Victor Costa

  2015-06-29 17:24:30 -0300  
• ef4c95d1   Merge branch 'processed_tasks' into production Browse Code »
  Victor Costa

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

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

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

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

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

  2015-06-29 17:02:31 -0300  
• 859deab6   Merge branch 'production' of https://gitlab.com/participa/noosfero into production Browse Code »
  Evandro Junior

  2015-06-29 16:51:01 -0300  
• 2b2b4a9e   Merge branch 'api' into production Browse Code »
  Evandro Junior

  2015-06-29 16:50:05 -0300  
• 268ebd86   removed test stubs Browse Code »
  Evandro Junior

  2015-06-29 16:49:24 -0300  
• 4ac8b06a   Merge branch 'processed_tasks' into production ... Browse Code »

  Conflicts:
  	public/stylesheets/tasks.css

  Victor Costa

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

  2015-06-29 16:42:56 -0300  
• 4bd932b1   API can be disabled by config/noosfero.yml api_captcha_enabled: false Browse Code »
  Evandro Junior

  2015-06-29 16:42:24 -0300  
• 13a3feca   Merge branch 'api' into 'production' ... Browse Code »

  Adds captcha for api
  
  Adds captcha for api
  
  See merge request !8

  Evandro Jr

  2015-06-29 18:25:57 +0000  
• 26873359   Test for api captcha Browse Code »
  Evandro Junior

  2015-06-29 10:18:10 -0300  

28 Jun, 2015

3 commits

• fdb1397c   Merge branch 'api' of https://gitlab.com/participa/noosfero into api Browse Code »
  Evandro Junior

  2015-06-28 12:19:43 -0300  
• 80b8212d   Downgrade to captcha v1 server side Browse Code »
  Evandro Junior

  2015-06-28 12:19:07 -0300  
• 4b11c933   New settings for recaptcha api 1 Browse Code »
  Evandro Junior

  2015-06-28 12:05:13 -0300  

27 Jun, 2015

2 commits

• 29917cb1   Merge branch 'api' into production Browse Code »
  Leandro Santos

  2015-06-27 20:20:09 -0300  
• d7ade5cb   user hotfix Browse Code »
  Leandro Santos

  2015-06-27 20:19:47 -0300