Software Público Brasileiro

29 Aug, 2014

1 commit

• 7d5483f1   Merge branch 'master' into rails3_stable ... Browse Code »

  Conflicts:
  	app/helpers/layout_helper.rb
  	db/schema.rb

  Victor Costa

  2014-08-29 11:35:34 -0300  

28 Aug, 2014

2 commits

• 3f489bc4   script/quick-start: fix my stupid mistake Browse Code »
  Antonio Terceiro

  2014-08-28 10:09:59 -0700  
• 13d07d9d   Revert "Gemfile: add gettext_rails" ... Browse Code »

  This reverts commit e0f459cd1cd5e0d3dddbc071cc653c28da183aa1.

  Antonio Terceiro

  2014-08-28 10:00:42 -0700  

27 Aug, 2014

2 commits

• 914ea967   Removing EnvironmentStatisticsBlock from core ... Browse Code »

  PeopleBlock plugin overrides the EnvironmentStatisticsBlock
  
  (ActionItem3045)

  Joenio Costa

  2014-08-27 20:41:41 -0300  
• 5a4f284e   revert some changes made by commit '3d1796' Browse Code »
  Joenio Costa

  2014-08-27 11:26:11 -0300  

26 Aug, 2014

3 commits

• 01c0f483   adding some functional tests ... Browse Code »

  also:
  * keep the tip about separate tags by comma
  * include the css in the header page to have cache
  
  (ActionItem3280)

  Joenio Costa

  2014-08-26 18:01:28 -0300  
• 71b7f7a9   Merge branch 'AI3220_proposals' into rails3_stable ... Browse Code »

  Conflicts:
  	plugins/proposals_discussion/public/proposals_graph.js
  	plugins/proposals_discussion/public/style.css
  	plugins/proposals_discussion/views/content_viewer/topic.html.erb

  Victor Costa

  2014-08-26 09:44:17 -0300  
• 5516d0cc   proposals_discussion: small fixes Browse Code »
  Victor Costa

  2014-08-26 09:42:13 -0300  

25 Aug, 2014

17 commits

• 23613b5a   proposals_discussion: added statistics graph Browse Code »
  Victor Costa

  2014-08-25 18:32:00 -0300  
• 087aeb3e   Merge branch 'AI3220_proposals' into rails3_stable Browse Code »
  Victor Costa

  2014-08-25 18:20:28 -0300  
• 25efbc28   proposals_discussion: added statistics graph Browse Code »
  Victor Costa

  2014-08-25 18:19:09 -0300  
• 26e347c9   Merge branch 'master' into AI3280-tagging Browse Code »
  Joenio Costa

  2014-08-25 17:02:00 -0300  
• 01193a5d   proposals_discussion: fix tests Browse Code »
  Victor Costa

  2014-08-25 16:58:52 -0300  
• 0cfba0a2   proposals_discussion: facebook share button Browse Code »
  Victor Costa

  2014-08-25 14:56:50 -0300  
• 15041fb5   proposals_discussion: new score image Browse Code »
  Victor Costa

  2014-08-25 14:16:27 -0300  
• 5736c372   Merge branch 'master' into AI3220_proposals Browse Code »
  Victor Costa

  2014-08-25 13:41:33 -0300  
• 8b6d5a67   Merge branch 'rails3_chat' into rails3_stable Browse Code »
  Victor Costa

  2014-08-25 12:39:42 -0300  
• 0434ea45   Fix recent messages from chat Browse Code »
  Victor Costa

  2014-08-25 12:39:24 -0300  
• e7fa90d6   Merge branch 'rails3_stable' of gitlab.com:participa/noosfero into rails3_stable Browse Code »
  Victor Costa

  2014-08-25 12:24:38 -0300  
• 32968c83   Merge branch 'master' into rails3_stable Browse Code »
  Victor Costa

  2014-08-25 12:24:07 -0300  
• 315df966   Merge branch 'rails3_stable' of gitlab.com:participa/noosfero into rails3_stable Browse Code »
  Francisco Marcelo de Araújo Lima Júnior

  2014-08-25 12:23:38 -0300  
• 7f7efef1   Merge branch 'rails3_chat' into rails3_stable Browse Code »
  Victor Costa

  2014-08-25 12:19:23 -0300  
• 41519b21   Small fixes on chat layout Browse Code »
  Victor Costa

  2014-08-25 11:27:33 -0300  
• 3ae3a209   Merge branch 'AI3280-tagging' into rails3_stable Browse Code »
  Francisco Marcelo de Araújo Lima Júnior

  2014-08-25 10:58:41 -0300  
• bc6b356a   css fixes Browse Code »
  Francisco Marcelo de Araújo Lima Júnior

  2014-08-25 10:17:36 -0300  

22 Aug, 2014

15 commits

• 4ba472bd   proposals_discussion: custom body label Browse Code »
  Victor Costa

  2014-08-22 14:53:11 -0300  
• 7e1af97f   proposals_discussion: show tags in topic view Browse Code »
  Victor Costa

  2014-08-22 14:47:11 -0300  
• d77b1355   proposals_discussion: improve proposal layout Browse Code »
  Victor Costa

  2014-08-22 14:15:39 -0300  
• 8c198f40   proposals_discussion: added score icon Browse Code »
  Victor Costa

  2014-08-22 13:54:39 -0300  
• 7cea6671   proposals_discussion: normalized score Browse Code »
  Victor Costa

  2014-08-22 12:59:16 -0300  
• f9358611   Merge branch 'ai3109' into 'master' ... Browse Code »

  Support passenger on production
  
  http://noosfero.org/Development/ActionItem3109
  
  See merge request !233

  Antonio Terceiro

  2014-08-22 14:34:54 +0000  
• ab41ed4d   Merge branch 'master' into 'master' ... Browse Code »

  Fixed file to log delayed_job info
  
  http://noosfero.org/Development/ActionItem3245
  
  See merge request !273

  Antonio Terceiro

  2014-08-22 14:31:33 +0000  
• 75fa6f75   Merge branch 'AI3220_proposals' into rails3_stable Browse Code »
  Victor Costa

  2014-08-22 11:22:45 -0300  
• 6223d2b9   proposals_discussion: fix infinite scroll Browse Code »
  Victor Costa

  2014-08-22 11:22:36 -0300  
• 1a06e34e   Fix pt translation Browse Code »
  Antonio Terceiro

  2014-08-22 11:19:57 -0300  
• a6e6ace7   Merge branch 'AI3036-moderate-users-registration' into 'master' ... Browse Code »

  Ai3036 Moderate Users Registration
  
  http://noosfero.org/Development/ActionItem3036
  
  See merge request !188

  Antonio Terceiro

  2014-08-22 14:17:49 +0000  
• a926668c   Merge branch 'AI3220_proposals' into rails3_stable Browse Code »
  Victor Costa

  2014-08-22 11:01:34 -0300  
• 9c5e33d5   proposals_discussion: layout improvements Browse Code »
  Victor Costa

  2014-08-22 11:00:56 -0300  
• 2d72b68e   Merge branch 'rails3_chat' into rails3_stable Browse Code »
  Victor Costa

  2014-08-22 10:11:58 -0300  
• 1e222c89   Fix layout for occupants for group chat Browse Code »
  Victor Costa

  2014-08-22 10:03:17 -0300