summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Remove unused mimetype detection method in OC_ImageMorris Jobke2017-11-271-16/+0
* Merge pull request #7263 from nextcloud/clean-bruteforce-attempt-on-successLukas Reschke2017-11-241-0/+27
|\
| * Reset bruteforce attempt table on successful loginMorris Jobke2017-11-241-0/+27
* | Remove unused checkCode methodMorris Jobke2017-11-241-17/+0
|/
* Use basename() instead of self implementationMorris Jobke2017-11-232-12/+2
* Merge pull request #7168 from nextcloud/fix-user-listblizzz2017-11-231-1/+1
|\
| * Fix accesslist when a user has an ID only containting 0-9Joas Schilling2017-11-141-1/+1
* | Merge pull request #7137 from nextcloud/shared-jailed-source-rootMorris Jobke2017-11-231-0/+11
|\ \
| * | Use the correct root for shared jail when the source storage is also a jailRobin Appelman2017-11-101-0/+11
| |/
* | Remove wrong entry in admin_settings that causes 500Morris Jobke2017-11-201-0/+5
* | If there is no internet connection don't try to contact appstoreRoeland Jago Douma2017-11-171-1/+2
* | only create the file cache entry after the empty file was created successfull...Bjoern Schiessle2017-11-171-14/+13
* | Merge pull request #6840 from nextcloud/feature/5282/calendar_apiMorris Jobke2017-11-162-0/+150
|\ \
| * | implement CalendarManagerGeorg Ehrke2017-11-092-0/+150
| |/
* | Merge pull request #7169 from nextcloud/fix-user-searchMorris Jobke2017-11-141-0/+2
|\ \
| * | Fix search in user managent when no group is selectedMorris Jobke2017-11-141-0/+2
* | | Merge pull request #7172 from nextcloud/improve-error-handling-on-preview-cle...Morris Jobke2017-11-141-1/+12
|\ \ \
| * | | check if the user still exists before we try to cleanup the previewsBjoern Schiessle2017-11-141-1/+12
* | | | Merge pull request #7113 from nextcloud/s3-download-stream-fixBjörn Schießle2017-11-142-3/+9
|\ \ \ \ | |/ / / |/| | |
| * | | Use non empty files for object store touchRobin Appelman2017-11-081-2/+2
| * | | Fix contructing headers for s3 downloadRobin Appelman2017-11-081-1/+7
* | | | Merge pull request #7166 from nextcloud/enhancement/crash-report-contextMorris Jobke2017-11-142-3/+5
|\ \ \ \ | |_|/ / |/| | |
| * | | add proper type hintingMorris Jobke2017-11-141-0/+1
| * | | Pass the exception context to the crash reporterChristoph Wurst2017-11-142-3/+4
* | | | Merge pull request #7061 from kyrofa/bugfix/6028/app_path_realpathMorris Jobke2017-11-142-0/+12
|\ \ \ \ | |/ / / |/| | |
| * | | JSResourceLocator: re-use $app_pathKyle Fazzari2017-11-121-7/+9
| * | | JSResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-071-3/+8
| * | | CSSResourceLocator: account for symlinks in app pathKyle Fazzari2017-11-031-0/+5
* | | | Add a mechanism to register crach reportersChristoph Wurst2017-11-143-5/+72
| |_|/ |/| |
* | | Merge pull request #7014 from nextcloud/rename-locksMorris Jobke2017-11-091-83/+86
|\ \ \
| * | | Unlock files even if an exception occurskorelstar2017-11-031-83/+86
* | | | Merge pull request #7027 from nextcloud/Rello-patch-1Morris Jobke2017-11-091-5/+22
|\ \ \ \
| * | | | Add the return which is being usedJoas Schilling2017-10-311-6/+9
| * | | | Mapping of m3u, m3u8, pls to audio streamsRello2017-10-311-0/+14
* | | | | Merge pull request #6220 from nextcloud/cached-mount-info-filepathLukas Reschke2017-11-092-2/+63
|\ \ \ \ \
| * | | | | Allow getting the filepath when getting cached mounts by fileidRobin Appelman2017-10-272-2/+63
| |/ / / /
* | | | | Merge pull request #7109 from nextcloud/fix_6898Morris Jobke2017-11-081-0/+4
|\ \ \ \ \
| * | | | | If for some reason the json can't be decoded it is not cachedRoeland Jago Douma2017-11-081-0/+4
| | |_|_|/ | |/| | |
* | | | | Merge pull request #6788 from staabm/masterLukas Reschke2017-11-082-2/+2
|\ \ \ \ \
| * | | | | 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
| |/ / / / |/| | | |
* | | | | Merge pull request #6988 from starypatyk/stable12-mount-cache-performanceMorris Jobke2017-11-071-1/+5
|\ \ \ \ \
| * | | | | 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 variablesMorris Jobke2017-11-061-1/+1
| | |_|_|_|/ | |/| | | |
* | | | | | Run updated license header updaterMorris Jobke2017-11-075-5/+5
* | | | | | Merge pull request #7020 from Fiech/masterMorris Jobke2017-11-071-2/+0
|\ \ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into masterJohannes S2017-10-314-1/+114
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| * | | | | | Extended list of sensitive configuration valuesJohannes Schlichenmaier2017-10-311-0/+6
| | |_|_|_|/ | |/| | | |
* | | | | | Change @georgehrke's emailMorris Jobke2017-11-0622-21/+22