Merge branch '2013.03' into pu/2013.03/modelconfig-hr
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Aug 2013 14:18:13 +0000 (16:18 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 20 Aug 2013 14:18:13 +0000 (16:18 +0200)
commit1c90b2f853971b3efd630b57f41964aade5a9303
treee3c484ba751fc27748ead2cf8c20e9630bdf5f81
parent88681ead23919ec6f39a18a4ab58e12cec052e1a
parent0222982e0ead5922f366fed1b3a58ba125934e41
Merge branch '2013.03' into pu/2013.03/modelconfig-hr

Conflicts:
tests/tine20/Calendar/JsonTests.php
tine20/Felamimail/Controller/Message/Send.php
tine20/HumanResources/js/ContractGridPanel.js
tine20/Phone/Frontend/Json.php
tine20/Phone/translations/template.pot
tine20/Sales/js/Models.js
tine20/Timetracker/translations/template.pot
tine20/Tinebase/Exception.php
tine20/Tinebase/Server/Json.php
tine20/Tinebase/js/widgets/dialog/EditDialog.js
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js
tine20/Tinebase/translations/template.pot
tine20/library/OpenDocument/Document.php
33 files changed:
tests/tine20/AllTests.php
tests/tine20/Calendar/Controller/EventNotificationsTests.php
tests/tine20/Calendar/Convert/Event/VCalendar/GenericTest.php
tests/tine20/Calendar/JsonTests.php
tests/tine20/Phone/JsonTest.php
tests/tine20/Sales/JsonTest.php
tests/tine20/TestServer.php
tine20/Admin/Setup/DemoData.php
tine20/Calendar/Controller/Event.php
tine20/Calendar/Model/Event.php
tine20/Felamimail/Controller/Message.php
tine20/Felamimail/Controller/Message/Send.php
tine20/HumanResources/translations/template.pot
tine20/Phone/Controller/MyPhone.php
tine20/Phone/Frontend/Json.php
tine20/Sales/Model/Contract.php
tine20/Sales/js/Models.js
tine20/Sales/translations/template.pot
tine20/Timetracker/translations/template.pot
tine20/Tinebase/Exception.php
tine20/Tinebase/Export.php
tine20/Tinebase/Frontend/Cli.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/Record/RecordSet.php
tine20/Tinebase/Server/Json.php
tine20/Tinebase/js/ux/WindowFactory.js
tine20/Tinebase/js/widgets/dialog/EditDialog.js
tine20/Tinebase/js/widgets/grid/GridPanel.js
tine20/Tinebase/js/widgets/relation/GenericPickerGridPanel.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot
tine20/library/OpenDocument/Document.php