Merge branch '2015.11-develop' into 2016.03
authorPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 12:28:06 +0000 (14:28 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Mon, 11 Jul 2016 12:28:06 +0000 (14:28 +0200)
Change-Id: Ie5db73be764d2267dc3939725e73dca42e874651

1  2 
tine20/Expressomail/Setup/Initialize.php
tine20/Setup/Controller.php
tine20/Tinebase/Config.php
tine20/Tinebase/Frontend/Json/Abstract.php
tine20/Tinebase/js/LoginPanel.js
tine20/Tinebase/js/tineInit.js
tine20/composer.json

Simple merge
Simple merge
Simple merge
@@@ -51,9 -51,11 +51,11 @@@ Tine.clientVersion.releaseTime      = '
   * 
   * @type String
   */
+ Tine.logo = 'images/tine_logo.png';
+ Tine.favicon;
  Tine.title = 'Tine 2.0';
 -Tine.weburl = 'https://www.tine20.org/en/the-project/contribute.html';
 -Tine.helpUrl = 'http://www.tine20.org/wiki/index.php/Main_Page';
 +Tine.weburl = 'http://www.tine20.com/1/welcome-community/';
 +Tine.helpUrl = 'https://wiki.tine20.org/Main_Page';
  Tine.bugreportUrl = 'https://api.tine20.net/bugreport.php';
  
  /**
@@@ -29,9 -35,7 +29,8 @@@
      },
      "require-dev": {
          "phpunit/phpunit": "3.7.*",
 -        "phing/phing": "2.6.1-p0"
 +        "phing/phing": "2.*",
-         "tedivm/jshrink": "~1.0",
-         "phpdocumentor/phpdocumentor": "2.*"
++        "tedivm/jshrink": "~1.0"
      },
      "autoload": {
          "files": [],