Merge branch 'tine20.com/2012.10'
authorPhilipp Schüle <p.schuele@metaways.de>
Wed, 27 Feb 2013 13:59:30 +0000 (14:59 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Wed, 27 Feb 2013 13:59:30 +0000 (14:59 +0100)
commit9d2579429ee1b561bd30ccec8866d08c92c99c73
tree7117dd070dce8b320eee3385fd81391e5508a646
parent12bc25ccd6ddb37e4525412e82106827ccf03e5d
parent9edefffe633c5e175c5ae28c7a4abb5a1cc54cb2
Merge branch 'tine20.com/2012.10'

Conflicts:
tine20/HumanResources/Setup/setup.xml
tine20/HumanResources/js/EmployeeEditDialog.js
tine20/HumanResources/js/Models.js
13 files changed:
tine20/HumanResources/Model/Employee.php
tine20/HumanResources/Model/EmployeeFilter.php
tine20/HumanResources/Model/FreeTime.php
tine20/HumanResources/Setup/Update/Release6.php
tine20/HumanResources/Setup/Update/Release7.php
tine20/HumanResources/Setup/setup.xml
tine20/HumanResources/js/EmployeeEditDialog.js
tine20/HumanResources/js/FreeTimeEditDialog.js
tine20/HumanResources/js/FreeTimeGridPanel.js
tine20/HumanResources/js/Models.js
tine20/Tinebase/Acl/Roles.php
tine20/Tinebase/Controller/Abstract.php
tine20/Tinebase/Setup/Update/Release6.php