Merge branch '2013.10' into 2014.11
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 30 Dec 2014 11:37:05 +0000 (12:37 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 30 Dec 2014 11:37:05 +0000 (12:37 +0100)
commit673ef294ae19d7d543042387044c92fab4d4d04b
tree602add86405694e8daac7b40d54f42daf1f815e3
parentf87b694dcba8c038f57831b8a8be58d3f987803a
parent831067d845411ccc46ce743105a9f22664e85766
Merge branch '2013.10' into 2014.11

Conflicts:
tests/tine20/Calendar/JsonTests.php
tine20/Tinebase/Container.php
tine20/Tinebase/Export/Spreadsheet/Ods.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Record/Abstract.php
tine20/composer.json
tine20/composer.lock

Change-Id: I3d3cf870d6341a33f5262b95a9868c5a9b5ac089
33 files changed:
tests/tine20/Calendar/AllTests.php
tests/tine20/Calendar/JsonTests.php
tests/tine20/Calendar/TestCase.php
tests/tine20/Timetracker/AbstractTest.php
tests/tine20/Tinebase/Acl/RolesTest.php
tests/tine20/Tinebase/ContainerTest.php
tine20/Admin/Controller/User.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Calendar.jsb2
tine20/Calendar/Model/Attender.php
tine20/Calendar/Model/Event.php
tine20/Calendar/Model/Rrule.php
tine20/Calendar/js/EventEditDialog.js
tine20/Calendar/js/MainScreenCenterPanel.js
tine20/Tinebase/Acl/Roles.php
tine20/Tinebase/Config/Abstract.php
tine20/Tinebase/Container.php
tine20/Tinebase/Convert/Json.php
tine20/Tinebase/DateTime.php
tine20/Tinebase/Db/Table.php
tine20/Tinebase/Export/Abstract.php
tine20/Tinebase/Export/Spreadsheet/Ods.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Notes.php
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/Record/RecordSet.php
tine20/Tinebase/Server/Json.php
tine20/Tinebase/Translation.php
tine20/Tinebase/User/Sql.php
tine20/Tinebase/WebDav/Collection/AbstractContainerTree.php
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js
tine20/composer.json
tine20/composer.lock