summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* 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-144-5/+9
|\ \ \ | |_|/ |/| |
| * | add proper type hintingMorris Jobke2017-11-141-0/+1
| * | Pass the exception context to the crash reporterChristoph Wurst2017-11-144-5/+8
* | | 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-147-5/+166
* | | [tx-robot] updated from transifexNextcloud bot2017-11-122-8/+8
* | | [tx-robot] updated from transifexNextcloud bot2017-11-1112-36/+2606
* | | [tx-robot] updated from transifexNextcloud bot2017-11-1012-0/+2588
* | | Merge pull request #7117 from nextcloud/fix-welcome-stringMorris Jobke2017-11-091-1/+1
|\ \ \
| * | | Fix welcome text for better grammar in themed instancesMorris Jobke2017-11-091-1/+1
* | | | 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
* | | | | [tx-robot] updated from transifexNextcloud bot2017-11-0948-46/+524
* | | | | Merge pull request #6220 from nextcloud/cached-mount-info-filepathLukas Reschke2017-11-096-3/+111
|\ \ \ \ \
| * | | | | Allow getting the filepath when getting cached mounts by fileidRobin Appelman2017-10-276-3/+111
| |/ / / /
* | | | | 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 #6552 from nextcloud/notifications-add-highlight-definitionMorris Jobke2017-11-071-0/+25
|\ \ \ \ \
| * | | | | Notifications: Add highlight type definitionJulius Härtl2017-10-031-0/+25
* | | | | | 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-072-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Remove unused variablesMorris Jobke2017-11-062-2/+2
| | |_|_|_|_|/ | |/| | | | |
* | | | | | | Run updated license header updaterMorris Jobke2017-11-077-7/+7
* | | | | | | Merge pull request #7020 from Fiech/masterMorris Jobke2017-11-071-2/+0
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into masterJohannes S2017-10-3110-2/+207
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Extended list of sensitive configuration valuesJohannes Schlichenmaier2017-10-311-0/+6
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-072-0/+516
* | | | | | | | Change @georgehrke's emailMorris Jobke2017-11-0630-29/+30
* | | | | | | | Merge pull request #7083 from nextcloud/update-license-headersMorris Jobke2017-11-06413-246/+872
|\ \ \ \ \ \ \ \
| * | | | | | | | Update license headersMorris Jobke2017-11-06413-246/+872
* | | | | | | | | Merge pull request #7076 from nextcloud/s3-valid-bucket-nameMorris Jobke2017-11-061-2/+2
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Better error message for invalid bucket namesMorris Jobke2017-11-061-2/+2
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #5321 from coletivoEITA/user_ldap_plugins_structureMorris Jobke2017-11-063-3/+74
|\ \ \ \ \ \ \ \