Permalink
Commits on Jun 19, 2018
  1. test(Calendar): skip testRruleModLogUndo when running via travis-ci

    pschuele committed Jun 19, 2018
    because of this:
    
    There was 1 failure:
    1) Calendar_Controller_EventTests::testRruleModLogUndo
    Failed asserting that two strings are equal.
    --- Expected
    +++ Actual
    @@ @@
    -'2018-06-20T09:21:02+00:00'
    +'2018-06-21T09:21:02+00:00'
    /home/travis/build/tine20/tine20/tests/tine20/Calendar/Controller/EventTests.php:1839
    
    had the wrong test before :-/
    
    Change-Id: I022b842dbbe2ef7e804a482779b657c24f5bcf53
  2. test(Calendar): skip testModLogUndo when running via travis-ci

    pschuele committed Jun 19, 2018
    because of this:
    
    There was 1 failure:
    1) Calendar_Controller_EventTests::testRruleModLogUndo
    Failed asserting that two strings are equal.
    --- Expected
    +++ Actual
    @@ @@
    -'2018-06-20T09:21:02+00:00'
    +'2018-06-21T09:21:02+00:00'
    /home/travis/build/tine20/tine20/tests/tine20/Calendar/Controller/EventTests.php:1839
    
    Change-Id: I1e8d49e4de44a6e0f009a5f76e7b2c9bba7b3950
  3. test(Travis): updates travis config

    pschuele committed Jun 19, 2018
    * streamlined config.inc
    * use default mysql collation & charset
    * use default trusty mysql
    * adds notifications
    
    Change-Id: I883ff51017ee17abc10ce5742add7081b8ea4393
  4. Merge branch '2018.11-develop'

    pschuele committed Jun 19, 2018
    Change-Id: Ic16a261a0d0456aeb39b0a8da1c15d23d208bb30
  5. Merge branch '2018.11' into 2018.11-develop

    pschuele committed Jun 19, 2018
    Change-Id: I896b6c4332ee9de0b62162c4d2751018f4a3349b
  6. test fix, catch lock release exception in tear down

    paulmhh authored and pschuele committed Jun 19, 2018
    Change-Id: Id57dffbc3c19765c48644a35ae2a3d764addaa21
    Reviewed-on: http://gerrit.tine20.com/customers/9539
    Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
  7. fix(Auth): session might be empty

    pschuele committed Jun 18, 2018
    Change-Id: I3bba3ec203e83bbc0acc9d1c38be9cb9fcd7c5db
    Reviewed-on: http://gerrit.tine20.com/customers/9515
    Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Commits on Jun 18, 2018
  1. tweak(Config): set correct wiki url

    pschuele committed Jun 18, 2018
    Change-Id: I228df98fd1cf31621ff2f3272934c85e69549775
    Reviewed-on: http://gerrit.tine20.com/customers/9531
    Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
  2. Merge branch '2018.11' into 2018.11-develop

    Jenkins
    Jenkins committed Jun 18, 2018
  3. tweak(Config): centralize initial config locations

    corneliusweiss authored and pschuele committed Jun 14, 2018
    Change-Id: Ibe3becf074bd7af9840368107c5f6b6b9aa20bdf
    Reviewed-on: http://gerrit.tine20.com/customers/9489
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
    Tested-by: Philipp Schüle <p.schuele@metaways.de>
  4. Merge branch '2018.11' into 2018.11-develop

    Jenkins
    Jenkins committed Jun 18, 2018
  5. Merge branch '2017.11-develop' into 2018.11

    Jenkins
    Jenkins committed Jun 18, 2018
  6. Merge branch '2017.11' into 2017.11-develop

    Jenkins
    Jenkins committed Jun 18, 2018
  7. fix(Calendar): removes (not working) import into new container from gui

    pschuele committed Jun 18, 2018
    Change-Id: I4d9b7fc97645b061c79c60a010d4b08d148738cd
    Reviewed-on: http://gerrit.tine20.com/customers/9523
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
    Tested-by: Philipp Schüle <p.schuele@metaways.de>
  8. Merge branch '2018.11' into 2018.11-develop

    Jenkins
    Jenkins committed Jun 18, 2018
  9. Merge branch '2017.11-develop' into 2018.11

    Jenkins
    Jenkins committed Jun 18, 2018
  10. Merge branch '2017.11' into 2017.11-develop

    Jenkins
    Jenkins committed Jun 18, 2018
  11. fix(Addressbook): adds is_object check for list memberroles

    pschuele committed Jun 18, 2018
    Change-Id: Icecddb6e0002809257a46785b6616e8c4e5c18f5
    Reviewed-on: http://gerrit.tine20.com/customers/9525
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
    Tested-by: Philipp Schüle <p.schuele@metaways.de>
  12. Merge branch '2017.11' into 2017.11-develop

    pschuele committed Jun 18, 2018
    Change-Id: I4503e89ab38525322a43172917d82022a664b540
  13. fix(Addressbook): don't write group changes to modlog

    pschuele committed Jun 18, 2018
    * as this is not a "real" change of groups
    * this might be a "resolving" problem
    
    Change-Id: Iab385083f1bbd17a93cedee1290c36adb0115ee3
    Reviewed-on: http://gerrit.tine20.com/customers/9519
    Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
  14. fix(Addressbook): don't write group changes to modlog

    pschuele committed Jun 18, 2018
    * as this is not a "real" change of groups
    * this might be a "resolving" problem
    
    Change-Id: I1c672d65e1bbd28f6515279215597c1cd71fc5e7
    Reviewed-on: http://gerrit.tine20.com/customers/9521
    Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
  15. Merge branch '2018.11' into 2018.11-develop

    Jenkins
    Jenkins committed Jun 18, 2018
  16. fix(Setup): don't use utf8mb4 charset if innodb_large_prefix is not s…

    pschuele committed Jun 15, 2018
    …et (fixed)
    
    * fix did now detect innodb_large_prefix = OFF correctly
    * fix field collation - use utf8_bin if utf8mb4_bin is requested and not
     supported
    
    fixes #6854
    
    Change-Id: I51be205b471729975a7dba76879fb467a7046be0
    Reviewed-on: http://gerrit.tine20.com/customers/9505
    Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
  17. fix(ImageHelper): getimagesize might throw an ErrorException

    pschuele committed Jun 18, 2018
    Change-Id: I150befe02bab432c4e620a5348817385822ddff6
    Reviewed-on: http://gerrit.tine20.com/customers/9513
    Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
Commits on Jun 16, 2018
  1. test(Calendar): adds all Calendar test suite to travisci tests

    pschuele committed Jun 15, 2018
    Change-Id: Ied596b80f2ffe79dfc7991cbe756f768c8fc4f5d
Commits on Jun 15, 2018
  1. Merge branch '2018.11' into 2018.11-develop

    Jenkins
    Jenkins committed Jun 15, 2018
  2. Merge branch '2017.11-develop' into 2018.11

    Jenkins
    Jenkins committed Jun 15, 2018
  3. Merge branch '2017.11' into 2017.11-develop

    Jenkins
    Jenkins committed Jun 15, 2018
  4. fix(Filemanager): Delete Nodes via DEL key fails

    corneliusweiss committed Jun 15, 2018
    Change-Id: I80ad2c8e2b2dc474f807280be0a56a05a2a17665
    Reviewed-on: http://gerrit.tine20.com/customers/9511
    Reviewed-by: Cornelius Weiss <c.weiss@metaways.de>
    Tested-by: Cornelius Weiss <c.weiss@metaways.de>
  5. Merge branch '2018.11' into 2018.11-develop

    Jenkins
    Jenkins committed Jun 15, 2018
  6. Calendar Setup - fix new resource grants mapping

    paulmhh committed Jun 15, 2018
    Change-Id: Ia943b424b65ff5c6ef8d8ba3836f0010ff3ba05b
    Reviewed-on: http://gerrit.tine20.com/customers/9509
    Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
    Reviewed-by: Paul Mehrer <p.mehrer@metaways.de>
  7. Merge branch '2018.11' into 2018.11-develop

    Jenkins
    Jenkins committed Jun 15, 2018
  8. Tinebase Setup - update from 2017.11 scheduler issue fixed

    paulmhh committed Jun 15, 2018
    Change-Id: I4c02bff820a2f69f9305a707b7dba96ed66adaa0
    Reviewed-on: http://gerrit.tine20.com/customers/9507
    Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
    Reviewed-by: Paul Mehrer <p.mehrer@metaways.de>
  9. Merge branch '2018.11' into 2018.11-develop

    Jenkins
    Jenkins committed Jun 15, 2018
  10. feature: find grantsmodel per naming convention

    corneliusweiss committed Jun 14, 2018
    Change-Id: I3a3d3d12fe90362ad379843b6eed8317c51998fd
    Reviewed-on: http://gerrit.tine20.com/customers/9493
    Tested-by: Jenkins CI (http://ci.tine20.com/) <tine20-jenkins@metaways.de>
    Reviewed-by: Philipp Schüle <p.schuele@metaways.de>
    Reviewed-by: Cornelius Weiss <c.weiss@metaways.de>