Software Público Brasileiro

22 Jul, 2015

3 commits

• c003d5c0   merging with serpro context Browse Dir »
  Leandro Santos

  2015-07-22 01:13:21 -0300  
• 8aa812f8   Merge branch 'master' into serpro-context Browse Dir »
  Leandro Santos

  2015-07-22 01:11:47 -0300  
• be1b9751   Submodule: updating submodules Browse Dir »
  Leandro Santos

  2015-07-22 01:11:34 -0300  

21 Jul, 2015

1 commit

• 4aee1457   Add analytics plugin Browse Dir »
  Braulio Bhavamitra

  2015-07-21 18:54:59 -0300  

17 Jul, 2015

1 commit

• 0c93a29d   merge with master - changed to keep tasks filter after tasks close action Browse Dir »
  Ábner Silva de Oliveira

  2015-07-17 15:23:11 -0300  

16 Jul, 2015

1 commit

• 4812b285   Fix JS behaviour to show categories when noosfero is in a subdir environment ... Browse Dir »

  Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

  Gabriela Navarro

  2015-07-16 13:24:24 +0000  

14 Jul, 2015

2 commits

• 973b71d6   Merge branch 'task_taggable' into production Browse Dir »
  Michel Felipe

  2015-07-14 14:33:09 -0300  
• d875f803   Fix problem when remove the last tag Browse Dir »
  Michel Felipe

  2015-07-14 14:30:21 -0300  

13 Jul, 2015

4 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  
• 0702669b   fix conflit with master Browse Dir »
  Leandro Santos

  2015-07-13 16:49:41 -0300  
• e2aca962   Updating public error pages Browse Dir »
  Antonio Terceiro

  2015-07-13 15:33:31 -0300  

08 Jul, 2015

4 commits

• ca09712b   Merge branch 'production' of https://gitlab.com/participa/noosfero into production Browse Dir »
  Evandro Junior

  2015-07-08 19:06:11 -0300  
• df9cc0e2   Merge branch 'api' into production ... Browse Dir »

  Conflicts:
  	Gemfile

  Evandro Junior

  2015-07-08 19:05:52 -0300  
• 071efeec   Merge branch 'task_taggable' into production Browse Dir »
  Michel Felipe

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

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

07 Jul, 2015

3 commits

• 93bc3deb   Merge branch 'master' into serpro-context Browse Dir »
  Leandro Santos

  2015-07-07 08:03:15 -0300  
• 1c541c6f   Merge branch 'serpro-context' of gitlab.com:participa/noosfero into serpro-context Browse Dir »
  Leandro Santos

  2015-07-07 08:02:13 -0300  
• 71adef25   updating submodules Browse Dir »
  Leandro Santos

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

06 Jul, 2015

3 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  
• 95274446   Added public method 'addIcon' to Task module in tasks.js Browse Dir »
  Michel Felipe

  2015-07-06 12:13:23 -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

1 commit

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

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

30 Jun, 2015

4 commits

• 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

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

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

  2015-06-29 17:24:30 -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

3 commits

• 83c8e2dc   Search category with an autocomplete ... Browse Dir »

  (ActionItem3149)

  Braulio Bhavamitra

  2015-06-25 17:04:29 -0300  
• 6f885f13   Fix JS that was trying to return something null ... Browse Dir »

  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

  Gabriela Navarro

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

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

20 Jun, 2015

1 commit

• bfa27a7b   asset-pipeline: add missed selectordie from _javascripts.html.erb Browse Dir »
  Braulio Bhavamitra

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

19 Jun, 2015

1 commit

• f7e0bbf3   themes/base/style.css: remove invalid CSS declaration ... Browse Dir »

  This was breaking the asset pipeline for me when running in production
  mode

  Antonio Terceiro

  2015-06-19 18:19:22 -0300  

17 Jun, 2015

1 commit

• c055f168   Merge branch 'tokeninput-dont-focus-on-init' into 'master' ... Browse Dir »

  tokeninput: don't focus on init to avoid page scroll down
  
  This happens for example on /admin/features with feature members_whitelist_enabled
  with one member added, the page will load and scroll to token input
  
  See merge request !594

  Braulio Bhavamitra

  2015-06-17 23:01:26 +0000