Merge branch 'pu/2013.03/modelconfig-hr'
authorPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Jul 2013 11:32:54 +0000 (13:32 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Thu, 4 Jul 2013 11:32:54 +0000 (13:32 +0200)
commita1ead1505ea5972d183344ae4b27c1b0535d3dd0
tree97c6abb1ebe62b7346b7ad8190694231699b2cb3
parent4f65569b6529093b908ab33c6c0a15aaf3ef60ab
parentf17e887f429cc541170354c901ac7bd6630fc9d8
Merge branch 'pu/2013.03/modelconfig-hr'

Conflicts:
tests/tine20/Calendar/JsonTests.php
tine20/Calendar/Convert/Event/Json.php
tine20/Calendar/Model/Event.php
tine20/Tasks/Model/Task.php
tine20/Tinebase/Convert/Json.php
tine20/Tinebase/User/Sql.php
18 files changed:
tests/tine20/Calendar/Convert/Event/VCalendar/GenericTest.php
tests/tine20/Calendar/JsonTests.php
tine20/Addressbook/js/Model.js
tine20/Calendar/Controller/Event.php
tine20/Calendar/Convert/Event/Json.php
tine20/Calendar/Model/Event.php
tine20/Calendar/js/Model.js
tine20/Crm/js/Model.js
tine20/Tasks/Model/Task.php
tine20/Tasks/js/Models.js
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Convert/Json.php
tine20/Tinebase/Frontend/Http.php
tine20/Tinebase/Record/RecordSet.php
tine20/Tinebase/Tinebase.jsb2
tine20/Tinebase/User/Sql.php
tine20/Tinebase/css/Tinebase.css
tine20/Tinebase/js/widgets/dialog/EditDialog.js