summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Expand)AuthorAgeFilesLines
* Fix accesslist when a user has an ID only containting 0-9Joas Schilling2017-11-141-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
* | | 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
* | | | | | Merge pull request #7083 from nextcloud/update-license-headersMorris Jobke2017-11-06282-151/+616
|\ \ \ \ \ \
| * | | | | | Update license headersMorris Jobke2017-11-06282-151/+616
* | | | | | | 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-061-2/+11
|\ \ \ \ \ \
| * | | | | | Plugins infrastructure in User_LDAPVinicius Cubas Brand2017-11-031-2/+11
| |/ / / / /
* | | | | | Merge pull request #6402 from nextcloud/dav-email-customizationMorris Jobke2017-11-061-0/+2
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Make L10N->l provide weekdayNameGeorg Ehrke2017-11-031-0/+2
* | | | | | Merge pull request #6974 from nextcloud/fix-fseek-on-objectstorageRoeland Jago Douma2017-11-021-2/+22
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | |
| * | | | | Fix seeking on object storageMorris Jobke2017-10-271-2/+22
* | | | | | Merge branch 'master' into autocomplete-guiArthur Schiwon2017-11-0129-110/+350
|\ \ \ \ \ \
| * \ \ \ \ \ Merge pull request #6958 from nextcloud/improved-mimetype-detection-for-objec...Joas Schilling2017-11-012-1/+13
| |\ \ \ \ \ \
| | * | | | | | Improve mimetype detection for object storagesMorris Jobke2017-10-262-1/+13
| * | | | | | | 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 #6952 from nextcloud/correctly-search-for-resultsJoas Schilling2017-10-311-3/+5
| |\ \ \ \ \ \
| | * | | | | | Add unit tests for SearchResultJoas Schilling2017-10-251-1/+1
| | * | | | | | Correctly search for existing collaboration resultsJoas Schilling2017-10-251-2/+4
| * | | | | | | Merge pull request #7021 from nextcloud/fix-oracle-indexesJoas Schilling2017-10-313-69/+120
| |\ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| | * | | | | | 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 valuesJohannes Schlichenmaier2017-10-291-0/+8
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge pull request #6867 from nextcloud/imessage-attachmentsGeorg Ehrke2017-10-303-0/+112
| |\ \ \ \ \ \
| | * | | | | | Move attachment creators to mailer classJoas Schilling2017-10-252-21/+22
| | * | | | | | Fix docsJoas Schilling2017-10-191-4/+4
| | * | | | | | Extend the API with teh parameters from SwiftJoas Schilling2017-10-191-2/+15