Software Público Brasileiro

07 Jul, 2015

8 commits

• 3562ae68   Merge branch 'production' of gitlab.com:participa/noosfero into production Browse Code »
  Victor Costa

  2015-07-07 10:18:33 -0300  
• 20c6f6e1   Merge branch 'email_template' into production Browse Code »
  Victor Costa

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

  2015-07-07 10:16:19 -0300  
• 66d63ed2   fix conflit with serpro context Browse Code »
  Leandro Santos

  2015-07-07 08:01:14 -0300  
• a6c2ec9e   adding and updating submodules Browse Code »
  Leandro Santos

  2015-07-07 08:00:31 -0300  
• aa865e90   adding gravatar provider plugin Browse Code »
  Leandro Santos

  2015-07-07 07:59:22 -0300  
• 4cac390a   adding juventude submodule Browse Code »
  Leandro Santos

  2015-07-07 07:58:05 -0300  
• 71adef25   updating submodules Browse Code »
  Leandro Santos

  2015-07-07 07:56:58 -0300  

06 Jul, 2015

4 commits

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

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

  2015-07-06 17:00:43 -0300  
• 64a43730   Merge branch 'production' of gitlab.com:participa/noosfero into production Browse Code »
  Victor Costa

  2015-07-06 16:59:19 -0300  
• 0d31ba6d   Added new translate msgs about task categories Browse Code »
  Michel Felipe

  2015-07-06 16:07:49 -0300  

03 Jul, 2015

1 commit

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

  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

17 commits

• 135c10f9   Merge branch 'api' into production Browse Code »
  Leandro Santos

  2015-07-01 23:37:25 -0300  
• 3dd2b47e   API: adding tag endpoint Browse Code »
  Caio Almeida

  2015-07-01 23:35:57 -0300  
• dae563db   API: expose tag_list parameter for articles Browse Code »
  Caio Almeida

  2015-07-01 22:59:48 -0300  
• 53d99f9e   API: removing uncessary code to expose tags Browse Code »
  Caio Almeida

  2015-07-01 22:42:57 -0300  
• d782d26b   API: adding tags endpoint Browse Code »
  Caio Almeida

  2015-07-01 22:34:49 -0300  
• c279721d   API: Adding report abuse support for articles Browse Code »
  Caio Almeida

  2015-07-01 22:19:01 -0300  
• a1f85f37   Implemented the administrator task notification option - tests Browse Code »
  Carlos Purificação

  2015-07-01 19:46:18 -0300  
• 0c1c42cb   HOTFIX removing unecessary fixture Browse Code »
  Leandro Santos

  2015-07-01 19:43:22 -0300  
• 7370a285   Implemented the administrator task notification option - removed debug Browse Code »
  Carlos Purificação

  2015-07-01 19:39:46 -0300  
• 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  
• 3331bbc7   Implemented the administrator task notification option Browse Code »
  Carlos Purificação

  2015-07-01 16:28:48 -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

10 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