Software Público Brasileiro

17 Jul, 2015

9 commits

• 347d0ca2   Merge branch 'production' of gitlab.com:participa/noosfero into production Browse Code »
  Ábner Silva de Oliveira

  2015-07-17 15:23:37 -0300  
• 0c93a29d   merge with master - changed to keep tasks filter after tasks close action Browse Code »
  Ábner Silva de Oliveira

  2015-07-17 15:23:11 -0300  
• 0a6daa95   changed to keep the filter applyed to tasks after action close Browse Code »
  Ábner Silva de Oliveira

  2015-07-17 15:16:44 -0300  
• fedff2e4   Merge branch 'api' into production ... Browse Code »

  Conflicts:
  	lib/noosfero/api/helpers.rb

  Victor Costa

  2015-07-17 11:16:29 -0300  
• 6cbb827e   Fix api article filter Browse Code »
  Victor Costa

  2015-07-17 11:14:46 -0300  
• cb4b0f34   Merge branch 'api' into production Browse Code »
  Victor Costa

  2015-07-17 11:05:45 -0300  
• d8a07bd4   Fix display filter for article children Browse Code »
  Victor Costa

  2015-07-17 11:02:26 -0300  
• e750846e   Update proposals discussion plugin Browse Code »
  Victor Costa

  2015-07-17 10:29:33 -0300  
• 10938a84   Update proposals discussion plugin Browse Code »
  Victor Costa

  2015-07-17 10:22:47 -0300  

16 Jul, 2015

13 commits

• 9cd3e675   change user for person Browse Code »
  Leandro Santos

  2015-07-16 19:12:56 -0300  
• e702b4c7   skip the eager_load if the table of categories not exist Browse Code »
  Francisco Júnior

  2015-07-16 17:29:52 -0300  
• 8f25b03a   Merge branch 'api' into production Browse Code »
  Michel Felipe

  2015-07-16 16:39:35 -0300  
• 0ee6f0f6   Add new url request to activate a user in session end-point Browse Code »
  Michel Felipe

  2015-07-16 16:36:40 -0300  
• 2238acd5   Merge branch 'fix_javascript_categories' into 'master' ... Browse Code »

  Fix JS behaviour to show categories when noosfero is in a subdir environment
  
  The admin page to edit or remove a category breaks when noosfero is a subdir app. We are using the method to get the Noosfero.root to add to the address
  
  See merge request !624

  Antonio Terceiro

  2015-07-16 19:19:22 +0000  
• 84003a1c   Merge branch 'softwarepublico/noosfero-highlight_block_fix' ... Browse Code »

  Closes merge request !623

  Antonio Terceiro

  2015-07-16 16:18:08 -0300  
• 26f01247   Highlight block fix ... Browse Code »

   - Hightlight block links no longer break when noosfero is under a subdir
  
  Signed-off-by: Andre Bernardes <andrebsguedes@gmail.com>
  Signed-off-by: Tallys Martins <tallysmartins@yahoo.com.br>

  Tallys Martins

  2015-07-16 16:17:38 -0300  
• fa6ea4bd   Merge branch 'email_template' into production ... Browse Code »

  Conflicts:
  	app/views/admin_panel/index.html.erb

  Victor Costa

  2015-07-16 14:53:46 -0300  
• 9fef020f   Email template for change password notification Browse Code »
  Victor Costa

  2015-07-16 14:43:00 -0300  
• f092d7d1   changes on api and oauth_client plugin to allow signup through api Browse Code »
  Ábner Silva de Oliveira

  2015-07-16 13:36:58 -0300  
• 4812b285   Fix JS behaviour to show categories when noosfero is in a subdir environment ... Browse Code »

  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  
• 7924652d   Merge branch 'production' of gitlab.com:participa/noosfero into production Browse Code »
  Ábner Silva de Oliveira

  2015-07-16 09:20:23 -0300  
• 4addb21c   make region visible Browse Code »
  Caio Almeida

  2015-07-16 00:56:22 -0300  

15 Jul, 2015

18 commits

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

  2015-07-15 19:33:23 -0300  
• 3af4c864   Fix email template content type Browse Code »
  Victor Costa

  2015-07-15 18:14:40 -0300  
• 2c762593   Display available templates filtered by owner type Browse Code »
  Victor Costa

  2015-07-15 18:14:32 -0300  
• 21d1a349   removing testing code Browse Code »
  Ábner Silva de Oliveira

  2015-07-15 17:20:35 -0300  
• e0189d33   tests support for api signup on oauth_client plugin Browse Code »
  Ábner Silva de Oliveira

  2015-07-15 17:18:27 -0300  
• bb8475aa   changed oauth finish to get user data from params Browse Code »
  Ábner Silva de Oliveira

  2015-07-15 16:40:36 -0300  
• 4b77d185   Merge branch 'production' of gitlab.com:participa/noosfero into production Browse Code »
  Ábner Silva de Oliveira

  2015-07-15 16:20:35 -0300  
• 789caf25   added oauth signup token param to be used to confirm signup Browse Code »
  Ábner Silva de Oliveira

  2015-07-15 16:20:09 -0300  
• e073b436   removed test file Browse Code »
  Evandro Junior

  2015-07-15 15:57:10 -0300  
• 2c9999f2   testing push withouth password Browse Code »
  Evandro Junior

  2015-07-15 15:55:08 -0300  
• 9f86be57   fix tests Browse Code »
  Evandro Junior

  2015-07-15 15:46:38 -0300  
• fc9326ee   Send activation code with email template Browse Code »
  Victor Costa

  2015-07-15 15:11:17 -0300  
• f7311a2f   oauth_client: fix data returned when finish Browse Code »
  Victor Costa

  2015-07-15 12:07:46 -0300  
• 0c00c5ce   oauth_client: return basic user data when finish popup login Browse Code »
  Victor Costa

  2015-07-15 11:07:07 -0300  
• bdfbfdf2   oauth_client: return person object when finish popup login Browse Code »
  Victor Costa

  2015-07-15 10:58:07 -0300  
• 8b3f1f2a   Update proposals_discussion plugin Browse Code »
  Victor Costa

  2015-07-15 10:35:15 -0300  
• c54913e7   Merge branch 'production' of gitlab.com:participa/noosfero into production Browse Code »
  Ábner Silva de Oliveira

  2015-07-15 09:02:56 -0300  
• 3a45d3f4   changed to save oauth data on cache store to use on signup through api Browse Code »
  Ábner Silva de Oliveira

  2015-07-15 09:02:46 -0300