summaryrefslogtreecommitdiffstats
Commit message (Expand)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 heading styleJan-Christoph Borchardt2017-09-281-1/+8
| * | Merge pull request #6875 from nextcloud/app_autoloadersJoas Schilling2017-11-01167-10/+11582
| |\ \
| | * | Update phan configRoeland Jago Douma2017-10-241-0/+18
| | * | User_LDAP AutoloaderRoeland Jago Douma2017-10-249-0/+701
| | * | UpdateNotification AutoloaderRoeland Jago Douma2017-10-249-0/+613
| | * | TwoFactorBackupCodes AutoloaderRoeland Jago Douma2017-10-249-0/+625
| | * | Testing AutoloaderRoeland Jago Douma2017-10-249-0/+613
| | * | SystemTags AutoloaderRoeland Jago Douma2017-10-249-0/+611
| | * | ShareByMail AutoloaderRoeland Jago Douma2017-10-249-0/+615
| | * | Provisioning_API AutoloaderRoeland Jago Douma2017-10-249-0/+615
| | * | OAuth2 autoloaderRoeland Jago Douma2017-10-249-0/+621
| | * | LookupServerConnector AutoloaderRoeland Jago Douma2017-10-249-0/+605
| | * | Files_Versions AutoloaderRoeland Jago Douma2017-10-249-0/+623
| | * | Files_Trashbin AutoloaderRoeland Jago Douma2017-10-249-0/+629
| | * | Files_Sharing AutoloaderRoeland Jago Douma2017-10-244-10/+11
| | * | Files AutoloaderRoeland Jago Douma2017-10-249-0/+655
| | * | Federation AutoloaderRoeland Jago Douma2017-10-249-0/+629
| | * | FederatedFileSharing AutoloaderRoeland Jago Douma2017-10-249-0/+625
| | * | Encryption AutoloaderRoeland Jago Douma2017-10-249-0/+655
| | * | DAV AutoloaderRoeland Jago Douma2017-10-2410-0/+874
| | * | Comments AutoloaderRoeland Jago Douma2017-10-2410-0/+620
| | * | Admin Audit autoloaderRoeland Jago Douma2017-10-2410-0/+624
| * | | Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-objec...Joas Schilling2017-11-013-1/+15
| |\ \ \
| | * | | Improve mimetype detection for object storagesMorris Jobke2017-10-263-1/+15
| * | | | Merge pull request #6975 from nextcloud/s3-read-object-fopenJoas Schilling2017-11-011-5/+8
| |\ \ \ \
| | * | | | use fopen directly when reading objects from s3Robin Appelman2017-10-271-5/+8
| * | | | | Merge pull request #7032 from nextcloud/address-iconJoas Schilling2017-11-012-0/+5
| |\ \ \ \ \
| | * | | | | Add address iconJan-Christoph Borchardt2017-10-312-0/+5
| * | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-0184-110/+310
| |/ / / / /
| * | | | | Merge pull request #7022 from nextcloud/acceptance-tests-7.1blizzz2017-10-312-1/+5
| |\ \ \ \ \
| | * | | | | ignore local dependencies of acceptance testsArthur Schiwon2017-10-311-0/+4
| | * | | | | bump acceptance test suite to use php 7.1 imageArthur Schiwon2017-10-311-1/+1
| * | | | | | Merge pull request #6849 from nextcloud/fix-missing-translation-of-personal-c...blizzz2017-10-318-33/+235
| |\ \ \ \ \ \
| | * | | | | | Add a doc why this should not be removedJoas Schilling2017-10-234-3/+21
| | * | | | | | Fix missing translation of "Personal" calendar in activitiesJoas Schilling2017-10-167-33/+217
| * | | | | | | Merge pull request #6952 from nextcloud/correctly-search-for-resultsJoas Schilling2017-10-312-3/+110
| |\ \ \ \ \ \ \
| | * | | | | | | Add unit tests for SearchResultJoas Schilling2017-10-252-1/+106
| | * | | | | | | Correctly search for existing collaboration resultsJoas Schilling2017-10-251-2/+4
| * | | | | | | | 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 backgroundsJan-Christoph Borchardt2017-10-311-0/+2
| | | |_|/ / / / / | | |/| | | | | |
| * | | | | | | | Merge pull request #7021 from nextcloud/fix-oracle-indexesJoas Schilling2017-10-316-73/+157
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Rebuild autoloaderJoas Schilling2017-10-302-2/+0
| | * | | | | | | 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 nextcloud/feature/679/remove_valarms_from_read_...Joas Schilling2017-10-312-11/+221
| |\ \ \ \ \ \ \ \
| | * | | | | | | | remove reminders from read-only shared calendarsGeorg Ehrke2017-10-222-11/+221
| * | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-3122-34/+348