summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Expand)AuthorAgeFilesLines
* [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
|\ \ \ \ \ \ \ \
| * | | | | | | | User_LDAP plugins: smaller fixesVinicius Cubas Brand2017-11-031-0/+7
| * | | | | | | | Plugins infrastructure in User_LDAPVinicius Cubas Brand2017-11-033-3/+67
| |/ / / / / / /
* | | | | | | | Merge pull request #6402 from nextcloud/dav-email-customizationMorris Jobke2017-11-061-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Make L10N->l provide weekdayNameGeorg Ehrke2017-11-031-0/+2
* | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-064-64/+84
| |/ / / / / / / |/| | | | | | |
* | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-034-0/+1032
* | | | | | | | 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
* | | | | | | | | Update autoloaderRoeland Jago Douma2017-11-022-0/+2
| |_|_|_|/ / / / |/| | | | | | |
* | | | | | | | Merge branch 'master' into autocomplete-guiArthur Schiwon2017-11-0160-132/+1114
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ 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
| | | |/ / / / / / / | | |/| | | | | | |
| * | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-11-012-0/+18
| | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | 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-315-71/+120
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Rebuild autoloaderJoas Schilling2017-10-302-2/+0
| | * | | | | | | | | 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
| * | | | | | | | | | [tx-robot] updated from transifexNextcloud bot2017-10-312-0/+18
| | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Merge pull request #7004 from Fiech/masterRoeland Jago Douma2017-10-301-0/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |