Software Público Brasileiro

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

1 commit

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

  2015-07-15 19:33:23 -0300  

13 Jul, 2015

2 commits

• d1300777   fixing conflit with api branch Browse Dir »
  Leandro Santos

  2015-07-13 20:31:11 -0300  
• 57905307   Merge branch 'colivre_api' into serpro_api Browse Dir »
  Leandro Santos

  2015-07-13 16:50:50 -0300  

10 Jul, 2015

1 commit

• bfcb1193   Sort API endpoints for playground Browse Dir »
  Aurélio A. Heckert

  2015-07-10 17:41:08 -0300  

08 Jul, 2015

2 commits

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

  Conflicts:
  	Gemfile

  Evandro Junior

  2015-07-08 19:05:52 -0300  
• 2b942cdf   merge with noosfero api branch Browse Dir »
  Ábner Silva de Oliveira

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

07 Jul, 2015

4 commits

• 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  
• 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  

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

5 commits

• 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

7 commits

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

  2015-06-30 15:09:27 -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  
• 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

6 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  
• 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

4 commits

• 556c20c3   folder: let word wrap work (do not short filenames) ... Browse Dir »

  This also removes short_filename as it is now unused

  Braulio Bhavamitra

  2015-06-25 17:04:29 -0300  
• 83c8e2dc   Search category with an autocomplete ... Browse Dir »

  (ActionItem3149)

  Braulio Bhavamitra

  2015-06-25 17:04:29 -0300  
• df75ad3f   Add last update column on cms listing ... Browse Dir »

  Conflicts:
  	app/views/cms/_view_items.html.erb
  	config/locales/en.yml

  Braulio Bhavamitra

  2015-06-25 17:04:28 -0300  
• d3b8064f   Merge branch 'master' into api Browse Dir »
  Rodrigo Souto

  2015-06-25 11:31:15 -0300  

23 Jun, 2015

1 commit

• 5911b3bf   Revert "Disable piwik" ... Browse Dir »

  This reverts commit 82fc99e4c9a1001771a94c5a585944b2cb9001e3.

  Victor Costa

  2015-06-23 16:15:48 -0300  

20 Jun, 2015

1 commit

• 672dc28b   products: fix typo in javascript_include_tag Browse Dir »
  Braulio Bhavamitra

  2015-06-20 22:21:33 -0300  

19 Jun, 2015

1 commit

• 82fc99e4   Disable piwik Browse Dir »

  1
  Victor Costa

  2015-06-19 09:02:54 -0300  

18 Jun, 2015

1 commit

• d65a2fb4   Merge branch 'email_template' into production Browse Dir »
  Evandro Jr

  2015-06-18 14:52:40 -0300