Software Público Brasileiro

18 Dec, 2014

2 commits

• c146c295   Merge branch 'fix_block_display_option' into stable Browse Code »
  Victor Costa

  2014-12-18 14:58:36 -0300  
• 9e7cf971   Fix block display options when a profile has no home page defined ... Browse Code »

  The home_page_only and except_home_page methods should work when no home page was selected for a profile.

  Victor Costa

  2014-12-18 14:55:36 -0300  

17 Dec, 2014

2 commits

• a9370dcb   Merge branch 'fix_task_invitation' into stable Browse Code »
  Victor Costa

  2014-12-17 10:48:55 -0300  
• 2006ce6e   Fix creation of tasks to invite registered users Browse Code »
  Victor Costa

  2014-12-17 10:33:01 -0300  

16 Dec, 2014

23 commits

• c11afdc5   Merge branch 'disable_assets_search_categories' into stable Browse Code »
  Victor Costa

  2014-12-16 17:16:51 -0300  
• 3f8af204   Consider disabled assets at category search Browse Code »

  1
  Victor Costa

  2014-12-16 17:16:32 -0300  
• 0f6b9381   Fix merge that removes chat.css Browse Code »
  Victor Costa

  2014-12-16 16:20:42 -0300  
• ec200890   Merge branch 'hotfixes' into stable Browse Code »
  Victor Costa

  2014-12-16 15:56:41 -0300  
• 9dbf625a   Allow image map html tags Browse Code »
  Victor Costa

  2014-12-16 15:55:26 -0300  
• 89c2be54   Add missing translation from proposals_discussion plugin Browse Code »
  Victor Costa

  2014-12-16 14:41:25 -0300  
• 6ad9e939   Merge branch 'AI3279-block_store' into stable Browse Code »
  Victor Costa

  2014-12-16 14:29:14 -0300  
• ddc61355   Small fix in block store css Browse Code »
  Victor Costa

  2014-12-16 14:29:02 -0300  
• ce9a334d   Merge branch 'stable' of gitlab.com:participa/noosfero into stable Browse Code »
  Victor Costa

  2014-12-16 14:23:20 -0300  
• 08f649a3   Merge branch 'AI3279-block_store' into stable Browse Code »
  Victor Costa

  2014-12-16 14:22:54 -0300  
• eecbf11e   Fix circlepop location Browse Code »
  Victor Costa

  2014-12-16 14:22:39 -0300  
• 2b62ed30   Merge branch 'stable' of gitlab.com:participa/noosfero into stable Browse Code »
  Francisco Júnior

  2014-12-16 14:18:52 -0300  
• 2ad3c985   Merge branch 'AI3279-block_store' into stable Browse Code »
  Victor Costa

  2014-12-16 14:10:10 -0300  
• 8cc3285a   Remove redundant stylesheet tag Browse Code »
  Victor Costa

  2014-12-16 14:09:27 -0300  
• 2aace982   Merge branch 'AI3279-block_store' into stable ... Browse Code »

  Conflicts:
  	app/controllers/box_organizer_controller.rb
  	app/controllers/my_profile/profile_design_controller.rb
  	app/helpers/layout_helper.rb

  Victor Costa

  2014-12-16 13:21:30 -0300  
• 76b22ac6   Fix tests for box_design Browse Code »
  Victor Costa

  2014-12-16 12:52:11 -0300  
• fa27df2c   community_hub: fix up translations Browse Code »
  Francisco Júnior

  2014-12-16 11:58:00 -0300  
• 7b1a306f   Display new help view when clicked at block help Browse Code »
  Victor Costa

  2014-12-16 11:24:37 -0300  
• efcb9970   Pretty name for some blocks Browse Code »
  Victor Costa

  2014-12-16 11:23:27 -0300  
• db0dabfe   Preview images for highlights block Browse Code »
  Victor Costa

  2014-12-16 10:54:07 -0300  
• 25c05b5b   Do not show plugin namespace in pretty block name Browse Code »
  Victor Costa

  2014-12-16 10:29:13 -0300  
• e42898b8   Add some icons to block store ... Browse Code »

  Icons provided by AurelioAHeckert

  Victor Costa

  2014-12-16 10:23:55 -0300  
• dfad044a   Merge branch 'master' into AI3279-block_store ... Browse Code »

  Conflicts:
  	Gemfile
  	Gemfile.lock
  	app/controllers/admin/environment_design_controller.rb
  	app/helpers/layout_helper.rb
  	app/models/block.rb
  	script/quick-start

  Victor Costa

  2014-12-16 10:19:11 -0300  

11 Dec, 2014

8 commits

• 04ae2fd2   Merge branch 'master' into stable Browse Code »
  Victor Costa

  2014-12-11 16:25:22 -0300  
• 90f4f1c1   Merge branch 'master' of gitlab.com:noosfero/noosfero Browse Code »
  Rodrigo Souto

  2014-12-11 16:04:07 -0300  
• f8c24bf8   Add support for salted_md5 passwords Browse Code »
  Rodrigo Souto

  2014-12-11 16:02:57 -0300  
• a48adc48   Merge branch 'AI3205-comment-paragraph' into stable Browse Code »
  Evandro Jr

  2014-12-11 13:49:11 -0300  
• 450382f9   fix for comment break-word Browse Code »
  Evandro Jr

  2014-12-11 13:48:18 -0300  
• 120aaa46   Merge branch 'AI3205-comment-paragraph' into stable Browse Code »
  Evandro Jr

  2014-12-11 13:04:18 -0300  
• bec3e0ec   fix for comments not scrolling Browse Code »
  Evandro Jr

  2014-12-11 13:02:47 -0300  
• 0708fbb4   problem with last comment Browse Code »
  Evandro Jr

  2014-12-11 11:27:30 -0300  

10 Dec, 2014

3 commits

• 79820ea9   Remove peridicity on log_memory_consumption job Browse Code »
  Rodrigo Souto

  2014-12-10 16:34:07 -0300  
• c8c8f629   improving layout Browse Code »
  Evandro Jr

  2014-12-10 13:01:15 -0300  
• 134036eb   saving selected content Browse Code »
  Evandro Jr

  2014-12-10 10:52:27 -0300  

09 Dec, 2014

2 commits

• e0f62835   Enable send_email plugin tests Browse Code »
  Antonio Terceiro

  2014-12-09 14:23:23 -0200  
• 117e3756   Restore template which was not dead code after all ... Browse Code »

  This partially reverts b32ec6cbe8381858f7499e200cf5e443cf2dbd72

  Antonio Terceiro

  2014-12-09 13:55:10 -0200