Merge branch '2013.03' into pu/2013.03/modelconfig-hr
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 28 May 2013 13:45:40 +0000 (15:45 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 28 May 2013 13:45:40 +0000 (15:45 +0200)
commit782ed33448fa63281ec5f7f3e96ab27e8f0f7840
treefd5fb44003a215394df0411bde21ee25df5084f8
parent8013131d8ddec3c4aef006d72066b25f47188304
parent03168336b58bc46eb5c8e2b9f1823e4698e81d02
Merge branch '2013.03' into pu/2013.03/modelconfig-hr

Conflicts:
tine20/Crm/Controller.php
tine20/HumanResources/Setup/Update/Release7.php
tine20/HumanResources/Setup/setup.xml
tine20/HumanResources/js/Models.js
tine20/Inventory/Model/InventoryItem.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/js/ApplicationStarter.js
tine20/Tinebase/js/widgets/dialog/EditDialog.js
17 files changed:
tests/tine20/Tinebase/AllTests.php
tine20/Addressbook/js/Model.js
tine20/HumanResources/Setup/setup.xml
tine20/HumanResources/translations/de.po
tine20/HumanResources/translations/template.pot
tine20/Inventory/Model/InventoryItem.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Frontend/Json.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/Record/Abstract.php
tine20/Tinebase/js/widgets/ContentTypeTreePanel.js
tine20/Tinebase/js/widgets/dialog/DuplicateResolveGridPanel.js
tine20/Tinebase/js/widgets/dialog/EditDialog.js
tine20/Tinebase/js/widgets/grid/FilterToolbar.js
tine20/Tinebase/js/widgets/grid/GridPanel.js
tine20/Tinebase/js/widgets/mainscreen/WestPanel.js
tine20/Voipmanager/Controller/Snom/Phone.php