Merge branch 'pu/2013.10-mutenotification' into 2013.10
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 3 Feb 2015 09:12:11 +0000 (10:12 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 3 Feb 2015 09:12:11 +0000 (10:12 +0100)
Conflicts:
tests/tine20/Calendar/Frontend/iMIPTest.php

Change-Id: I8352806b92bd3d75cac3fafeced6f4b765a8803b

1  2 
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Calendar/Frontend/iMIPTest.php
tests/tine20/Calendar/TestCase.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Model/Event.php
tine20/Calendar/js/EventEditDialog.js
tine20/Calendar/js/Model.js

@@@ -4,10 -4,10 +4,11 @@@
   * 
   * @package     Calendar
   * @license     http://www.gnu.org/licenses/agpl.html
 - * @copyright   Copyright (c) 2011-2012 Metaways Infosystems GmbH (http://www.metaways.de)
 + * @copyright   Copyright (c) 2011-2014 Metaways Infosystems GmbH (http://www.metaways.de)
   * @author      Philipp Schüle <p.schuele@metaways.de>
   * 
 + * @todo        add tests testInvitationCancel and testOrganizerSendBy
+  * @todo extend Calendar_TestCase
   */
  
  /**
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge