Merge branch 'pu/2013.10-favoritesacl'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:16:45 +0000 (19:16 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:16:45 +0000 (19:16 +0200)
commit2f84233c71a1638b605dea369ea7f87fc5b47c3f
tree679676e37b8a2cfc256eea1ffc5af8b688707fa5
parent04e8c84ded6b348e81535890b6291446c9700d75
parentbc95a58bf6f3fffafb8e8c19b343ad6c0e3d1c99
Merge branch 'pu/2013.10-favoritesacl'

Conflicts:
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot

Change-Id: I45b14b9a19094080128b17d3b53d5cb918a45dfc
15 files changed:
tests/tine20/Tinebase/Frontend/JsonTest.php
tine20/Calendar/js/TreePanel.js
tine20/HumanResources/Setup/Initialize.php
tine20/Sales/Setup/Initialize.php
tine20/Tinebase/Container.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Convert/Json.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/Model/User.php
tine20/Tinebase/PersistentFilter.php
tine20/Tinebase/Setup/Update/Release8.php
tine20/Tinebase/Setup/setup.xml
tine20/Tinebase/js/Models.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot