Merge branch 'master' into techdebt/noid/allow-some-apps-to-have-root…

…-urls

.eslintrc.js

@@ -10,7 +10,7 @@ module.exports = {
 		dayNames: true,
 		firstDay: true
 	},
-	extends: ['nextcloud'],
+	extends: ['@nextcloud'],
 	rules: {
 		'no-tabs': 'warn',
 	}

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -33,6 +33,7 @@ Guidelines for submitting issues:
 
 * Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are affected by the same issue.
 * Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
+* Subscribe to receive notifications on status change and new comments. 
 
 
 ### Steps to reproduce

.github/ISSUE_TEMPLATE/Feature_request.md

@@ -9,17 +9,30 @@ Thanks for reporting issues back to Nextcloud!
 
 Note: This is the **issue tracker of Nextcloud**, please do NOT use this to get answers to your questions or get help for fixing your installation. This is a place to report bugs to developers, after your server has been debugged. You can find help debugging your system on our home user forums: https://help.nextcloud.com or, if you use Nextcloud in a large organization, ask our engineers on https://portal.nextcloud.com. See also  https://nextcloud.com/support for support options.
 
-This is the bug tracker for the Server component. Find other components at https://github.com/nextcloud/
+Nextcloud is an open source project backed by Nextcloud GmbH. Most of our volunteers are home users and thus primarily care about issues that affect home users. Our paid engineers prioritize issues of our customers. If you are neither a home user nor a customer, consider paying somebody to fix your issue, do it yourself or become a customer.
 
-For reporting potential security issues please see https://nextcloud.com/security/
+Guidelines for submitting issues:
 
-To make it possible for us to best accommodate your use case, please fill out the information below carefully. 
-You can also use the Issue Template application to prefill most of the required information: https://apps.nextcloud.com/apps/issuetemplate
+* Please search the existing issues first, it's likely that your issue was already reported or even fixed.
+    - Go to https://github.com/nextcloud and type any word in the top search/command bar. You probably see something like "We couldn’t find any repositories matching ..." then click "Issues" in the left navigation.
+    - You can also filter by appending e. g. "state:open" to the search string.
+    - More info on search syntax within github: https://help.github.com/articles/searching-issues
+    
+* This repository https://github.com/nextcloud/server/issues is *only* for issues within the Nextcloud Server code. This also includes the apps: files, encryption, external storage, sharing, deleted files, versions, LDAP, and WebDAV Auth
+  
+* SECURITY: Report any potential security bug to us via our HackerOne page (https://hackerone.com/nextcloud) following our security policy (https://nextcloud.com/security/) instead of filing an issue in our bug tracker.  
 
-If you are a customer and are using Nextcloud Enterprise, please submit your issue directly in the Nextcloud Portal https://portal.nextcloud.com so it gets resolved more quickly by our dedicated engineers.
+* The issues in other components should be reported in their respective repositories: You will find them in our GitHub Organization (https://github.com/nextcloud/)
+-->
 
-Note that Nextcloud is an open source project backed by Nextcloud GmbH. Most of our volunteers are home users and thus primarily care about issues that affect home users. Our paid engineers prioritize issues of our customers. If you are neither a home user nor a customer, consider paying somebody to fix your issue, do it yourself or become a customer.
---> 
+
+<!--- Please keep this note for other contributors -->
+
+### How to use GitHub
+
+* Please use the 👍 [reaction](https://blog.github.com/2016-03-10-add-reactions-to-pull-requests-issues-and-comments/) to show that you are interested into the same feature.
+* Please don't comment if you have no relevant information to add. It's just extra noise for everyone subscribed to this issue.
+* Subscribe to receive notifications on status change and new comments. 
 
 
 **Is your feature request related to a problem? Please describe.**

.gitignore

@@ -16,6 +16,7 @@
 !/apps/accessibility
 !/apps/cloud_federation_api
 !/apps/comments
+!/apps/contactsinteraction
 !/apps/dav
 !/apps/files
 !/apps/federation
@@ -69,6 +70,7 @@ CVS/*
 .svn/*
 RCS/*
 *.backup*
+.php_cs.cache
 
 # kdevelop
 .kdev

.mailmap

@@ -380,6 +380,7 @@ tbelau666 <thomas.belau@gmx.de>
 TheSFReader <TheSFReader@gmail.com>
 Thibaut GRIDEL <tgridel@free.fr>
 thomas <thomas@thomas-VirtualBox.(none)>
+Thomas Citharel <nextcloud@tcit.fr> Thomas Citharel <tcit@tcit.fr>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Mueller <thomas.mueller@tmit.eu>
 Thomas Müller <thomas.mueller@tmit.eu> Thomas Müller <DeepDiver1975@users.noreply.github.com>
 Thomas Olsen <tol@tanghus>

.php_cs.dist

@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+require_once './lib/composer/autoload.php';
+
+use Nextcloud\CodingStandard\Config;
+
+$config = new Config();
+$config
+	->getFinder()
+	->ignoreVCSIgnored(true)
+	->exclude('config')
+	->exclude('data')
+	->notPath('3rdparty')
+	->notPath('composer')
+	->notPath('vendor')
+	->in(__DIR__);
+return $config;

AUTHORS

@@ -16,7 +16,6 @@ Nextcloud is written by:
  - Andreas Fischer <bantu@owncloud.com>
  - Andreas Pflug <dev@admin4.org>
  - Andrew Brown <andrew@casabrown.com>
- - Andrius <andrius.kulbis@ktu.lt>
  - André Gaul <gaul@web-yard.de>
  - Ardinis <Ardinis@users.noreply.github.com>
  - Ari Selseng <ari@selseng.net>
@@ -53,7 +52,6 @@ Nextcloud is written by:
  - Christian Jürges <christian@eqipe.ch>
  - Christian Kampka <christian@kampka.net>
  - Christian Oliff <christianoliff@yahoo.com>
- - Christian Weiske <cweiske@cweiske.de>
  - Christoph Schaefer "christophł@wolkesicher.de"
  - Christoph Seitz <christoph.seitz@posteo.de>
  - Christoph Wickert <cwickert@suse.de>
@@ -97,7 +95,9 @@ Nextcloud is written by:
  - François Kubler <francois@kubler.org>
  - Frederic Werner <frederic-github@werner-net.work>
  - Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
+ - Gary Kim <gary@garykim.dev>
  - Georg Ehrke <oc.list@georgehrke.com>
+ - GrayFix <grayfix@gmail.com>
  - Greta Doci <gretadoci@gmail.com>
  - Guillaume COMPAGNON <gcompagnon@outlook.com>
  - Hemanth Kumar Veeranki <hems.india1997@gmail.com>
@@ -128,6 +128,7 @@ Nextcloud is written by:
  - Jonas Sulzer <jonas@violoncello.ch>
  - Jonny007-MKD <1-23-4-5@web.de>
  - Jos Poortvliet <jos@opensuse.org>
+ - Jose Quinteiro <github@quinteiro.org>
  - Juan Pablo Villafañez <jvillafanez@solidgear.es>
  - Juan Pablo Villafáñez <jvillafanez@solidgear.es>
  - Juan Pablo Villafáñez <jvillafanez@solidgear.es>
@@ -191,6 +192,7 @@ Nextcloud is written by:
  - Michael Gapczynski <GapczynskiM@gmail.com>
  - Michael Göhler <somebody.here@gmx.de>
  - Michael Jobst <mjobst+github@tecratech.de>
+ - Michael Kuhn <michael@ikkoku.de>
  - Michael Letzgus <www@chronos.michael-letzgus.de>
  - Michael Roitzsch <reactorcontrol@icloud.com>
  - Michael Roth <michael.roth@rz.uni-augsburg.de>
@@ -199,10 +201,12 @@ Nextcloud is written by:
  - Michał Węgrzynek <michal.wegrzynek@malloc.com.pl>
  - Miguel Prokop <miguel.prokop@vtu.com>
  - Mitar <mitar.git@tnode.com>
+ - Mohammed Abdellatif <m.latief@gmail.com>
  - Morris Jobke <hey@morrisjobke.de>
  - Nicolai Ehemann <en@enlightened.de>
  - Nicolas Grekas <nicolas.grekas@gmail.com>
  - Nils <git@to.nilsschnabel.de>
+ - Nils Wittenbrink <nilswittenbrink@web.de>
  - Nmz <nemesiz@nmz.lt>
  - Noveen Sachdeva <noveen.sachdeva@research.iiit.ac.in>
  - Ole Ostergaard <ole.c.ostergaard@gmail.com>
@@ -218,11 +222,13 @@ Nextcloud is written by:
  - Patrick Paysant <ppaysant@linagora.com>
  - Patrik Kernstock <info@pkern.at>
  - Pauli Järvinen <pauli.jarvinen@gmail.com>
+ - Pavel Krasikov <klonishe@gmail.com>
  - Pellaeon Lin <nfsmwlin@gmail.com>
  - Peter Kubica <peter@kubica.ch>
  - Phil Davis <phil.davis@inf.org>
  - Philipp Kapfer <philipp.kapfer@gmx.at>
  - Philipp Schaffrath <github@philipp.schaffrath.email>
+ - Philipp Staiger <philipp@staiger.it>
  - Philippe Jung <phil.jung@free.fr>
  - Pierre Ozoux <pierre@ozoux.net>
  - Pierre Rudloff <contact@rudloff.pro>
@@ -274,9 +280,11 @@ Nextcloud is written by:
  - Senorsen <senorsen.zhang@gmail.com>
  - Serge Martin <edb@sigluy.net>
  - Sergej Nikolaev <kinolaev@gmail.com>
+ - Sergey Shliakhov <husband.sergey@gmail.com>
  - Sergio Bertolin <sbertolin@solidgear.es>
  - Sergio Bertolín <sbertolin@solidgear.es>
  - Simon Könnecke <simonkoennecke@gmail.com>
+ - Simounet <contact@simounet.net>
  - Sjors van der Pluijm <sjors@desjors.nl>
  - Stefan Rado <owncloud@sradonia.net>
  - Stefan Schneider <stefan.schneider@squareweave.com.au>
@@ -292,18 +300,20 @@ Nextcloud is written by:
  - Temtaime <temtaime@gmail.com>
  - Thibault Coupin <thibault.coupin@gmail.com>
  - Thibaut GRIDEL <tgridel@free.fr>
- - Thomas Citharel <tcit@tcit.fr>
+ - Thomas Citharel <nextcloud@tcit.fr>
  - Thomas Ebert <thomas.ebert@usability.de>
  - Thomas Müller <thomas.mueller@tmit.eu>
  - Thomas Pulzer <t.pulzer@kniel.de>
  - Thomas Tanghus <thomas@tanghus.net>
+ - Tiago Flores <tiago.flores@yahoo.com.br>
  - Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
  - Tim Dettrick <t.dettrick@uq.edu.au>
+ - Tim Obert <tobert@w-commerce.de>
  - Tim Terhorst <mynamewastaken+gitlab@gmail.com>
+ - TimObert <tobert@w-commerce.de>
  - Timo Förster <tfoerster@webfoersterei.de>
  - Tobia De Koninck <LEDfan@users.noreply.github.com>
  - Tobia De Koninck <tobia@ledfan.be>
- - Tobias Brunner <tobias@tobru.ch>
  - Tobias Kaminsky <tobias@kaminsky.me>
  - Tom Needham <tom@owncloud.com>
  - Tomasz Paluszkiewicz <tomasz.paluszkiewicz@gmail.com>
@@ -370,6 +380,7 @@ Nextcloud is written by:
  - root "root@oc.(none)"
  - root <root@localhost.localdomain>
  - rubo77 <github@r.z11.de>
+ - sammo2828 <sammo2828@gmail.com>
  - scambra <sergio@entrecables.com>
  - scolebrook <scolebrook@mac.com>
  - shkdee <louis.traynard@m4x.org>

README.md

@@ -2,8 +2,6 @@
 [![Scrutinizer Code Quality](https://scrutinizer-ci.com/g/nextcloud/server/badges/quality-score.png?b=master)](https://scrutinizer-ci.com/g/nextcloud/server/?branch=master)
 [![codecov](https://codecov.io/gh/nextcloud/server/branch/master/graph/badge.svg)](https://codecov.io/gh/nextcloud/server)
 [![CII Best Practices](https://bestpractices.coreinfrastructure.org/projects/209/badge)](https://bestpractices.coreinfrastructure.org/projects/209)
-[![irc](https://img.shields.io/badge/IRC-%23nextcloud%20on%20freenode-orange.svg)](https://webchat.freenode.net/?channels=nextcloud)
-[![irc](https://img.shields.io/badge/IRC-%23nextcloud--dev%20on%20freenode-blue.svg)](https://webchat.freenode.net/?channels=nextcloud-dev)
 
 **A safe home for all your data.**
 

apps/accessibility/appinfo/routes.php

@@ -27,13 +27,13 @@
 	'routes' => [
 		['name' => 'accessibility#getCss', 'url' => '/css/user-{md5}', 'verb' => 'GET'],
 		['name' => 'accessibility#getJavascript', 'url' => '/js/accessibility', 'verb' => 'GET'],
-    ],
-    'ocs' => [
+	],
+	'ocs' => [
 		[
 			'name' => 'Config#getConfig',
 			'url'  => '/api/v1/config',
 			'verb' => 'GET',
-        ],
+		],
 		[
 			'name' => 'Config#setConfig',
 			'url'  => '/api/v1/config/{key}',
@@ -44,5 +44,5 @@
 			'url'  => '/api/v1/config/{key}',
 			'verb' => 'DELETE',
 		],
-    ]
+	]
 ];