aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | Merge pull request #18819 from nextcloud/bugfix/guest-container-sizeRoeland Jago Douma2020-01-112-2/+3
|\ \ \ \ \ | | | | | | | | | | | | Limit the size of the container on guest pages
| * | | | | Limit the size of the container on guest pagesJulius Härtl2020-01-102-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #18806 from nextcloud/bugfix/contactsmenu-fix-minRoeland Jago Douma2020-01-111-5/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Set the contactsmenu height without min calculation
| * | | | | | Set the contactsmenu height without min calculationJulius Härtl2020-01-101-5/+7
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #18814 from nextcloud/backport/18771/masterRoeland Jago Douma2020-01-118-32/+43
|\ \ \ \ \ \ | | | | | | | | | | | | | | [master] Fix sharing note placeholder
| * | | | | | Add placeholderJohn Molakvoæ2020-01-105-21/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | | | | Fix sharing note placeholderJohn Molakvoæ (skjnldsv)2020-01-104-11/+21
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | | | Merge pull request #18817 from nextcloud/bugfix/18751Roeland Jago Douma2020-01-111-5/+6
|\ \ \ \ \ \ | | | | | | | | | | | | | | Narrow error button styling scope
| * | | | | | Narrow error button styling scopeJulius Härtl2020-01-101-5/+6
| |/ / / / / | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | / / / [tx-robot] updated from transifexNextcloud bot2020-01-1138-18/+312
| |_|/ / / |/| | | |
* | | | | Fix webdav url (#18804)John Molakvoæ2020-01-103-2/+4
|\ \ \ \ \ | |/ / / / |/| | | | Fix webdav url
| * | | | Fix webdav urlJohn Molakvoæ (skjnldsv)2020-01-103-2/+4
|/ / / / | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* | | | Merge pull request #18752 from nextcloud/bugfix/contacts-menu-scrollRoeland Jago Douma2020-01-101-10/+6
|\ \ \ \ | | | | | | | | | | Fix contacts menu sizing
| * | | | Fix contacts menu sizingJulius Härtl2020-01-081-10/+6
| | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | Merge pull request #18783 from ↵Roeland Jago Douma2020-01-103-10/+9
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/sidebar/do-not-wait-domcontentloaded-for-init Init OCA.Files.Sidebar right away
| * | | | | Init OCA.Files.Sidebar right awayJohn Molakvoæ (skjnldsv)2020-01-093-10/+9
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | | | Merge pull request #18787 from acs-ferreira/patch-1Roeland Jago Douma2020-01-101-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Remove reference link for memcached options as domain doesn't exist anymore
| * | | | | Update config.sample.phpCarlos Ferreira2020-01-091-1/+1
| | | | | | | | | | | | | | | | | | Remove reference link as domain doesn't exist anymore.
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-01-102-106/+104
| |_|_|/ / |/| | | |
* | | | | Merge pull request #18780 from nextcloud/bugfix/18779/safari_madnessRoeland Jago Douma2020-01-091-0/+1
|\ \ \ \ \ | | | | | | | | | | | | Tell Safari to watch out for changes of filter
| * | | | | Tell Safari to watch out for changes of filter aka attempt no. 1 to fix #18779Georg Ehrke2020-01-091-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Georg Ehrke <developer@georgehrke.com>
* | | | | | Merge pull request #18777 from nextcloud/bugfix/noid/direct-after-resetRoeland Jago Douma2020-01-093-2/+3
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Set direct login after password reset
| * | | | | Set direct login after password resetJulius Härtl2020-01-093-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #18774 from nextcloud/fix/18762/mimetype-checker-for-usersRoeland Jago Douma2020-01-091-0/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | make the mime type checker for flow available to regular users
| * | | | | | make the mime type checker for flow available to regular usersArthur Schiwon2020-01-091-0/+4
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | | | Merge pull request #18773 from nextcloud/fix/18623/transfer-paddingRoeland Jago Douma2020-01-093-4/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Add more padding in transfer ownership
| * | | | | Add more padding in transfer ownershipGary Kim2020-01-093-4/+9
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | | Merge pull request #18766 from nextcloud/bugfix/workflow-filter-storeblizzz2020-01-095-6/+7
|\ \ \ \ \ | | | | | | | | | | | | Filter disabled operations out of the rule list
| * | | | | Bump bundlesJulius Härtl2020-01-092-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Fallback to proper default valuesJulius Härtl2020-01-092-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
| * | | | | Filter disabled operations out of the rule listJulius Härtl2020-01-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #18738 from ↵Roeland Jago Douma2020-01-098-0/+95
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | nextcloud/fix/clean-up-provider-registry-user-delete Clean up 2FA provider registry when a user is deleted
| * | | | | | Clean up 2FA provider registry when a user is deletedChristoph Wurst2020-01-088-0/+95
| | |_|_|_|/ | |/| | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #18757 from ↵Roeland Jago Douma2020-01-093-4/+4
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | | | | | | | | | | | | nextcloud/fix/transfer-ownership-autocomplete-matching Combine exact and other matches for transfer ownership
| * | | | | Combine exact and other matches for transfer ownershipChristoph Wurst2020-01-083-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | [tx-robot] updated from transifexNextcloud bot2020-01-0964-58/+312
|/ / / / /
* | | | | Merge pull request #18726 from marius-wieschollek/bugfix/18661Roeland Jago Douma2020-01-081-1/+1
|\ \ \ \ \ | | | | | | | | | | | | [#18661] Always include custom login image in theming
| * | | | | [#18661] Always include custom login image in themingMarius David Wieschollek2020-01-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Marius David Wieschollek <git.public@mdns.eu>
* | | | | | Merge pull request #18753 from nextcloud/bugfix/noid/select-menu-hideRoeland Jago Douma2020-01-081-1/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Do not rerender the selection menu on show
| * | | | | | Do not rerender the selection menu on showJulius Härtl2020-01-081-1/+0
| | |_|/ / / | |/| | | | | | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | | | | Merge pull request #18754 from nextcloud/fix/transfer-ownership-input-widthRoeland Jago Douma2020-01-083-5/+23
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make the transfer ownership input a bit wider
| * | | | | | Make the transfer ownership input a bit widerChristoph Wurst2020-01-083-5/+23
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #18625 Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
* | | | | | Merge pull request #18749 from nextcloud/fix/18746/use-encode-pathRoeland Jago Douma2020-01-085-21/+22
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Use @nextcloud/paths for file sidebar
| * | | | | Use @nextcloud/paths for file sidebarGary Kim2020-01-085-21/+22
|/ / / / / | | | | | | | | | | | | | | | Signed-off-by: Gary Kim <gary@garykim.dev>
* | | | | Merge pull request #18740 from ↵blizzz2020-01-082-3/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | nextcloud/fix/noid/ldap-better-cache-group-existency cache group existence early to save useless requests to LDAP
| * | | | cache group existence early to save useless requests to LDAPArthur Schiwon2020-01-082-3/+20
| | |/ / | |/| | | | | | | | | | | | | | | | | | we do it for users already Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | | Merge pull request #18733 from exner104/patch-1Roeland Jago Douma2020-01-081-3/+9
|\ \ \ \ | | | | | | | | | | Wrong email sender fix #18730
| * | | | additional fix to #18730 #18733exner1042020-01-081-0/+8
| | | | | | | | | | | | | | | regarding to advice from @kesselb
| * | | | Wrong email sender fix #18730exner1042020-01-081-3/+1
| |/ / / | | | | | | | | Wrong email sender in app sharebymail when sending password to owner fix #18730
* | | | Merge pull request #18739 from ↵Roeland Jago Douma2020-01-081-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | nextcloud/fix/18712/do-not-check-inherited-shares-on-current-node [inherited shares] do not retrieve shares on current folder