Merge branch 'pu/2013.10-longrun'
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:01:18 +0000 (19:01 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 29 Aug 2014 17:01:18 +0000 (19:01 +0200)
commit9b1f10e84221308bd6ccec11581c2e9370fbc5e3
treeb862962e671c5cc043755c198372fd4239f6746b
parente28ef6c15ffab46178e6110e188e545cf8b32973
parent84860e49668255819ef37005cc57c1ddee8e2fab
Merge branch 'pu/2013.10-longrun'

Conflicts:
tests/tine20/HumanResources/JsonTests.php
tests/tine20/HumanResources/TestCase.php
tests/tine20/Sales/JsonTest.php
tine20/HumanResources/js/DatePicker.js
tine20/Sales/Controller/NumberableAbstract.php
tine20/Sales/Setup/Update/Release8.php
tine20/Sales/Setup/setup.xml
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Convert/Json.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/js/widgets/grid/GridPanel.js
tine20/Tinebase/translations/de.po

Change-Id: Iaecffe4312b8a58584e95fbda49d4d9ab254da6d
14 files changed:
tests/tine20/ActiveSync/Controller/CalendarTests.php
tests/tine20/Calendar/Controller/EventGrantsTests.php
tests/tine20/Calendar/Controller/MSEventFacadeTest.php
tests/tine20/Calendar/JsonTests.php
tests/tine20/HumanResources/JsonTests.php
tine20/Admin/Frontend/Json.php
tine20/HumanResources/js/DatePicker.js
tine20/Sales/Controller/NumberableAbstract.php
tine20/Tinebase/Backend/Sql/Command/Mysql.php
tine20/Tinebase/Controller/Record/Abstract.php
tine20/Tinebase/Model/Filter/Date.php
tine20/Tinebase/js/widgets/grid/GridPanel.js
tine20/Tinebase/translations/de.po
tine20/Tinebase/translations/template.pot