Merge branch 'caldav-2011-05' into caldav
authorCornelius Weiß <mail@corneliusweiss.de>
Mon, 12 Dec 2011 12:23:05 +0000 (13:23 +0100)
committerCornelius Weiß <mail@corneliusweiss.de>
Mon, 12 Dec 2011 12:23:05 +0000 (13:23 +0100)
commit25958cce8d6ca3c87f3256e6738115b160e1501b
tree3b8bd22447d58abfa3cef1eba9acbf6b9d76a3dd
parent3b9533bd57f07ea2b3bf1de89b8864f813c795a8
parent1c5e686785f80b0e855f20996f863f954ea3d25c
Merge branch 'caldav-2011-05' into caldav

Conflicts:
scripts/packaging/build-tine20-packages.sh
scripts/packaging/debian/patches/config.inc.php.dist.diff
tests/tine20/Addressbook/JsonTest.php
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Calendar/Controller/RecurTest.php
tests/tine20/Calendar/RruleTests.php
tests/tine20/Crm/JsonTest.php
tests/tine20/Felamimail/Controller/MessageTest.php
tine20/ActiveSync/Command/Sync.php
tine20/Addressbook/Addressbook.jsb2
tine20/Addressbook/Controller/Contact.php
tine20/Addressbook/Setup/setup.xml
tine20/Admin/Frontend/Json.php
tine20/Calendar/Calendar.jsb2
tine20/Calendar/Controller/Event.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Calendar/Frontend/Json.php
tine20/Calendar/Import/Ical.php
tine20/Calendar/Model/EventFilter.php
tine20/Calendar/js/CalendarPanel.js
tine20/Calendar/js/EventDetailsPanel.js
tine20/ExampleApplication/Model/ExampleRecordFilter.php
tine20/Felamimail/Controller/Cache/Message.php
tine20/Felamimail/Controller/Folder.php
tine20/Felamimail/Controller/Message.php
tine20/Felamimail/Setup/Update/Release4.php
tine20/Felamimail/Setup/setup.xml
tine20/Felamimail/translations/bg.po
tine20/Felamimail/translations/ca.po
tine20/Felamimail/translations/cs.po
tine20/Felamimail/translations/de.mo
tine20/Felamimail/translations/de.po
tine20/Felamimail/translations/en.po
tine20/Felamimail/translations/es.po
tine20/Felamimail/translations/fr.po
tine20/Felamimail/translations/hu.mo
tine20/Felamimail/translations/hu.po
tine20/Felamimail/translations/it.po
tine20/Felamimail/translations/ja.po
tine20/Felamimail/translations/nb.po
tine20/Felamimail/translations/pl.mo
tine20/Felamimail/translations/pl.po
tine20/Felamimail/translations/ru.po
tine20/Felamimail/translations/sv.po
tine20/Felamimail/translations/template.pot
tine20/Felamimail/translations/zh_CN.po
tine20/Felamimail/translations/zh_TW.po
tine20/Sales/Controller/Contract.php
tine20/Setup/Controller.php
tine20/Setup/ExtCheck.php
tine20/Setup/translations/de.po
tine20/Setup/translations/pl.po
tine20/SimpleFAQ/translations/bg.po
tine20/SimpleFAQ/translations/ca.po
tine20/SimpleFAQ/translations/cs.po
tine20/SimpleFAQ/translations/de.po
tine20/SimpleFAQ/translations/es.po
tine20/SimpleFAQ/translations/fr.po
tine20/SimpleFAQ/translations/it.po
tine20/SimpleFAQ/translations/ja.po
tine20/SimpleFAQ/translations/nb.po
tine20/SimpleFAQ/translations/pl.mo
tine20/SimpleFAQ/translations/pl.po
tine20/SimpleFAQ/translations/ru.po
tine20/SimpleFAQ/translations/sv.po
tine20/SimpleFAQ/translations/template.pot
tine20/SimpleFAQ/translations/zh_CN.po
tine20/SimpleFAQ/translations/zh_TW.po
tine20/Sipgate/Frontend/Json.php
tine20/Sipgate/js/CallStateWindow.js
tine20/Sipgate/js/DialNumberDialog.js
tine20/Sipgate/js/SearchAddressDialog.js
tine20/Sipgate/js/Sipgate.js
tine20/Sipgate/translations/bg.po
tine20/Sipgate/translations/ca.po
tine20/Sipgate/translations/cs.po
tine20/Sipgate/translations/de.po
tine20/Sipgate/translations/es.po
tine20/Sipgate/translations/fr.po
tine20/Sipgate/translations/hu.mo
tine20/Sipgate/translations/hu.po
tine20/Sipgate/translations/it.po
tine20/Sipgate/translations/ja.po
tine20/Sipgate/translations/nb.po
tine20/Sipgate/translations/pl.po
tine20/Sipgate/translations/ru.po
tine20/Sipgate/translations/sv.po
tine20/Sipgate/translations/template.pot
tine20/Sipgate/translations/zh_CN.po
tine20/Sipgate/translations/zh_TW.po
tine20/Timetracker/js/TimesheetEditDialog.js
tine20/Tinebase/Config.php
tine20/Tinebase/DateTime.php
tine20/Tinebase/Exception/Backend/Database.php
tine20/Tinebase/Exception/Backend/Ldap.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/Model/Filter/Container.php
tine20/Tinebase/Notification/Backend/Smtp.php
tine20/Tinebase/Server/WebDAV.php
tine20/Tinebase/Setup/Update/Release4.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/css/Tinebase.css
tine20/Tinebase/js/widgets/grid/PickerGridPanel.js
tine20/Tinebase/js/widgets/persistentfilter/PickerPanel.js
tine20/Tinebase/js/widgets/tree/ContextMenu.js
tine20/Tinebase/translations/bg.po
tine20/Tinebase/translations/ca.po
tine20/Tinebase/translations/cs.po
tine20/Tinebase/translations/de.mo
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/en.po
tine20/Tinebase/translations/es.po
tine20/Tinebase/translations/fr.po
tine20/Tinebase/translations/hu.po
tine20/Tinebase/translations/it.po
tine20/Tinebase/translations/ja.po
tine20/Tinebase/translations/nb.po
tine20/Tinebase/translations/pl.po
tine20/Tinebase/translations/ru.po
tine20/Tinebase/translations/sv.po
tine20/Tinebase/translations/template.pot
tine20/Tinebase/translations/zh_CN.po
tine20/Tinebase/translations/zh_TW.po
49 files changed:
tests/tine20/ActiveSync/Controller/ContactsTests.php
tests/tine20/ActiveSync/Controller/EmailTests.php
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/Controller/EventTests.php
tests/tine20/Felamimail/Controller/MessageTest.php
tests/tine20/Tinebase/ContainerTest.php
tests/tine20/Tinebase/NotificationTest.php
tests/tine20/Tinebase/Record/RecordSetTest.php
tine20/Addressbook/Addressbook.jsb2
tine20/Addressbook/Controller.php
tine20/Addressbook/Controller/Contact.php
tine20/Addressbook/Setup/Update/Release4.php
tine20/Calendar/Backend/Sql.php
tine20/Calendar/Calendar.jsb2
tine20/Calendar/Controller/Event.php
tine20/Calendar/Controller/MSEventFacade.php
tine20/Calendar/Frontend/Json.php
tine20/Calendar/Model/Attender.php
tine20/Calendar/Model/EventFilter.php
tine20/Calendar/js/EventDetailsPanel.js
tine20/Calendar/js/Model.js
tine20/ExampleApplication/Controller.php
tine20/Felamimail/Controller/Cache/Message.php
tine20/Felamimail/Controller/Message.php
tine20/Felamimail/Frontend/Json.php
tine20/Felamimail/Model/Message.php
tine20/Felamimail/Setup/Update/Release4.php
tine20/Felamimail/js/Model.js
tine20/Filemanager/Frontend/WebDav.php
tine20/Filemanager/Frontend/WebDav/Node.php
tine20/Setup/Controller.php
tine20/SimpleFAQ/translations/hu.po
tine20/Tinebase/Backend/Sql/Abstract.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Convert/Interface.php
tine20/Tinebase/Core.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Model/Container.php
tine20/Tinebase/Notification/Backend/Smtp.php
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/Record/RecordSet.php
tine20/Tinebase/Server/WebDAV.php
tine20/Tinebase/Setup/Update/Release4.php
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/css/Tinebase.css
tine20/Tinebase/js/widgets/container/TreePanel.js
tine20/Tinebase/js/widgets/grid/PickerGridPanel.js
tine20/Tinebase/js/widgets/tree/ContextMenu.js