summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #17766 from nextcloud/backport/17756/stable17Roeland Jago Douma2019-11-011-1/+4
|\ | | | | [stable17] fix action menu on mobile
| * fix action menu on mobileGreta Doci2019-10-311-1/+4
| | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | Merge pull request #17767 from nextcloud/backport/17755/stable17Roeland Jago Douma2019-11-011-0/+10
|\ \ | | | | | | [stable17] Bring back external storage group select delete
| * | Bring back external storage group select deleteJohn Molakvoæ (skjnldsv)2019-10-311-0/+10
| |/ | | | | | | Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
* / [tx-robot] updated from transifexNextcloud bot2019-11-01184-242/+284
|/
* Merge pull request #17721 from nextcloud/version/17.0.1/rc1v17.0.1rc1Roeland Jago Douma2019-10-312-48/+4
|\ | | | | 17.0.1 RC1
| * Bump ca-bundleRoeland Jago Douma2019-10-301-46/+2
| | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * 17.0.1 RC1Roeland Jago Douma2019-10-301-2/+2
|/ | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* Merge pull request #17688 from nextcloud/backport/17626/stable17Roeland Jago Douma2019-10-301-4/+0
|\ | | | | [stable17] Fix weird KDE bug with loginflowv2
| * Fix weird KDE bug with loginflowv2Roeland Jago Douma2019-10-261-4/+0
| | | | | | | | | | | | | | It seems that KDE by default opens the url in secret. Should fix: https://github.com/nextcloud/desktop/issues/1412 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #17748 from nextcloud/backport/17674/stable17Roeland Jago Douma2019-10-301-1/+9
|\ \ | | | | | | [stable17] Do not show 'Get your own free account' on services under subscription
| * | Do not show 'Get your own free account' on services under subscriptionRoeland Jago Douma2019-10-301-1/+9
|/ / | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #17742 from nextcloud/backport/17740/stable17Roeland Jago Douma2019-10-301-1/+3
|\ \ | | | | | | [stable17] Return null from migration to match with typehint
| * | Return $schema on change and null otherwiseDaniel Kesselberg2019-10-291-1/+3
|/ / | | | | | | Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
* | Merge pull request #17731 from nextcloud/backport/17730/stable17Roeland Jago Douma2019-10-291-4/+7
|\ \ | | | | | | [stable17] Fix DAV mimetype search
| * | Fix DAV mimetype searchRoeland Jago Douma2019-10-291-4/+7
|/ / | | | | | | | | | | | | | | | | Fixes #15048 Catches the case where a full mimetype is sumbitted in the where like clause. Before we didn't catch this and it was just forwarded as is causing invalid queries. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-10-2910-14/+206
| |
* | Merge pull request #17716 from nextcloud/backport/17712/stable17Roeland Jago Douma2019-10-281-0/+10
|\ \ | | | | | | [stable17] Make sure limit is never negative
| * | Make sure limit is never negativeRoeland Jago Douma2019-10-281-0/+10
|/ / | | | | | | | | | | | | | | | | There were some cases where a negative limit could be passed in. Which would happily make the query explode. This is just a quick hack to make sure it never is negative. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | [tx-robot] updated from transifexNextcloud bot2019-10-284-10/+12
| |
* | [tx-robot] updated from transifexNextcloud bot2019-10-274-2/+4
| |
* | Merge pull request #17686 from nextcloud/backport/17673/stable17Roeland Jago Douma2019-10-263-8/+6
|\ \ | |/ |/| [stable17] Fix jsConfigHelper lang/locale mixup
| * Cleanup theming messRoeland Jago Douma2019-10-262-6/+5
| | | | | | | | | | | | | | | | | | | | * Do not do translations in the constructor. This gets called to early so there is no user yet. Which means we can't obtain the locale. Which means we store the wrong translation instance. * Same for the theming app magic. Just use the parent call when needed. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * Don't pass in the locale as the languageRoeland Jago Douma2019-10-261-2/+1
|/ | | | | | This messes with the translation of the date names etc. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2019-10-268-2/+50
|
* Merge pull request #17676 from nextcloud/backport/17469/stable17Roeland Jago Douma2019-10-251-4/+5
|\ | | | | [stable17] fix filename overlapping on mobile
| * add commentGreta Doci2019-10-251-3/+3
| | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
| * fix filename overlapping on mobile ref #17364Greta Doci2019-10-251-2/+3
| | | | | | | | Signed-off-by: Greta Doci <gretadoci@gmail.com>
* | Merge pull request #17681 from nextcloud/backport/17678/stable17Roeland Jago Douma2019-10-253-4/+98
|\ \ | |/ |/| [stable17] Harden middleware check
| * Harden middleware checkRoeland Jago Douma2019-10-253-4/+98
|/ | | | | | | These annotations will allow for extra checks. And thus make it harder to break things. Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* [tx-robot] updated from transifexNextcloud bot2019-10-256-24/+68
|
* [tx-robot] updated from transifexNextcloud bot2019-10-2410-178/+234
|
* Merge pull request #17300 from nextcloud/backport/17110/stable17Roeland Jago Douma2019-10-231-1/+1
|\ | | | | [stable17] Position fixed for .toastify.toast
| * Position fixed for .toastify.toastzorn-v2019-10-221-1/+1
| | | | | | | | Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | [tx-robot] updated from transifexNextcloud bot2019-10-2312-12/+16
| |
* | Merge pull request #17305 from nextcloud/backport/15557/stable17Roeland Jago Douma2019-10-221-9/+8
|\ \ | |/ |/| [stable17] Fix fetching additional search results on scrolling down
| * Fix fetching additional search results on scrolling downRené Bühlmann2019-10-221-9/+8
|/ | | | Signed-off-by: René Bühlmann <rene@buehlmann.net>
* Merge pull request #17156 from nextcloud/stable17-16976Roeland Jago Douma2019-10-224-6/+10
|\ | | | | [stable17] Always use the folder icon depending on the mount type if not a share mount
| * Bump bundlesJulius Härtl2019-10-222-2/+2
| | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * Fallback to directory icon based on the mount typeJulius Härtl2019-10-222-4/+8
| | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | Merge pull request #17578 from nextcloud/stable17-help-aboutRoeland Jago Douma2019-10-221-0/+3
|\ \ | | | | | | [stable17] Load additional scripts on help page
| * | Load additional scripts on help pageJulius Härtl2019-10-171-0/+3
| | | | | | | | | | | | Signed-off-by: Julius Härtl <jus@bitgrid.net>
* | | Merge pull request #17617 from nextcloud/backport/17595/stable17Roeland Jago Douma2019-10-221-1/+2
|\ \ \ | |_|/ |/| | [stable17] treat LDAP error 50 as auth issue, prevents lost server connection errors
| * | treat LDAP error 50 as auth issue, prevents lost server connection errorsArthur Schiwon2019-10-211-1/+2
| | | | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #17638 from nextcloud/backport/stable17/17627Roeland Jago Douma2019-10-227-266/+295
|\ \ \ | | | | | | | | [stable17] Fix browser back button
| * | | Fix browser back buttonRoeland Jago Douma2019-10-227-266/+295
|/ / / | | | | | | | | | | | | | | | | | | Fixes #17108 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl> Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
* | | Merge pull request #17621 from nextcloud/backport/17450/stable17blizzz2019-10-227-41/+54
|\ \ \ | | | | | | | | [stable17] hide strange Everyone and Disabled group numbers with LDAP
| * | | Compile assetsnpmbuildbot[bot]2019-10-214-7/+7
| | | | | | | | | | | | | | | | Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
| * | | backport of #17450Arthur Schiwon2019-10-213-34/+47
| |/ / | | | | | | | | | Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
* | | Merge pull request #17581 from nextcloud/backport/stable17/17548Roeland Jago Douma2019-10-225-2/+16
|\ \ \ | | | | | | | | [stable17] Pass on direct query parameter during login