summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #20875 from nextcloud/warn/js/twofactor_backupcodesRoeland Jago Douma2020-05-083-6/+7
|\ | | | | Fix linter warnings on twofactor_backupcodes
| * Fix linter warnings on twofactor_backupcodesRoeland Jago Douma2020-05-083-6/+7
| | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Merge pull request #20852 from nextcloud/enh/initialstate/appframeworkChristoph Wurst2020-05-085-0/+114
|\ \ | | | | | | Add InitialState Appframework service
| * | Fix OCPSinceChecker and php-csMorris Jobke2020-05-082-1/+4
| | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | Add InitialState Appframework serviceRoeland Jago Douma2020-05-075-0/+111
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #20860 from ↵Georg Ehrke2020-05-084-5/+29
|\ \ \ | | | | | | | | | | | | | | | | nextcloud/bugfix/noid/macos_contacts_sync_prefer_personal_over_app-generated macOS contacts: prefer personal over app generated
| * | | Rename app-generated to z-app-generated, because macOS Contacts supports ↵Georg Ehrke2020-05-072-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-073-3/+28
| | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | Merge pull request #20815 from nextcloud/share-groupid-onlyMorris Jobke2020-05-082-40/+17
|\ \ \ \ | | | | | | | | | | get only groupids in default share backend
| * | | | Adjust tests to only return group IDsMorris Jobke2020-05-081-32/+15
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | Remove unused use statementMorris Jobke2020-05-081-1/+0
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Morris Jobke <hey@morrisjobke.de>
| * | | | get only groupids in default share backendRobin Appelman2020-05-041-7/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | instead of getting the full group object and then only using the id anyway Signed-off-by: Robin Appelman <robin@icewind.nl>
* | | | | Merge pull request #20719 from nextcloud/fix/fix_languages_empty_arrayMorris Jobke2020-05-084-49/+74
|\ \ \ \ \ | | | | | | | | | | | | Fix languages empty array
| * | | | | Fix languages empty arrayGretaD2020-05-084-49/+74
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: GretaD <gretadoci@gmail.com>
* | | | | | Merge pull request #20867 from nextcloud/warnigns/js/workflowengineRoeland Jago Douma2020-05-085-25/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix linter warnings in workflowengine
| * | | | | | Fix linter warnings in workflowengineRoeland Jago Douma2020-05-075-25/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | | Merge pull request #20868 from nextcloud/warn/js/updatenotificationMorris Jobke2020-05-083-19/+20
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | Fix linter warnings for the updatenotification
| * | | | | | Fix linter warnings for the updatenotificationRoeland Jago Douma2020-05-083-19/+20
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | | Merge pull request #20864 from nextcloud/enh/install_namingRoeland Jago Douma2020-05-081-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Install page app naming
| * | | | | Install page app namingRoeland Jago Douma2020-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-05-0816-4/+120
| |/ / / / |/| | | |
* | | | | Merge pull request #20861 from nextcloud/fix/replacedialogRoeland Jago Douma2020-05-077-8/+8
|\ \ \ \ \ | | | | | | | | | | | | Fix replacement dialog
| * | | | | Fix replacement dialogRoeland Jago Douma2020-05-077-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 #20859 from nextcloud/fix/20838/validate_apppasswordRoeland Jago Douma2020-05-071-0/+18
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Validate app password on alternative login
| * | | | | Validate app password on alternative loginRoeland Jago Douma2020-05-071-0/+18
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #20838 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #20853 from nextcloud/design/accessibility-maxcontrastRoeland Jago Douma2020-05-071-1/+1
|\ \ \ \ \ | |/ / / / |/| | | | Fix color-text-maxcontrast not passing WCAG AA
| * | | | Fix color-text-maxcontrast not passing WCAG AAJan-Christoph Borchardt2020-05-071-1/+1
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | | | Merge pull request #20849 from nextcloud/version/20Roeland Jago Douma2020-05-0727-87/+87
|\ \ \ \ \ | |_|_|/ / |/| | | | 20 in development now
| * | | | Bump app versions and requirementsJoas Schilling2020-05-0726-84/+84
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | | | 20 in development nowRoeland Jago Douma2020-05-071-3/+3
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | Merge pull request #20831 from nextcloud/fix/sidebar-fileinfo-changeRoeland Jago Douma2020-05-073-5/+11
|\ \ \ \ \ | |_|_|_|/ |/| | | | Do not process the same FileInfo twice
| * | | | Do not process the same FileInfo twiceJohn Molakvoæ (skjnldsv)2020-05-063-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 #20782 from nextcloud/enh/appframework/appconfig_wrapperRoeland Jago Douma2020-05-075-0/+193
|\ \ \ \ \ | |_|/ / / |/| | | | Simple AppConfig wrapper for the AppFramework
| * | | | Simple AppConfig wrapper for the AppFrameworkRoeland Jago Douma2020-05-025-0/+193
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 9 out of 10 cases apps want to access their own appconfig. Hence it would be nice not to have to enter the app id all the time. This simple wrapper just passes on the appid in all calls. Basically this allows for simpler code in the apps. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | | [tx-robot] updated from transifexNextcloud bot2020-05-0728-70/+308
| | | | |
* | | | | 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>
* | / / / [tx-robot] updated from transifexNextcloud bot2020-05-0524-18/+284
| |/ / / |/| | |
* | | | Merge pull request #20754 from nextcloud/version/19/beta7v19.0.0beta7Roeland Jago Douma2020-05-041-2/+2
|\ \ \ \ | | | | | | | | | | 19 beta 7