summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #21032 from nextcloud/backport/20846/stable19Roeland Jago Douma2020-05-193-12/+14
|\ \ \ \ | |/ / / |/| | | [stable19] Link permissions
| * | | Fix share update testJulius Härtl2020-05-181-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | Update public link share permission codeRoeland Jago Douma2020-05-181-2/+2
| | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | | Have share permissions on link shares if it is enabledRoeland Jago Douma2020-05-181-9/+10
|/ / / | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20991 from nextcloud/backport/20941/stable19Morris Jobke2020-05-184-26/+53
|\ \ \ | |/ / |/| | [stable19] update icewind/smb to 3.2.4
| * | update icewind/smb to 3.2.4Robin Appelman2020-05-154-26/+53
|/ / | | | | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* | Merge pull request #20963 from nextcloud/backport/20947/stable19Roeland Jago Douma2020-05-141-3/+3
|\ \ | |/ |/| [stable19] Bump yargs-parser
| * Bump yargs-parserChristoph Wurst2020-05-141-3/+3
|/ | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* Merge pull request #20850 from nextcloud/version/19/rc2Roeland Jago Douma2020-05-141-2/+2
|\ | | | | 19 RC2
| * 19 RC2Roeland Jago Douma2020-05-141-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #20960 from nextcloud/backport/20952/stable19Roeland Jago Douma2020-05-141-1/+1
|\ | | | | [stable19] Respect exit code of lint run - changed from -exec to xargs as this e…
| * Respect exit code of lint run - changed from -exec to xargs as this exits ↵Morris Jobke2020-05-131-1/+1
| | | | | | | | | | | | properly Signed-off-by: Morris Jobke <hey@morrisjobke.de>
* | Merge pull request #20961 from nextcloud/backport/20958/stable19Roeland Jago Douma2020-05-141-0/+6
|\ \ | |/ |/| [stable19] Allow links to conversations
| * Allow links to conversationsJoas Schilling2020-05-131-0/+6
|/ | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* Merge pull request #20954 from nextcloud/backport/20951/stable19Roeland Jago Douma2020-05-131-1/+1
|\ | | | | [stable19] Trailing comma's in functin arguments break on 7.2
| * Trailing comma's in functin arguments break on 7.2Roeland Jago Douma2020-05-131-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #20944 from nextcloud/backport/20897/stable19Roeland Jago Douma2020-05-132-6/+5
|\ \ | |/ |/| [stable19] Proxy server could cache http response when it is not private
| * Fix http cache testClement Wong2020-05-131-1/+1
| | | | | | | | Signed-off-by: Clement Wong <git@clement.hk>
| * Add public argument to Http cacheFor()Clement Wong2020-05-131-5/+4
| | | | | | | | Signed-off-by: Clement Wong <git@clement.hk>
| * Proxy server could cache http response when it is not privateClement Wong2020-05-131-2/+2
|/ | | | Signed-off-by: Clement Wong <git@clement.hk>
* Merge pull request #20940 from nextcloud/backport/20858/stable19Roeland Jago Douma2020-05-121-1/+3
|\ | | | | [stable19] Remember the webauthn name of devices
| * Remember the webauthn name of devicesRoeland Jago Douma2020-05-121-1/+3
|/ | | | | | | Fixes #20289 we should not reset to default once we have logged in with the device. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #20923 from nextcloud/backport/20915/stable19Roeland Jago Douma2020-05-112-11/+24
|\ | | | | [stable19] Use random_bytes
| * Use random_bytesRoeland Jago Douma2020-05-112-11/+24
| | | | | | | | | | | | | | Since we don't care if it is human readbale. The code is backwards compatible with the old format. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #20878 from nextcloud/backport/20719/stable19John Molakvoæ2020-05-114-49/+74
|\ \ | |/ |/|
| * Fix languages empty arrayGretaD2020-05-084-49/+74
| | | | | | | | Signed-off-by: GretaD <gretadoci@gmail.com>
* | Merge pull request #20880 from nextcloud/backport/20860/stable19Roeland Jago Douma2020-05-094-5/+29
|\ \ | | | | | | [stable19] macOS contacts: prefer personal over app generated
| * | Rename app-generated to z-app-generated, because macOS Contacts supports ↵Georg Ehrke2020-05-082-2/+1
| | | | | | | | | | | | | | | | | | only one and will pick the first one alphabetically Signed-off-by: Georg Ehrke <developer@georgehrke.com>
| * | Implement ctag and etag in ContactsInteractionGeorg Ehrke2020-05-083-3/+28
| |/ | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | Merge pull request #20885 from nextcloud/backport/20853/stable19Roeland Jago Douma2020-05-091-1/+1
|\ \ | |/ |/| [stable19] Fix color-text-maxcontrast not passing WCAG AA
| * Fix color-text-maxcontrast not passing WCAG AAJan-Christoph Borchardt2020-05-091-1/+1
|/ | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* Merge pull request #20873 from nextcloud/backport/20864/stable19Morris Jobke2020-05-081-1/+1
|\ | | | | [stable19] Install page app naming
| * Install page app namingRoeland Jago Douma2020-05-081-1/+1
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #20872 from nextcloud/backport/20831/stable19Roeland Jago Douma2020-05-083-5/+11
|\ \ | | | | | | [stable19] Do not process the same FileInfo twice
| * | Do not process the same FileInfo twiceJohn Molakvoæ (skjnldsv)2020-05-083-5/+11
| |/ | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Merge pull request #20871 from nextcloud/backport/20861/stable19Roeland Jago Douma2020-05-087-8/+8
|\ \ | |/ |/| [stable19] Fix replacement dialog
| * Fix replacement dialogRoeland Jago Douma2020-05-087-8/+8
|/ | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* Merge pull request #20823 from nextcloud/version/19/RC1v19.0.0RC1Roeland Jago Douma2020-05-061-2/+2
|\ | | | | 19 RC1
| * 19 RC1Roeland Jago Douma2020-05-041-2/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #20841 from nextcloud/trashbin-lockingRoeland Jago Douma2020-05-062-21/+81
|\ \ | | | | | | add locking to resolve concurent move to trashbin conflicts
| * | add locking to resolve concurent move to trashbin conflictsRobin Appelman2020-05-062-21/+81
| | | | | | | | | | | | | | | | | | | | | uses a lock to prevent two requests from moving a file to the trashbin concurrently (causing sql duplicate key errors) Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | Merge pull request #20837 from nextcloud/bugfix/noid/fix-syntaxMorris Jobke2020-05-061-1/+1
|\ \ \ | |/ / |/| | Fix syntax
| * | Fix syntaxJoas Schilling2020-05-061-1/+1
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | | Merge pull request #20832 from ↵Morris Jobke2020-05-064-8/+10
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/fix/sharing-filter-user-shares-only-fix-group-display Do not filter id matching userId on non-user-share shares
| * | | Do not filter id matching userId on non-user-share sharesJohn Molakvoæ (skjnldsv)2020-05-054-8/+10
| | | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | Merge pull request #18955 from adrb/swift_upload_large_objectsRoeland Jago Douma2020-05-061-4/+14
|\ \ \ \ | |_|/ / |/| | | Large Object support for OpenStack Swift
| * | | Large Object support for OpenStack Swift.Adrian Brzezinski2020-04-271-4/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, you wouldn't be able to create objects larger that 5GB. It's somewhat related with pull #18883 Signed-off-by: Adrian Brzezinski <adrian.brzezinski@eo.pl>
* | | | [tx-robot] updated from transifexNextcloud bot2020-05-066-2/+52
| |/ / |/| |
* | | Merge pull request #20825 from nextcloud/fix/sharing-own-groupJohn Molakvoæ2020-05-053-22/+24
|\ \ \
| * | | Fix filtering our owner & current user from sharesJohn Molakvoæ (skjnldsv)2020-05-053-22/+24
|/ / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
generated by cgit v1.2.3 (git 2.39.1) at 2025-03-29 11:54:46 +0000