Software Público Brasileiro

17 Jun, 2014

6 commits

• 9ebfe797   Merge branch 'rails3' into rails3_stable Browse Code »
  Victor Costa

  2014-06-17 12:22:34 -0300  
• 21153d13   rails3: fix change image from profile Browse Code »
  Victor Costa

  2014-06-17 12:22:11 -0300  
• e77ff7f1   Merge branch 'rails3' into rails3_stable Browse Code »
  Victor Costa

  2014-06-17 10:41:19 -0300  
• ba1e746f   rails3: fix profile members management Browse Code »
  Victor Costa

  2014-06-17 10:40:57 -0300  
• f644224e   Merge branch 'master' into rails3 ... Browse Code »

  Conflicts:
  	plugins/display_content/test/unit/display_content_block_test.rb

  Victor Costa

  2014-06-17 10:31:51 -0300  
• 23636102   fixing mass-assignment error in units tests ... Browse Code »

  (ActionItem3124)

  Joenio Costa

  2014-06-17 00:09:15 -0300  

16 Jun, 2014

9 commits

• 5065dff0   Merge branch 'master' into AI3124-article_version Browse Code »
  Joenio Costa

  2014-06-16 22:49:32 -0300  
• e936b0ae   Allow 'rowspan' and 'colspan' in Noosfero's contents ... Browse Code »

  thanks Braulio!

  Joenio Costa

  2014-06-16 22:41:14 -0300  
• efe01800   removing trailing whitespaces ... Browse Code »

  (ActionItem3118)

  Joenio Costa

  2014-06-16 17:03:46 -0300  
• 2a6128ac   Merge branch 'master' into AI3118-list_bug Browse Code »
  Joenio Costa

  2014-06-16 16:58:03 -0300  
• f201ef8a   Merge branch 'master' into AI3120-display_content_fix Browse Code »
  Joenio Costa

  2014-06-16 16:44:37 -0300  
• 3b5767b1   simplifying regex pattern ... Browse Code »

  '\w-' is the same of 'a-zA-Z0-9_-'
  
  (ActionItem3122)

  Joenio Costa

  2014-06-16 16:37:26 -0300  
• a0776e2f   Merge branch 'master' into AI3122-video_y2b_id Browse Code »
  Joenio Costa

  2014-06-16 16:27:15 -0300  
• 556c40eb   Merge remote-tracking branch 'origin/master' Browse Code »
  Joenio Costa

  2014-06-16 16:17:31 -0300  
• 623ce107   Fixing cucumber test ... Browse Code »

  (ActionItem2859)

  Joenio Costa

  2014-06-16 17:20:20 +0000  

15 Jun, 2014

4 commits

• c3d1e14e   Revert "putting back all references to People, Member and Friends blocks" ... Browse Code »

  This reverts commit f8bd2430f86b0b6e3640e2662d1ca689a46ecb98.

  Joenio Costa

  2014-06-15 21:51:18 -0300  
• d5aef626   Added attr created_by on copy when approve article ... Browse Code »

  (ActionItem3097)

  Daniela Feitosa

  2014-06-15 14:48:46 +0000  
• 550663e9   Added migration to include created_by on articles ... Browse Code »

  the migration also fills in the attribute for all the existent articles
  updated db/schema
  
  (ActionItem3097)

  Daniela Feitosa

  2014-06-15 14:48:25 +0000  
• 9fc96fa9   load article's author only when necessary ... Browse Code »

  (ActionItem3097)

  Leandro Santos

  2014-06-15 14:35:04 +0000  

14 Jun, 2014

3 commits

• 2d804325   fix default title of frieds block ... Browse Code »

  (ActionItem2859)

  Joenio Costa

  2014-06-14 23:26:54 -0300  
• f8bd2430   putting back all references to People, Member and Friends blocks ... Browse Code »

  2

  the PeopleBlock plugin that comes with these blocks is enabled by
  default in any Noosfero's environment
  
  (ActionItem2859)

  Joenio Costa

  2014-06-14 00:46:20 -0300  
• ad64d894   Merge branch 'master' into AI2859-people_block Browse Code »
  Joenio Costa

  2014-06-14 00:40:11 -0300  

13 Jun, 2014

3 commits

• aa47fe88   added piwik plugin ... Browse Code »

  added new hotstop "body_ending"

  Joenio Costa

  2014-06-13 23:33:36 -0300  
• 419fe2e5   Merge branch 'rails3_pairwise' into rails3_stable Browse Code »
  Victor Costa

  2014-06-13 08:19:07 -0300  
• ce92699e   rails3: fix pairwise block Browse Code »
  Victor Costa

  2014-06-13 08:18:37 -0300  

12 Jun, 2014

7 commits

• 912e277e   Merge branch 'rails3' into rails3_stable Browse Code »
  Victor Costa

  2014-06-12 11:15:23 -0300  
• 2547177c   rails3: fix profile_list_block query Browse Code »
  Victor Costa

  2014-06-12 11:14:50 -0300  
• 2707bac7   Merge branch 'rails3' into rails3_stable Browse Code »
  Victor Costa

  2014-06-12 11:08:11 -0300  
• 8931fdab   Merge branch 'AI3138-choose_type_display_content' into rails3_stable ... Browse Code »

  Conflicts:
  	plugins/display_content/lib/display_content_block.rb
  	plugins/display_content/test/unit/display_content_block_test.rb

  Victor Costa

  2014-06-12 11:07:48 -0300  
• 859e9ba8   rails3: rename rhtml from display_content plugin Browse Code »
  Victor Costa

  2014-06-12 11:05:45 -0300  
• d6508a9a   Merge branch 'AI3138-choose_type_display_content' into rails3 ... Browse Code »

  Conflicts:
  	plugins/display_content/lib/display_content_block.rb
  	plugins/display_content/test/unit/display_content_block_test.rb

  Victor Costa

  2014-06-12 11:04:28 -0300  
• 19c0fa50   Merge branch 'rails3_AI3163-enable_disable_blocks' into rails3_stable ... Browse Code »

  Conflicts:
  	app/models/environment.rb

  Victor Costa

  2014-06-12 08:31:17 -0300  

11 Jun, 2014

5 commits

• eb7194d9   invert logic Browse Code »
  Francisco Marcelo de Araújo Lima Júnior

  2014-06-11 20:47:15 -0300  
• 575481d6   Merge branch 'rails3' into rails3_stable Browse Code »
  Victor Costa

  2014-06-11 17:54:49 -0300  
• 6c40dd18   rails3: fix js escape on search menu Browse Code »
  Victor Costa

  2014-06-11 17:53:59 -0300  
• ee205bd5   Merge branch 'rails3' into rails3_stable ... Browse Code »

  Conflicts:
  	app/models/environment.rb

  Victor Costa

  2014-06-11 09:48:49 -0300  
• 1a36a52c   rails3: fix comment_group plugin Browse Code »
  Victor Costa

  2014-06-11 09:47:17 -0300  

09 Jun, 2014

3 commits

• 9168ef76   Merge branch 'rails3_AI3163-enable_disable_blocks' into rails3_stable Browse Code »
  Francisco Marcelo de Araújo Lima Júnior

  2014-06-09 14:17:05 -0300  
• 40be915c   add enable/disable blocks feature Browse Code »
  Francisco Marcelo de Araújo Lima Júnior

  2014-06-09 14:05:21 -0300  
• a46df3c9   Merge branch 'master' into rails3 Browse Code »
  Victor Costa

  2014-06-09 13:57:52 -0300