aboutsummaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexNextcloud bot2020-05-09590-1886/+1206
|
* 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 #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 #20719 from nextcloud/fix/fix_languages_empty_arrayMorris Jobke2020-05-083-47/+63
|\ \ \ | | | | | | | | Fix languages empty array
| * | | Fix languages empty arrayGretaD2020-05-083-47/+63
| | |/ | |/| | | | | | | 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>
* / / [tx-robot] updated from transifexNextcloud bot2020-05-0810-2/+90
|/ /
* | Merge pull request #20849 from nextcloud/version/20Roeland Jago Douma2020-05-0726-84/+84
|\ \ | |/ |/| 20 in development now
| * Bump app versions and requirementsJoas Schilling2020-05-0726-84/+84
| | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | 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>
* | [tx-robot] updated from transifexNextcloud bot2020-05-0722-34/+182
| |
* | 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 #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>
* | [tx-robot] updated from transifexNextcloud bot2020-05-066-2/+52
|/
* 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-0522-18/+280
|
* Fix federated link sharing permissionsJohn Molakvoæ (skjnldsv)2020-05-049-67/+8500
| | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* Merge pull request #19124 from nextcloud/bug/13647/ignore-delete-groupsMorris Jobke2020-05-041-73/+77
|\ | | | | Exclude groups from sharing: Skip delete groups
| * Ignore delete groupsDaniel Kesselberg2020-04-241-73/+77
| | | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | [tx-robot] updated from transifexNextcloud bot2020-05-0410-2/+18
| |
* | [tx-robot] updated from transifexNextcloud bot2020-05-0324-22/+68
| |
* | Fix expiry datepicker allowing all datesGary Kim2020-05-025-10/+18
| | | | | | | | | | | | | | | | | | | | vue2-datepicker expects a `disabled-date` function rather than `not-before` and `not-after` dates. This commit updates it so that we now provide vue2-datepicker with a `disabled-date` function. Signed-off-by: Gary Kim <gary@garykim.dev>
* | [tx-robot] updated from transifexNextcloud bot2020-05-02180-104/+1056
| |
* | Process shares only once, better debug and expiration date codeJohn Molakvoæ (skjnldsv)2020-05-015-22/+24
| | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | Fix owner on publicownerwrapperRoeland Jago Douma2020-05-011-0/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #20380 from nextcloud/design/notification-mailsRoeland Jago Douma2020-05-011-134/+116
|\ \ | | | | | | Fix design and layout of notification mails
| * | Fix notification mail testsJan-Christoph Borchardt2020-05-011-134/+116
| | | | | | | | | | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* | | Merge pull request #20291 from nextcloud/fix/user_menu_not_focusedRoeland Jago Douma2020-05-0123-11/+9211
|\ \ \ | | | | | | | | Fix focus for user actionmenu
| * | | Fix the keyboard tab for actionmenuGretaD2020-04-3023-11/+9211
| | | | | | | | | | | | | | | | | | | | Signed-off-by: GretaD <gretadoci@gmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | [tx-robot] updated from transifexNextcloud bot2020-05-0124-10/+52
| | | |
* | | | Merge pull request #20538 from nextcloud/fix/20520/share-expireRoeland Jago Douma2020-04-304-4/+7
|\ \ \ \ | |/ / / |/| | | Fix share expiration date not shown
| * | | Fix share expiration date not shownGary Kim2020-04-304-4/+7
| | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | Merge pull request #20744 from nextcloud/fix/public-designJan-Christoph Borchardt2020-04-301-16/+0
|\ \ \ \ | |/ / / |/| | | Fix public layout header title & description
| * | | Fix public layout header title & descriptionJohn Molakvoæ (skjnldsv)2020-04-301-16/+0
| | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #20718 from nextcloud/fix/public_share_owner_activity_messMorris Jobke2020-04-304-1/+58
|\ \ \ \ | |/ / / |/| | | Add a wrapper to fall back to the share owner on public shares
| * | | Add a wrapper to fall back to the share owner on public sharesRoeland Jago Douma2020-04-304-1/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Else it might happen that we setup a storage that has no real owner and activities do boom etc (looking at you groupfolders and external storages!). Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #20677 from ↵Joas Schilling2020-04-301-2/+2
|\ \ \ \ | |_|/ / |/| | | | | | | | | | | nextcloud/followup/17718/scaling-user-provisioning Scaling user provisioning for subadmins with many groups
| * | | Patch to optimize for large installations (>5000 users >20000 groups) where ↵Mikael Hammarin2020-04-251-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | subadmins have access to many of groups (>250) - UsersController:editUser() calls isUserAccessible() even if the user is admin This fix reduces API calls to editUser (ex change locale/display name) from >2 minutes (!) to ~3 seconds per call in average. Signed-off-by: Mikael Hammarin <mikael@try2.se>
* | | | Merge pull request #19436 from nextcloud/bugfix/noid/dav-quota-calculationRoeland Jago Douma2020-04-302-11/+20
|\ \ \ \ | | | | | | | | | | Do not include mountpoints when calculating quota usage on WebDAV
| * | | | Do not include mountpoints when calculating quota usage on WebDAVJulius Härtl2020-04-242-11/+20
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #19039 from nextcloud/dav-activity-provide-links-to-calendarRoeland Jago Douma2020-04-307-107/+287
|\ \ \ \ \ | | | | | | | | | | | | Provide links to calendar in event creation/update activities
| * | | | | Provide links to calendar in event creation/update activitiesThomas Citharel2020-04-267-107/+287
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>