summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2018-05-0520-4/+38
* Merge pull request #9387 from nextcloud/getcachentry-lockMorris Jobke2018-05-041-3/+1
|\
| * remove unneeded locks in getCacheEntryRobin Appelman2018-05-041-3/+1
* | Merge pull request #9364 from nextcloud/log-invalid-storageMorris Jobke2018-05-041-0/+3
|\ \
| * | Log mount and storage issues in getFileInfoRobin Appelman2018-05-021-0/+3
| |/
* | [tx-robot] updated from transifexNextcloud bot2018-05-04126-214/+228
* | Merge pull request #9290 from nextcloud/streams-0.6.1Morris Jobke2018-05-032-3/+3
|\ \
| * | Use better way to determine stream type in encryption stream wrapperRobin Appelman2018-05-011-3/+3
| * | update icewind/streams to 0.6.1Robin Appelman2018-05-011-0/+0
* | | Merge pull request #9340 from gboudreau/dev/chrome-devconsole-sourcemap-warningsMorris Jobke2018-05-032-4/+7
|\ \ \
| * | | Resolves warnings in Chrome Dev Console:Guillaume Boudreau2018-04-292-4/+7
* | | | Merge pull request #9353 from nextcloud/feature/4724/versions_davMorris Jobke2018-05-0310-1/+570
|\ \ \ \
| * | | | Allow to read get old versionsRoeland Jago Douma2018-05-012-4/+20
| * | | | Add rollbackRoeland Jago Douma2018-05-016-0/+105
| * | | | Add version collection to DAVRoeland Jago Douma2018-05-019-1/+449
| | |_|/ | |/| |
* | | | Merge pull request #9373 from nextcloud/bugfix/8929/actual_fetch_versionMorris Jobke2018-05-031-1/+1
|\ \ \ \
| * | | | Get correct version of an appRoeland Jago Douma2018-05-031-1/+1
* | | | | Merge pull request #9355 from nextcloud/dav-upload-lockMorris Jobke2018-05-031-1/+10
|\ \ \ \ \
| * | | | | only allow a single concurrent dav write to a fileRobin Appelman2018-04-261-1/+10
* | | | | | Merge pull request #9332 from nextcloud/personal-settings-fixesMorris Jobke2018-05-037-74/+55
|\ \ \ \ \ \
| * | | | | | Only show used amount for unlimited quota usersMorris Jobke2018-05-031-2/+2
| * | | | | | Move quota icon to coreJulius Härtl2018-05-033-4/+1
| * | | | | | Translate details textJulius Härtl2018-05-031-1/+1
| * | | | | | Move quota bar to info section and make it a bit simplerJulius Härtl2018-05-034-66/+52
| * | | | | | Personal settings: Fix visibility alignment and avatar description textJulius Härtl2018-05-031-4/+2
* | | | | | | Merge pull request #9352 from nextcloud/9318_SCSSCacher_resetCache_catch_exce...Morris Jobke2018-05-031-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Issue #9318: catch exceptions in SCSSCacher::resetCache()Roland Tapken2018-05-021-1/+5
| | |/ / / / | |/| | | |
* / | | | | [tx-robot] updated from transifexNextcloud bot2018-05-0318-0/+20
|/ / / / /
* | | | | Merge pull request #9293 from nextcloud/feature/9166/custom-auditlogfileMorris Jobke2018-05-0224-194/+683
|\ \ \ \ \
| * | | | | use SystemConfig, less dependencies, and not publicly neededArthur Schiwon2018-04-266-55/+41
| * | | | | log to $datadir/audit.log by default and add rotationArthur Schiwon2018-04-2610-18/+144
| * | | | | fix dav testArthur Schiwon2018-04-261-1/+2
| * | | | | add missing php doc and type hintsArthur Schiwon2018-04-262-4/+17
| * | | | | improve Syslog a littleArthur Schiwon2018-04-261-3/+6
| * | | | | revert Log's dependency to SystemConfig to work during InstallationArthur Schiwon2018-04-264-12/+17
| * | | | | move IFileBased to public namespace, logreader needs itArthur Schiwon2018-04-265-4/+5
| * | | | | offer API to create own File log. admin_audit makes use of itArthur Schiwon2018-04-2615-83/+198
| * | | | | destaticfy Log classesArthur Schiwon2018-04-2615-117/+356
* | | | | | Merge pull request #9346 from nextcloud/techdep/noid/needsPartFile_to_storageMorris Jobke2018-05-023-17/+12
|\ \ \ \ \ \
| * | | | | | Use an actual function of the storage to determine needsPartFileRoeland Jago Douma2018-05-013-17/+12
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #9310 from nextcloud/bugfix/noid/allow-to-inject-collabora...Roeland Jago Douma2018-05-021-1/+4
|\ \ \ \ \ \
| * | | | | | Allow to inject ISearchResultJoas Schilling2018-04-261-1/+4
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #8564 from nextcloud/files_external_read_onlyMorris Jobke2018-05-017-7/+37
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fix testsRoeland Jago Douma2018-05-012-3/+6
| * | | | | External mount does not get DELETE and UPDATE if readonlyRoeland Jago Douma2018-05-011-1/+1
| * | | | | Make it possible to make external storages read onlyRoeland Jago Douma2018-05-014-3/+30
|/ / / / /
* | | | | Merge pull request #9178 from nextcloud/feature/9142/directdownloadMorris Jobke2018-05-0118-2/+1239
|\ \ \ \ \
| * | | | | Improve the directContollerRoeland Jago Douma2018-04-262-15/+169
| * | | | | Add tests for DirectFile and DirectHomeRoeland Jago Douma2018-04-263-1/+315
| * | | | | Throttle requests to unknown tokensRoeland Jago Douma2018-04-263-5/+28