summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #6788 from staabm/masterLukas Reschke2017-11-082-2/+2
|\ | | | | Prevent XSS in links which open a new browser window
| * Prevent XSS in links which open a new browser windowMarkus Staab2017-10-192-2/+2
| |
* | Revert "Only allow colons in db host for IPv6 addresses"Morris Jobke2017-11-081-16/+0
| | | | | | | | | | | | This reverts commit 1287d6ddb303fc9b088b8a6837490042a1540dc6. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #6988 from starypatyk/stable12-mount-cache-performanceMorris Jobke2017-11-071-1/+5
|\ \ | | | | | | Improve performance of UserMountCache with external storage folders
| * | Improve performance of UserMountCache with external storage foldersDariusz Olszewski2017-11-011-1/+5
| | |
* | | Merge pull request #7075 from nextcloud/remove-unused-variablesRoeland Jago Douma2017-11-071-1/+1
|\ \ \ | | | | | | | | Remove unused variables
| * | | Remove unused variablesMorris Jobke2017-11-061-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Run updated license header updaterMorris Jobke2017-11-075-5/+5
| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | Merge pull request #7020 from Fiech/masterMorris Jobke2017-11-071-2/+0
|\ \ \ \ | | | | | | | | | | Extended list of sensitive configuration values (2)
| * \ \ \ Merge branch 'master' into masterJohannes S2017-10-314-1/+114
| |\ \ \ \
| * | | | | Extended list of sensitive configuration valuesJohannes Schlichenmaier2017-10-311-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In accordance with the issuetemplate app issue: https://github.com/nextcloud/issuetemplate/issues/27 Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
* | | | | | Change @georgehrke's emailMorris Jobke2017-11-0622-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #7083 from nextcloud/update-license-headersMorris Jobke2017-11-06282-151/+616
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update license headers
| * | | | | | Update license headersMorris Jobke2017-11-06282-151/+616
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | | Merge pull request #7076 from nextcloud/s3-valid-bucket-nameMorris Jobke2017-11-061-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Better error message for invalid bucket names
| * | | | | | Better error message for invalid bucket namesMorris Jobke2017-11-061-2/+2
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structureMorris Jobke2017-11-061-2/+11
|\ \ \ \ \ \ | | | | | | | | | | | | | | Implement plugins infrastructure in User_LDAP
| * | | | | | Plugins infrastructure in User_LDAPVinicius Cubas Brand2017-11-031-2/+11
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Vinicius Cubas Brand <viniciuscb@gmail.com>
* | | | | | Merge pull request #6402 from nextcloud/dav-email-customizationMorris Jobke2017-11-061-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Enhance calendar invitation emails
| * | | | | Make L10N->l provide weekdayNameGeorg Ehrke2017-11-031-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorageRoeland Jago Douma2017-11-021-2/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Fix seeking on object storage
| * | | | | Fix seeking on object storageMorris Jobke2017-10-271-2/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread. Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | | | | | Merge branch 'master' into autocomplete-guiArthur Schiwon2017-11-0129-110/+350
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #6958 from ↵Joas Schilling2017-11-012-1/+13
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/improved-mimetype-detection-for-object-storage Improve mimetype detection for object storages
| | * | | | | | Improve mimetype detection for object storagesMorris Jobke2017-10-262-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #6952 from nextcloud/correctly-search-for-resultsJoas Schilling2017-10-311-3/+5
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Correctly search for existing collaboration results
| | * | | | | | Add unit tests for SearchResultJoas Schilling2017-10-251-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 #7021 from nextcloud/fix-oracle-indexesJoas Schilling2017-10-313-69/+120
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | Fix oracle indexes
| | * | | | | | Die NoCheckMigratorVictor Dubiniuk2017-10-303-41/+2
| | | | | | | |
| | * | | | | | Add foreign key support to OCPiotr Mrowczynski2017-10-301-4/+36
| | | | | | | |
| | * | | | | | quote index columns on oracle, handle all index changes, minor phpdoc cleanupJörn Friedrich Dreyer2017-10-301-27/+85
| | | | | | | |
| * | | | | | | Merge pull request #7004 from Fiech/masterRoeland Jago Douma2017-10-301-0/+8
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | Extended list of sensitive configuration values
| | * | | | | | Extended list of sensitive configuration valuesJohannes Schlichenmaier2017-10-291-0/+8
| | | |_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In accordance with the issuetemplate app issue: https://github.com/nextcloud/issuetemplate/issues/27 Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
| * | | | | | Merge pull request #6867 from nextcloud/imessage-attachmentsGeorg Ehrke2017-10-303-0/+112
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add attachment support to emails
| | * | | | | | Move attachment creators to mailer classJoas Schilling2017-10-252-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| | * | | | | | Fix docsJoas Schilling2017-10-191-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| | * | | | | | Extend the API with teh parameters from SwiftJoas Schilling2017-10-191-2/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| | * | | | | | Add attachment support to emailsJoas Schilling2017-10-182-0/+98
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | | Use ::class and fix missing docJoas Schilling2017-10-281-1/+2
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | | | Merge pull request #6977 from Fiech/masterJoas Schilling2017-10-271-0/+6
| |\ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | Added additional methods for removal of sensitive info
| | * | | | | Added additional methods for removal of sensitive infoJohannes Schlichenmaier2017-10-271-0/+6
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
| * / | | | Use local cache for the CachingRouterRoeland Jago Douma2017-10-251-2/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is no need to cache routes distributed. It even has the downside that the router might return different routes then the ones in the local routes.php files. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | Merge pull request #6918 from nextcloud/rotate_job_by_defaultRoeland Jago Douma2017-10-243-1/+53
| |\ \ \ \ | | | | | | | | | | | | Add logrote as a default background job
| | * | | | Add logrote as a default background jobRoeland Jago Douma2017-10-243-1/+53
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | | | Merge pull request #6921 from nextcloud/appmanager-securitymiddlewareRoeland Jago Douma2017-10-242-3/+10
| |\ \ \ \ \ | | | | | | | | | | | | | | Use proper DI for security middleware for app enabled check
| | * | | | | Use proper DI for security middleware for app enabled checkMorris Jobke2017-10-242-3/+10
| | | |_|/ / | | |/| | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | | Merge pull request #6928 from nextcloud/remove-unneeded-methodMorris Jobke2017-10-241-15/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | Remove unused method of OC_App