summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into autocomplete-guiArthur Schiwon2017-11-01812-2167/+20697
|\
| * Merge pull request #6667 from nextcloud/settings-headingJan-Christoph Borchardt2017-11-011-1/+8
| |\ | | | | | | Adjust settings navigation headings to style used in Mail & Calendar
| | * Adjust settings navigation heading styleJan-Christoph Borchardt2017-09-281-1/+8
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | Merge pull request #6875 from nextcloud/app_autoloadersJoas Schilling2017-11-01167-10/+11582
| |\ \ | | | | | | | | Move server apps to dedicated autoloader
| | * | Update phan configRoeland Jago Douma2017-10-241-0/+18
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | User_LDAP AutoloaderRoeland Jago Douma2017-10-249-0/+701
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | UpdateNotification AutoloaderRoeland Jago Douma2017-10-249-0/+613
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | TwoFactorBackupCodes AutoloaderRoeland Jago Douma2017-10-249-0/+625
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Testing AutoloaderRoeland Jago Douma2017-10-249-0/+613
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | SystemTags AutoloaderRoeland Jago Douma2017-10-249-0/+611
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | ShareByMail AutoloaderRoeland Jago Douma2017-10-249-0/+615
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Provisioning_API AutoloaderRoeland Jago Douma2017-10-249-0/+615
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | OAuth2 autoloaderRoeland Jago Douma2017-10-249-0/+621
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | LookupServerConnector AutoloaderRoeland Jago Douma2017-10-249-0/+605
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Files_Versions AutoloaderRoeland Jago Douma2017-10-249-0/+623
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Files_Trashbin AutoloaderRoeland Jago Douma2017-10-249-0/+629
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Files_Sharing AutoloaderRoeland Jago Douma2017-10-244-10/+11
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Files AutoloaderRoeland Jago Douma2017-10-249-0/+655
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Federation AutoloaderRoeland Jago Douma2017-10-249-0/+629
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | FederatedFileSharing AutoloaderRoeland Jago Douma2017-10-249-0/+625
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Encryption AutoloaderRoeland Jago Douma2017-10-249-0/+655
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | DAV AutoloaderRoeland Jago Douma2017-10-2410-0/+874
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Comments AutoloaderRoeland Jago Douma2017-10-2410-0/+620
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| | * | Admin Audit autoloaderRoeland Jago Douma2017-10-2410-0/+624
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Merge pull request #6958 from ↵Joas Schilling2017-11-013-1/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/improved-mimetype-detection-for-object-storage Improve mimetype detection for object storages
| | * | | Improve mimetype detection for object storagesMorris Jobke2017-10-263-1/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Merge pull request #6975 from nextcloud/s3-read-object-fopenJoas Schilling2017-11-011-5/+8
| |\ \ \ \ | | | | | | | | | | | | use fopen directly when reading objects from s3
| | * | | | use fopen directly when reading objects from s3Robin Appelman2017-10-271-5/+8
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
| * | | | | Merge pull request #7032 from nextcloud/address-iconJoas Schilling2017-11-012-0/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | Add address icon
| | * | | | | Add address iconJan-Christoph Borchardt2017-10-312-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-0184-110/+310
| |/ / / / /
| * | | | | Merge pull request #7022 from nextcloud/acceptance-tests-7.1blizzz2017-10-312-1/+5
| |\ \ \ \ \ | | | | | | | | | | | | | | bump acceptance test suite to use php 7.1 image
| | * | | | | ignore local dependencies of acceptance testsArthur Schiwon2017-10-311-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| | * | | | | bump acceptance test suite to use php 7.1 imageArthur Schiwon2017-10-311-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
| * | | | | | Merge pull request #6849 from ↵blizzz2017-10-318-33/+235
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix-missing-translation-of-personal-calendar-in-activity Fix missing translation of "Personal" calendar in activities
| | * | | | | | Add a doc why this should not be removedJoas Schilling2017-10-234-3/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| | * | | | | | Fix missing translation of "Personal" calendar in activitiesJoas Schilling2017-10-167-33/+217
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Merge pull request #6952 from nextcloud/correctly-search-for-resultsJoas Schilling2017-10-312-3/+110
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Correctly search for existing collaboration results
| | * | | | | | | Add unit tests for SearchResultJoas Schilling2017-10-252-1/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| | * | | | | | | Correctly search for existing collaboration resultsJoas Schilling2017-10-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | | Merge pull request #7026 from nextcloud/login-readabilityRoeland Jago Douma2017-10-311-0/+2
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Better readability for text on log in page which is directly on backgrounds
| | * | | | | | | | Better readability for text on log in page which is directly on backgroundsJan-Christoph Borchardt2017-10-311-0/+2
| | | |_|/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
| * | | | | | | | Merge pull request #7021 from nextcloud/fix-oracle-indexesJoas Schilling2017-10-316-73/+157
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | Fix oracle indexes
| | * | | | | | | Rebuild autoloaderJoas Schilling2017-10-302-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| | * | | | | | | Die NoCheckMigratorVictor Dubiniuk2017-10-303-41/+2
| | | | | | | | |
| | * | | | | | | Add foreign key support to OCPiotr Mrowczynski2017-10-302-6/+73
| | | | | | | | |
| | * | | | | | | quote index columns on oracle, handle all index changes, minor phpdoc cleanupJörn Friedrich Dreyer2017-10-301-27/+85
| | | | | | | | |
| * | | | | | | | Merge pull request #6903 from ↵Joas Schilling2017-10-312-11/+221
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/feature/679/remove_valarms_from_read_only_shared_calendars remove reminders from read-only shared calendars
| | * | | | | | | | remove reminders from read-only shared calendarsGeorg Ehrke2017-10-222-11/+221
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-3122-34/+348
| | | | | | | | | |