Merge branch 'master' of git@github.com:plainblack/webgui

Conflicts:
	docs/changelog/7.x.x.txt

docs/changelog/7.x.x.txt

@@ -39,6 +39,7 @@
  - fixed #10913: User profiles: Impossible to delete field contents
  - fixed #10929: EMS Ticket Start Date Sort
  - fixed #10885: Code Editor breaks Javascript comments
+ - fixed #10991: Calendar: bug in Display tab
  - added direct value access in DataForm list view
 
 7.7.19

lib/WebGUI/Asset/Wobject/Calendar.pm

@@ -261,6 +261,7 @@ sub definition {
             defaultValue    => [],
             serialize       => 1,
             noFormPost      => 1,
+            autoGenerate    => 0,
             tab             => "display",
         },
 

t/lib/WebGUI/Test.pm

@@ -136,7 +136,7 @@ BEGIN {
             $line =~ s/^\s+//;
             $line =~ s/\s+$//;
             next LINE if !$line;
-            push @INC, $line;
+            unshift @INC, $line;
         }
         close $PRELOAD;
     }