Merge branch '2014.11-develop' into 2015.07
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 28 Jul 2015 13:46:47 +0000 (15:46 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 28 Jul 2015 13:46:47 +0000 (15:46 +0200)
commit5265f47227cf42b7e50eadbb4d02b03572a3cc40
treeef46ee1de1e8f7cd6f479c458892c352de63cad6
parent3e0928c022c7d3f5419525e053a2cab3874e91c7
parentba215ca2540e6a0541cf0b5a596c76591228606f
Merge branch '2014.11-develop' into 2015.07

Conflicts:
tine20/Calendar/Controller/Event.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Calendar/Frontend/iMIP.php
tine20/Calendar/Model/iMIP.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Calendar/js/EventEditDialog.js

Change-Id: Ie2a26449f2fc1239a8f5cfc23719f8521db8c6c7
13 files changed:
tests/tine20/Calendar/Frontend/iMIPTest.php
tine20/Calendar/Config.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Calendar/Frontend/iMIP.php
tine20/Calendar/Model/iMIP.php
tine20/Calendar/Setup/Update/Release8.php
tine20/Calendar/Setup/setup.xml
tine20/Calendar/js/EventEditDialog.js
tine20/Calendar/js/EventUI.js
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Tinebase/js/widgets/ActivitiesPanel.js
tine20/composer.json