Merge branch '2014.11' into 2014.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:33:57 +0000 (10:33 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 11 Feb 2016 09:33:57 +0000 (10:33 +0100)
Conflicts:
tine20/Calendar/js/Model.js

Change-Id: I8a239c5c794dab3a24c9508161b017159605cbc5

1  2 
tine20/Calendar/Frontend/Json.php
tine20/Calendar/js/Model.js
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Timemachine/ModificationLog.php

Simple merge
@@@ -191,7 -185,13 +191,7 @@@ Tine.Calendar.Model.Event.getDefaultDat
          transp: 'OPAQUE',
          editGrant: true,
          organizer: organizer,
-         attendee: Tine.Calendar.Model.Event.getDefaultAttendee(organizer)
 -        attendee: Tine.Calendar.Model.Event.getDefaultAttendee(organizer, container) /*[
 -            Ext.apply(Tine.Calendar.Model.Attender.getDefaultData(), {
 -                user_type: 'user',
 -                user_id: Tine.Tinebase.registry.get('userContact'),
 -                status: 'ACCEPTED'
 -            })
 -        ]*/
++        attendee: Tine.Calendar.Model.Event.getDefaultAttendee(organizer, container)
      };
      
      if (prefs.get('defaultalarmenabled')) {