Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 25 Nov 2016 11:02:32 +0000 (12:02 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 25 Nov 2016 11:02:32 +0000 (12:02 +0100)
Change-Id: I8449beba5f30e0b08938893845937cbf4474267c

1  2 
tine20/Calendar/js/CalendarPanelSplitPlugin.js
tine20/Calendar/js/DaysView.js
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Calendar/js/MonthView.js
tine20/Calendar/js/YearView.js

@@@ -169,13 -158,8 +169,14 @@@ Ext.extend(Tine.Calendar.DaysView, Ext.
       */
      scrollBuffer: 200,
      /**
-      * @property {bool} editing
 +     * The minmum all day height in px
 +     * @property Number
 +     * @private
 +     */
 +    minAllDayScrollerHight: 10,
 +    /**
+      * record currently being edited or false
+      * @property {Record} editing
       * @private
       */
      editing: false,
Simple merge
Simple merge