Merge branch 'master' of github.com:/nextcloud/mail into feature/784/shorten-table-names

.travis.yml

@@ -112,6 +112,8 @@ script:
 
 matrix:
   include:
+    - php: 7.2
+      env: "DB=mysql CORE_BRANCH=stable14"
     - php: 7.0
       env: "DB=mysql CORE_BRANCH=master TEST_JS=TRUE"
     - php: 7.1

README.md

@@ -25,9 +25,12 @@ And in the works for the [coming versions](https://github.com/nextcloud/mail/mil
 
 If you experience any issues or have any suggestions for improvement, use the [issue tracker](https://github.com/nextcloud/mail/issues). Please follow the [issue template chooser](https://github.com/nextcloud/mail/issues/new/choose) so we get the info needed to debug and fix the problem. Thanks!
 
+## Get on board
+For new contributors, please check out [ContributingToNextcloudIntroductoryWorkshop](https://github.com/sleepypioneer/ContributingToNextcloudIntroductoryWorkshop)
+
 ## Development setup
 
-Just clone this repo into your apps directory (Nextcloud server installation needed). Additionally, [npm](https://www.npmjs.com/) to fetch [Node.js](https://nodejs.org/en/download/package-manager/) is needed for installing JavaScript dependencies.
+Just clone this repo into your apps directory ([Nextcloud server](https://github.com/nextcloud/server#running-master-checkouts) installation needed). Additionally, [npm](https://www.npmjs.com/) to fetch [Node.js](https://nodejs.org/en/download/package-manager/) is needed for installing JavaScript dependencies.
 
 Once npm and Node.js are installed, PHP and JavaScript dependencies can be installed by running:
 ```bash

appinfo/info.xml

@@ -22,7 +22,7 @@
 	<screenshot>https://raw.githubusercontent.com/nextcloud/mail/74e94da16618b32ee0834e57bbfc83ff7334f709/screenshots/mail.png</screenshot>
 	<dependencies>
 		<php min-version="7.0" max-version="7.2" />
-		<nextcloud min-version="14" max-version="14" />
+		<nextcloud min-version="14" max-version="15" />
 	</dependencies>
 	<repair-steps>
 		<post-migration>

package.json

@@ -51,11 +51,11 @@
     "karma-sourcemap-loader": "^0.3.7",
     "karma-webpack": "^3.0.0",
     "raw-loader": "^0.5.1",
-    "sinon": "^6.1.5",
+    "sinon": "^6.3.1",
     "string.prototype.endswith": "^0.2.0",
     "string.prototype.repeat": "^0.2.0",
     "string.prototype.startswith": "^0.2.0",
-    "webpack": "^4.16.5",
+    "webpack": "^4.18.1",
     "webpack-cli": "^3.1.0",
     "webpack-merge": "^4.1.4"
   },
@@ -68,9 +68,9 @@
     "backbone.wreqr": "^1.4.0",
     "davclient.js": "^0.1.0",
     "domready": "^1.0.8",
-    "es6-promise": "^4.2.4",
+    "es6-promise": "^4.2.5",
     "exports-loader": "^0.7.0",
-    "handlebars": "^4.0.11",
+    "handlebars": "^4.0.12",
     "handlebars-loader": "^1.7.0",
     "html-to-text": "^4.0.0",
     "ical.js": "^1.2.2",
@@ -79,7 +79,6 @@
     "jquery-visibility": "^1.0.11",
     "js-storage": "1.0.4",
     "nextcloud_issuetemplate_builder": "^0.1.0",
-    "requirejs": "^2.3.5",
     "underscore": "^1.9.1"
   }
 }