Merge branch '2015.11' into 2015.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Nov 2016 12:21:45 +0000 (13:21 +0100)
committerPhilipp Schüle <p.schuele@metaways.de>
Fri, 4 Nov 2016 12:21:45 +0000 (13:21 +0100)
Change-Id: I7b23b99cca3a3fe05263b90f9a5075d027c440e1

12 files changed:
1  2 
tine20/Addressbook/Model/Contact.php
tine20/Addressbook/js/Model.js
tine20/Calendar/Controller.php
tine20/Calendar/js/AttendeeGridPanel.js
tine20/Expressomail/js/AddressbookGridPanelHook.js
tine20/Expressomail/js/Expressomail.js
tine20/Felamimail/js/Felamimail.js
tine20/Felamimail/js/GridPanel.js
tine20/Felamimail/js/GridPanelHook.js
tine20/Tinebase/Controller/ScheduledImport.php
tine20/composer.json
tine20/composer.lock

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -220,28 -205,13 +223,14 @@@ class Tinebase_Controller_ScheduledImpo
                      Tinebase_Core::getLogger()->notice(__METHOD__ . ' ' . __LINE__
                          . ' Import failed.');
                  }
 -                // TODO log failure message in import record
                  Tinebase_Exception::log($e);
 +
 +                $record->lastfail = $e->getMessage();
 +                $record->failcount = $record->failcount + 1;
              }
  
-             if ($record->interval === Tinebase_Model_Import::INTERVAL_ONCE || !$record->timestamp instanceof Tinebase_DateTime) {
-                 $record->timestamp = Tinebase_DateTime::now();
-             }
-             switch ($record->interval) {
-                 case Tinebase_Model_Import::INTERVAL_DAILY:
-                     $record->timestamp->addDay(1);
-                     break;
-                 case Tinebase_Model_Import::INTERVAL_WEEKLY:
-                     $record->timestamp->addWeek(1);
-                     break;
-                 case Tinebase_Model_Import::INTERVAL_HOURLY:
-                     $record->timestamp->addHour(1);
-                     break;
-             }
+             $record->timestamp = Tinebase_DateTime::now();
  
 -            // update record
              $record = $this->update($record);
              
          } else {
@@@ -35,7 -31,7 +35,8 @@@
          "metaways/opendocument": "1.1",
          "metaways/timezoneconvert": "0.2",
          "zendframework/zend-http": "2.2.8-p3 as 2.2.8",
-         "doctrine/orm": "2.5.*"
++        "doctrine/orm": "2.5.*",
+         "twig/twig": "~1.0"
      },
      "require-dev": {
          "phpunit/phpunit": "3.7.*",
              "time": "2013-10-02 15:59:03"
          },
          {
 +            "name": "symfony/console",
 +            "version": "v2.8.2",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/symfony/console.git",
 +                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/symfony/console/zipball/d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
 +                "reference": "d0239fb42f98dd02e7d342f793c5d2cdee0c478d",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": ">=5.3.9",
 +                "symfony/polyfill-mbstring": "~1.0"
 +            },
 +            "require-dev": {
 +                "psr/log": "~1.0",
 +                "symfony/event-dispatcher": "~2.1|~3.0.0",
 +                "symfony/process": "~2.1|~3.0.0"
 +            },
 +            "suggest": {
 +                "psr/log": "For using the console logger",
 +                "symfony/event-dispatcher": "",
 +                "symfony/process": ""
 +            },
 +            "type": "library",
 +            "extra": {
 +                "branch-alias": {
 +                    "dev-master": "2.8-dev"
 +                }
 +            },
 +            "autoload": {
 +                "psr-4": {
 +                    "Symfony\\Component\\Console\\": ""
 +                },
 +                "exclude-from-classmap": [
 +                    "/Tests/"
 +                ]
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Fabien Potencier",
 +                    "email": "fabien@symfony.com"
 +                },
 +                {
 +                    "name": "Symfony Community",
 +                    "homepage": "https://symfony.com/contributors"
 +                }
 +            ],
 +            "description": "Symfony Console Component",
 +            "homepage": "https://symfony.com",
 +            "time": "2016-01-14 08:33:16"
 +        },
 +        {
 +            "name": "symfony/polyfill-mbstring",
 +            "version": "v1.0.1",
 +            "source": {
 +                "type": "git",
 +                "url": "https://github.com/symfony/polyfill-mbstring.git",
 +                "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25"
 +            },
 +            "dist": {
 +                "type": "zip",
 +                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/49ff736bd5d41f45240cec77b44967d76e0c3d25",
 +                "reference": "49ff736bd5d41f45240cec77b44967d76e0c3d25",
 +                "shasum": ""
 +            },
 +            "require": {
 +                "php": ">=5.3.3"
 +            },
 +            "suggest": {
 +                "ext-mbstring": "For best performance"
 +            },
 +            "type": "library",
 +            "extra": {
 +                "branch-alias": {
 +                    "dev-master": "1.0-dev"
 +                }
 +            },
 +            "autoload": {
 +                "psr-4": {
 +                    "Symfony\\Polyfill\\Mbstring\\": ""
 +                },
 +                "files": [
 +                    "bootstrap.php"
 +                ]
 +            },
 +            "notification-url": "https://packagist.org/downloads/",
 +            "license": [
 +                "MIT"
 +            ],
 +            "authors": [
 +                {
 +                    "name": "Nicolas Grekas",
 +                    "email": "p@tchwork.com"
 +                },
 +                {
 +                    "name": "Symfony Community",
 +                    "homepage": "https://symfony.com/contributors"
 +                }
 +            ],
 +            "description": "Symfony polyfill for the Mbstring extension",
 +            "homepage": "https://symfony.com",
 +            "keywords": [
 +                "compatibility",
 +                "mbstring",
 +                "polyfill",
 +                "portable",
 +                "shim"
 +            ],
 +            "time": "2015-11-20 09:19:13"
 +        },
 +        {
              "name": "syncroton/syncroton",
-             "version": "1.2.2",
+             "version": "1.2.3",
              "source": {
                  "type": "git",
                  "url": "http://git.syncroton.org/Syncroton",
              ],
              "description": "Library to sync mobile devices",
              "homepage": "http://www.syncroton.org",
-             "time": "2016-09-07 12:25:24"
+             "time": "2016-10-31 16:16:43"
          },
          {
 +            "name": "tine20/composerapploader",
 +            "version": "dev-master",
 +            "source": {
 +                "type": "git",
 +                "url": "http://git.tine20.org/git/composerapploader",
 +                "reference": "b9e480b6c26f6556ca742e96badfeb1ebd59ecb7"
 +            },
 +            "require": {
 +                "composer-plugin-api": ">=1.0.0"
 +            },
 +            "require-dev": {
 +                "composer/composer": "1.*"
 +            },
 +            "type": "composer-plugin",
 +            "extra": {
 +                "class": "Tine20\\ComposerAppLoader\\Plugin"
 +            },
 +            "autoload": {
 +                "psr-4": {
 +                    "Tine20\\ComposerAppLoader\\": "src/"
 +                }
 +            },
 +            "time": "2016-07-14 11:55:28"
 +        },
 +        {
+             "name": "twig/twig",
+             "version": "v1.27.0",
+             "source": {
+                 "type": "git",
+                 "url": "https://github.com/twigphp/Twig.git",
+                 "reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97"
+             },
+             "dist": {
+                 "type": "zip",
+                 "url": "https://api.github.com/repos/twigphp/Twig/zipball/3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97",
+                 "reference": "3c6c0033fd3b5679c6e1cb60f4f9766c2b424d97",
+                 "shasum": ""
+             },
+             "require": {
+                 "php": ">=5.2.7"
+             },
+             "require-dev": {
+                 "symfony/debug": "~2.7",
+                 "symfony/phpunit-bridge": "~2.7"
+             },
+             "type": "library",
+             "extra": {
+                 "branch-alias": {
+                     "dev-master": "1.27-dev"
+                 }
+             },
+             "autoload": {
+                 "psr-0": {
+                     "Twig_": "lib/"
+                 }
+             },
+             "notification-url": "https://packagist.org/downloads/",
+             "license": [
+                 "BSD-3-Clause"
+             ],
+             "authors": [
+                 {
+                     "name": "Fabien Potencier",
+                     "email": "fabien@symfony.com",
+                     "homepage": "http://fabien.potencier.org",
+                     "role": "Lead Developer"
+                 },
+                 {
+                     "name": "Armin Ronacher",
+                     "email": "armin.ronacher@active-4.com",
+                     "role": "Project Founder"
+                 },
+                 {
+                     "name": "Twig Team",
+                     "homepage": "http://twig.sensiolabs.org/contributors",
+                     "role": "Contributors"
+                 }
+             ],
+             "description": "Twig, the flexible, fast, and secure template language for PHP",
+             "homepage": "http://twig.sensiolabs.org",
+             "keywords": [
+                 "templating"
+             ],
+             "time": "2016-10-25 19:17:17"
+         },
+         {
              "name": "zendframework/zend-escaper",
              "version": "2.2.10",
              "source": {