Software Público Brasileiro

31 Oct, 2014

26 commits

• 7d30f423   Merge branch 'api' into stable Browse Code »
  Victor Costa

  2014-10-31 18:05:00 -0300  
• f0e284f8   Fix api date format Browse Code »
  Victor Costa

  2014-10-31 18:03:52 -0300  
• 8e21cd98   Merge branch 'stable' of gitlab.com:participa/noosfero into stable Browse Code »
  Victor Costa

  2014-10-31 17:05:38 -0300  
• b09f337e   Merge branch 'api' into stable ... Browse Code »

  Conflicts:
  	Gemfile

  Victor Costa

  2014-10-31 17:04:52 -0300  
• cf2b8ce4   Merge branch 'master' into api ... Browse Code »

  Conflicts:
  	Gemfile

  Victor Costa

  2014-10-31 17:04:15 -0300  
• 6386287a   Add logger to api requests Browse Code »
  Victor Costa

  2014-10-31 17:02:58 -0300  
• b73eb20d   Merge branch 'AI3205-comment-paragraph' into stable Browse Code »
  Evandro Jr

  2014-10-31 16:06:08 -0300  
• 1d6c5692   removed unnecessary old ballon element Browse Code »
  Evandro Jr

  2014-10-31 15:58:21 -0300  
• 72bde107   Merge branch 'hotfixes' into stable Browse Code »
  Francisco Júnior

  2014-10-31 15:41:56 -0300  
• a9bb3ddd   community_track: fix content_type return if context is not cms controller Browse Code »
  Francisco Júnior

  2014-10-31 15:01:43 -0300  
• 68a0e942   Merge branch 'AI3074-community_dashboard' into stable Browse Code »
  Victor Costa

  2014-10-31 14:52:03 -0300  
• 6aaa426e   community_hub: allow creation of hub with parent Browse Code »
  Victor Costa

  2014-10-31 14:51:49 -0300  
• 71d7e8fa   community_track: added hub as an option to step Browse Code »
  Victor Costa

  2014-10-31 14:08:56 -0300  
• e758beb5   Merge branch 'stable' of gitlab.com:participa/noosfero into stable Browse Code »
  Victor Costa

  2014-10-31 14:04:56 -0300  
• 93a184cd   Merge branch 'AI3074-community_dashboard' into stable Browse Code »
  Victor Costa

  2014-10-31 14:04:11 -0300  
• a0238807   community_hub: adds description methods Browse Code »
  Victor Costa

  2014-10-31 13:45:45 -0300  
• dea1968e   Merge branch 'AI3205-comment-paragraph' into stable Browse Code »
  Francisco Júnior

  2014-10-31 11:31:24 -0300  
• 39c68a4e   comment_paragraph: remove support for text article with textile markup language Browse Code »
  Francisco Júnior

  2014-10-31 11:27:21 -0300  
• 8f571c03   Merge branch 'AI3074-community_dashboard' into stable Browse Code »
  Victor Costa

  2014-10-31 10:30:44 -0300  
• 568e84c9   community_hub: fix view Browse Code »
  Victor Costa

  2014-10-31 10:28:07 -0300  
• 1ac61676   Merge branch 'master' into AI3074-community_dashboard Browse Code »
  Victor Costa

  2014-10-31 10:26:57 -0300  
• 2ece184b   Merge branch 'rails3_community_dashboard' into stable Browse Code »
  Victor Costa

  2014-10-31 10:23:08 -0300  
• 3b3be02b   community_hub: remove rhtml Browse Code »
  Victor Costa

  2014-10-31 10:22:41 -0300  
• cfcda5a4   Merge branch 'AI3074-community_dashboard' into rails3_community_dashboard Browse Code »
  Victor Costa

  2014-10-31 10:21:47 -0300  
• 63106389   Merge branch 'stable' of gitlab.com:participa/noosfero into stable Browse Code »
  Victor Costa

  2014-10-31 10:10:48 -0300  
• 9418b82e   sub_organizations: fix permission verification method Browse Code »
  Victor Costa

  2014-10-31 10:10:01 -0300  

30 Oct, 2014

14 commits

• 1ac71b0c   Merge branch 'stable' of gitlab.com:participa/noosfero into stable Browse Code »
  Evandro Jr

  2014-10-30 18:04:11 -0300  
• 600a5c1b   Merge branch 'AI3205-comment-paragraph' into stable Browse Code »
  Evandro Jr

  2014-10-30 18:03:37 -0300  
• ebdc49d6   Merge branch 'AI3205-comment-paragraph' of gitlab.com:participa/noosfero into AI… ... Browse Code »

  …3205-comment-paragraph

  Francisco Júnior

  2014-10-30 17:43:01 -0300  
• c820a6b3   comment_paragraph: minor fixes Browse Code »
  Francisco Júnior

  2014-10-30 17:42:24 -0300  
• b8304468   Merge branch 'fix_lazy_queries' into stable Browse Code »

  1
  Victor Costa

  2014-10-30 17:09:39 -0300  
• ae2c7ab3   Include relation models in comment children Browse Code »
  Victor Costa

  2014-10-30 17:09:30 -0300  
• ed4938b5   Merge branch 'AI3205-comment-paragraph' into stable Browse Code »

  1
  Victor Costa

  2014-10-30 17:02:32 -0300  
• 02686390   Merge branch 'stable' of gitlab.com:participa/noosfero into stable Browse Code »
  Evandro Jr

  2014-10-30 16:45:27 -0300  
• 60c19859   Merge branch 'AI3205-comment-paragraph' into stable Browse Code »
  Evandro Jr

  2014-10-30 16:44:51 -0300  
• 84cdb87a   Fix for breaking post buttons at comment paragraph in Portuguese Browse Code »
  Evandro Jr

  2014-10-30 16:42:36 -0300  
• 853cc8ef   Merge branch 'fix_lazy_queries' into stable ... Browse Code »

  1

  Conflicts:
  	app/models/comment.rb

  Victor Costa

  2014-10-30 16:07:27 -0300  
• 3b1f8018   Added support to bullet gem in development Browse Code »
  Victor Costa

  2014-10-30 16:04:06 -0300  
• 00b9fc3d   Added includes in models to prevent n+1 queries ... Browse Code »

  N+1 queries found with the help of bullet gem

  Victor Costa

  2014-10-30 16:03:59 -0300  
• a0ef4f25   Merge branch 'fix_lazy_queries' into stable ... Browse Code »

  2

  Conflicts:
  	app/controllers/public/content_viewer_controller.rb

  Victor Costa

  2014-10-30 15:31:52 -0300