Software Público Brasileiro

26 Mar, 2015

7 commits

• 3c1eb907   Merge branch 'AI3205-comment-paragraph' into stable Browse Code »
  Victor Costa

  2015-03-26 14:48:33 -0300  
• 338114ff   comment_paragraph: fix parser of inner li Browse Code »
  Victor Costa

  2015-03-26 14:48:12 -0300  
• 23e94684   Merge branch 'next' into stable ... Browse Code »

  Conflicts:
  	app/helpers/layout_helper.rb

  Victor Costa

  2015-03-26 13:12:28 -0300  
• 4fc7fbd2   Merge branch 'AI3205-comment-paragraph' into stable Browse Code »
  Victor Costa

  2015-03-26 12:06:54 -0300  
• 3f86c4bf   comment_paragraph: parse li elements Browse Code »
  Victor Costa

  2015-03-26 12:04:36 -0300  
• d9020ffa   Merge branch 'search_template_filter' into 'next' ... Browse Code »

  Search template filter
  
  See merge request !522

  Victor Costa

  2015-03-26 13:10:57 +0000  
• eaaf3e5e   Option to filter by template in search Browse Code »
  Leandro Santos

  2015-03-26 09:49:16 -0300  

20 Mar, 2015

6 commits

• 1fecb0c4   Merge branch 'next' into stable Browse Code »
  Leandro Santos

  2015-03-20 11:06:41 -0300  
• d50ac31c   Merge branch 'master' into next Browse Code »
  Leandro Santos

  2015-03-20 11:03:33 -0300  
• 9807e0ad   pjax: put the correct name and description for plugin Browse Code »
  Leandro Santos

  2015-03-20 10:48:41 -0300  
• af945200   pjax: making localization with gettext Browse Code »
  Leandro Santos

  2015-03-20 10:41:33 -0300  
• e711b3b8   Merge branch 'serpro-context' into stable Browse Code »
  Victor Costa

  2015-03-20 10:08:05 -0300  
• a864550a   Update proposals_discussion plugin Browse Code »
  Victor Costa

  2015-03-20 10:07:04 -0300  

19 Mar, 2015

15 commits

• a7c845ce   Merge branch 'master' of gitlab.com:participa/noosfero Browse Code »
  Leandro Santos

  2015-03-19 22:41:23 -0300  
• 3e5d8c76   Merge branch 'serpro-context' into stable ... Browse Code »

  Conflicts:
  	app/models/profile.rb
  	app/views/profile_editor/edit.html.erb

  Victor Costa

  2015-03-19 17:52:01 -0300  
• b77d88ab   Remove site_tour plugin Browse Code »
  Victor Costa

  2015-03-19 17:49:32 -0300  
• ce9e80c8   Merge branch 'next' into serpro-context Browse Code »
  Victor Costa

  2015-03-19 17:47:59 -0300  
• db62fbb8   Added site_tour plugin Browse Code »
  Victor Costa

  2015-03-19 17:08:29 -0300  
• df49d037   Accept proc in user_data_extras from plugins Browse Code »
  Victor Costa

  2015-03-19 16:59:15 -0300  
• 3981f008   Merge branch 'serpro-context' into stable Browse Code »
  Victor Costa

  2015-03-19 16:48:16 -0300  
• 8cf8c5e2   Remove proposals_discussion plugin Browse Code »
  Victor Costa

  2015-03-19 16:48:11 -0300  
• 3c3a39d3   Merge branch 'master' into AI3205-comment-paragraph Browse Code »
  Victor Costa

  2015-03-19 16:38:00 -0300  
• 8920c3d4   Update proposals_discussion plugin Browse Code »
  Victor Costa

  2015-03-19 16:32:45 -0300  
• a454f1fe   Added proposals_discussion as submodule Browse Code »
  Victor Costa

  2015-03-19 15:41:36 -0300  
• 5de43a78   Add option to make it possible to show the article's section name. ... Browse Code »

  Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com>
  Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
  Signed-off-by: Antonio Terceiro <terceiro@colivre.coop.br>
  
  See merge request !489

  Gabriela Navarro

  2015-03-19 14:26:54 -0300  
• 2e81bdc6   Merge branch 'master' into next Browse Code »
  Antonio Terceiro

  2015-03-19 14:13:06 -0300  
• daa97893   Do not apply zoom in images with disable-zoom class Browse Code »
  Victor Costa

  2015-03-19 13:52:45 -0300  
• 57af24ad   Merge branch 'master' of gitlab.com:noosfero/noosfero Browse Code »
  Victor Costa

  2015-03-19 13:45:48 -0300  

18 Mar, 2015

4 commits

• aa9dccef   Merge branch 'master' of gitlab.com:noosfero/noosfero Browse Code »
  Leandro Santos

  2015-03-18 22:25:53 -0300  
• da29b595   pg_search: fix down on migration Browse Code »
  Braulio Bhavamitra

  2015-03-18 16:38:38 -0300  
• 1e4cabef   Revert "layout: remove tag on metadata_plugin" ... Browse Code »

  This reverts commit e99db083e4bb10047cc8b543bbc5151abbe36372.

  Braulio Bhavamitra

  2015-03-18 09:17:55 -0300  
• 997ef39a   Merge branch 'not_destroy_user_with_moderate_task' into 'master' ... Browse Code »

   Not destroy an user that has a pending ModerateUserRegistration task
  
  See merge request !506

  Leandro Santos

  2015-03-18 02:20:19 +0000  

17 Mar, 2015

8 commits

• 1b1da66a   Merge branch 'next' of gitlab.com:noosfero/noosfero into next Browse Code »
  Leandro Santos

  2015-03-17 23:34:44 -0300  
• c9089344   Merge branch 'master' into stable Browse Code »
  Leandro Santos

  2015-03-17 23:22:28 -0300  
• 6442ffa5   Merge branch 'master' of gitlab.com:noosfero/noosfero Browse Code »
  Leandro Santos

  2015-03-17 23:20:58 -0300  
• 1c99bbcb   Merge branch 'serpro-context' into stable Browse Code »
  Leandro Santos

  2015-03-17 23:05:15 -0300  
• ba449340   updating pairwise plugin Browse Code »
  Leandro Santos

  2015-03-17 23:04:39 -0300  
• 780e4aca   merging with serpro-context Browse Code »
  Leandro Santos

  2015-03-17 22:54:07 -0300  
• 46b01f71   adding pairwise as a submodule Browse Code »
  Leandro Santos

  2015-03-17 22:52:34 -0300  
• df1970e5   removing pairwise plugin from stable core Browse Code »
  Leandro Santos

  2015-03-17 22:43:52 -0300