]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agoMerge pull request #10738 from nextcloud/fix/10669/store-sorting-only-for-loggedin...
blizzz [Mon, 20 Aug 2018 12:54:50 +0000 (14:54 +0200)]
Merge pull request #10738 from nextcloud/fix/10669/store-sorting-only-for-loggedin-users

Only send an update sort order request if there is an user

6 years agoMerge pull request #10697 from nextcloud/smb-log-removed-entries
Morris Jobke [Mon, 20 Aug 2018 12:48:48 +0000 (14:48 +0200)]
Merge pull request #10697 from nextcloud/smb-log-removed-entries

log entries that are hidden during file listing

6 years agoMerge pull request #10687 from nextcloud/fix/noid/false-positive-change-mention
Morris Jobke [Mon, 20 Aug 2018 12:37:41 +0000 (14:37 +0200)]
Merge pull request #10687 from nextcloud/fix/noid/false-positive-change-mention

don't blame randome people for background email updates

6 years agoMerge pull request #10755 from nextcloud/documentation/noid/fix-comments-in-config...
Morris Jobke [Mon, 20 Aug 2018 12:05:58 +0000 (14:05 +0200)]
Merge pull request #10755 from nextcloud/documentation/noid/fix-comments-in-config-sample

Fix comment style in config sample

6 years agoMerge pull request #10712 from nextcloud/fix/noid/check_if_provider_is_available_befo...
blizzz [Mon, 20 Aug 2018 11:21:16 +0000 (13:21 +0200)]
Merge pull request #10712 from nextcloud/fix/noid/check_if_provider_is_available_before_use

Check if a preview provider is available before using it

6 years agoFix comment style in config sample 10755/head
Morris Jobke [Mon, 20 Aug 2018 09:21:23 +0000 (11:21 +0200)]
Fix comment style in config sample

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #10744 from nextcloud/update-help-php
Morris Jobke [Mon, 20 Aug 2018 07:15:49 +0000 (09:15 +0200)]
Merge pull request #10744 from nextcloud/update-help-php

Update help.php

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 20 Aug 2018 00:12:26 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #10734 from ReekyMarko/master
Roeland Jago Douma [Sun, 19 Aug 2018 09:25:26 +0000 (11:25 +0200)]
Merge pull request #10734 from ReekyMarko/master

Fixed a typo

6 years agoUpdate help.php 10744/head
Marius Blüm [Sat, 18 Aug 2018 16:47:56 +0000 (18:47 +0200)]
Update help.php

Signed-off-by: Marius Blüm <marius@lineone.io>
6 years agoRecompile settings 10734/head
Roeland Jago Douma [Sat, 18 Aug 2018 11:35:46 +0000 (13:35 +0200)]
Recompile settings

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #10707 from nextcloud/dark-theme-fixes
Julius Härtl [Sat, 18 Aug 2018 09:41:39 +0000 (11:41 +0200)]
Merge pull request #10707 from nextcloud/dark-theme-fixes

Fix public pages background

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 18 Aug 2018 00:12:35 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoCheck if a preview provider is available before using it 10712/head
Roeland Jago Douma [Thu, 16 Aug 2018 08:45:51 +0000 (10:45 +0200)]
Check if a preview provider is available before using it

Else if a preview provider is registerd but not available (for example
missing support in some external lib). It will do :boom:. This way the
providers can at least do the sanity checks required.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoImproves the tests 10738/head
Michael Weimann [Fri, 17 Aug 2018 18:35:23 +0000 (20:35 +0200)]
Improves the tests

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoStores the sorting only if there is an user
Michael Weimann [Fri, 17 Aug 2018 18:09:11 +0000 (20:09 +0200)]
Stores the sorting only if there is an user

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoAdds a test to check that the sorting isn't stored without an user
Michael Weimann [Fri, 17 Aug 2018 18:08:57 +0000 (20:08 +0200)]
Adds a test to check that the sorting isn't stored without an user

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoFixed a typo
Marko Korhonen [Fri, 17 Aug 2018 14:23:10 +0000 (17:23 +0300)]
Fixed a typo

6 years agoMerge pull request #10731 from nextcloud/update-bundles
Björn Schießle [Fri, 17 Aug 2018 13:08:29 +0000 (15:08 +0200)]
Merge pull request #10731 from nextcloud/update-bundles

add deck and mail to the groupware bundle, remove talk

6 years agoadd deck and mail to the groupware bundle, remove talk 10731/head
Bjoern Schiessle [Fri, 17 Aug 2018 11:27:48 +0000 (13:27 +0200)]
add deck and mail to the groupware bundle, remove talk

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoMerge pull request #10718 from nextcloud/occ-recover-encryption
Björn Schießle [Fri, 17 Aug 2018 08:07:16 +0000 (10:07 +0200)]
Merge pull request #10718 from nextcloud/occ-recover-encryption

add occ command to recover encrypted files in case of password lost

6 years agoadd occ command to recover encrypted files in case of password lost 10718/head
Bjoern Schiessle [Thu, 16 Aug 2018 13:06:23 +0000 (15:06 +0200)]
add occ command to recover encrypted files in case of password lost

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoMerge pull request #10715 from nextcloud/fix/noid/filterwhatsnew
Roeland Jago Douma [Thu, 16 Aug 2018 12:17:48 +0000 (14:17 +0200)]
Merge pull request #10715 from nextcloud/fix/noid/filterwhatsnew

fix wrong return value of filtered whats new info

6 years agoand the user popover needs a higher z-index, to make it visible again 10715/head
Arthur Schiwon [Thu, 16 Aug 2018 11:20:49 +0000 (13:20 +0200)]
and the user popover needs a higher z-index, to make it visible again

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agofix wrong return value of filtered whats new info
Arthur Schiwon [Thu, 16 Aug 2018 10:50:44 +0000 (12:50 +0200)]
fix wrong return value of filtered whats new info

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoMerge pull request #10703 from nextcloud/release/noid/14_beta4 v14.0.0beta4
Roeland Jago Douma [Thu, 16 Aug 2018 08:48:21 +0000 (10:48 +0200)]
Merge pull request #10703 from nextcloud/release/noid/14_beta4

Nextcloud 14 Beta 4

6 years agoNextcloud 14 Beta 4 10703/head
Roeland Jago Douma [Wed, 15 Aug 2018 18:54:17 +0000 (20:54 +0200)]
Nextcloud 14 Beta 4

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #10608 from nextcloud/header-menu-fixes
Julius Härtl [Thu, 16 Aug 2018 07:50:25 +0000 (09:50 +0200)]
Merge pull request #10608 from nextcloud/header-menu-fixes

Fix header menu & contact popover

6 years agoMerge pull request #10695 from nextcloud/sharing-public-settings-fixes
Julius Härtl [Thu, 16 Aug 2018 07:38:58 +0000 (09:38 +0200)]
Merge pull request #10695 from nextcloud/sharing-public-settings-fixes

Fix password enforce on public links

6 years agoMerge pull request #10692 from nextcloud/deleted-share-remove-actions
Roeland Jago Douma [Thu, 16 Aug 2018 06:32:19 +0000 (08:32 +0200)]
Merge pull request #10692 from nextcloud/deleted-share-remove-actions

Do not show action menu if no actions are available

6 years agoObject.values polyfill 10692/head
John Molakvoæ (skjnldsv) [Thu, 16 Aug 2018 05:43:57 +0000 (07:43 +0200)]
Object.values polyfill

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoDisabled checkboxes and design fixes 10695/head
John Molakvoæ (skjnldsv) [Thu, 16 Aug 2018 05:31:17 +0000 (07:31 +0200)]
Disabled checkboxes and design fixes

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix public pages background 10707/head
John Molakvoæ (skjnldsv) [Thu, 16 Aug 2018 05:17:28 +0000 (07:17 +0200)]
Fix public pages background

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 16 Aug 2018 00:12:17 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agolog entries that are hidden during file listing 10697/head
Robin Appelman [Wed, 15 Aug 2018 13:08:50 +0000 (15:08 +0200)]
log entries that are hidden during file listing

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #10702 from nextcloud/bugfix/10622/user-management-actions
Roeland Jago Douma [Wed, 15 Aug 2018 18:36:46 +0000 (20:36 +0200)]
Merge pull request #10702 from nextcloud/bugfix/10622/user-management-actions

Fix missing actions menu on small screens in the user management

6 years agoFix missing actions menu on small screens in the user management 10702/head
Julius Härtl [Wed, 15 Aug 2018 18:07:54 +0000 (20:07 +0200)]
Fix missing actions menu on small screens in the user management

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #10701 from nextcloud/bugfix/noid/timepicker-zindex
John Molakvoæ [Wed, 15 Aug 2018 15:13:10 +0000 (17:13 +0200)]
Merge pull request #10701 from nextcloud/bugfix/noid/timepicker-zindex

Fix timepicker z-index to be above the sidebar

6 years agoMerge pull request #10645 from nextcloud/fix-password-reset
Björn Schießle [Wed, 15 Aug 2018 15:08:27 +0000 (17:08 +0200)]
Merge pull request #10645 from nextcloud/fix-password-reset

only warn about data lose on password reset if per-user keys are used

6 years agoFix timepicker z-index to be above the sidebar 10701/head
Julius Härtl [Wed, 15 Aug 2018 14:44:10 +0000 (16:44 +0200)]
Fix timepicker z-index to be above the sidebar

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agofix unit tests 10687/head
Arthur Schiwon [Wed, 15 Aug 2018 14:11:07 +0000 (16:11 +0200)]
fix unit tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoupdate unit tests 10645/head
Bjoern Schiessle [Fri, 10 Aug 2018 14:40:09 +0000 (16:40 +0200)]
update unit tests

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoonly warn about data lose on password reset if per-user keys are used
Bjoern Schiessle [Fri, 10 Aug 2018 14:12:34 +0000 (16:12 +0200)]
only warn about data lose on password reset if per-user keys are used

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoMerge pull request #10691 from nextcloud/various-beta14-design-fixes
Julius Härtl [Wed, 15 Aug 2018 12:46:45 +0000 (14:46 +0200)]
Merge pull request #10691 from nextcloud/various-beta14-design-fixes

Various beta14 design fixes

6 years agoFix password enforce on public links
John Molakvoæ (skjnldsv) [Wed, 15 Aug 2018 09:50:48 +0000 (11:50 +0200)]
Fix password enforce on public links

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #10689 from nextcloud/darktheme-theming-fixes
Julius Härtl [Wed, 15 Aug 2018 08:42:40 +0000 (10:42 +0200)]
Merge pull request #10689 from nextcloud/darktheme-theming-fixes

Add default theming into accessibility compiler

6 years agoDo not show action menu if no actions are available
John Molakvoæ (skjnldsv) [Wed, 15 Aug 2018 07:39:12 +0000 (09:39 +0200)]
Do not show action menu if no actions are available

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #10688 from nextcloud/fix/10492/disabled-users-navigation
Roeland Jago Douma [Wed, 15 Aug 2018 07:24:30 +0000 (09:24 +0200)]
Merge pull request #10688 from nextcloud/fix/10492/disabled-users-navigation

 Fixes hiding the disabled users nav item if there are no disabled users

6 years agoAdded feedback on autocomplete ui 10691/head
John Molakvoæ (skjnldsv) [Wed, 15 Aug 2018 06:59:06 +0000 (08:59 +0200)]
Added feedback on autocomplete ui

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoTypo
John Molakvoæ (skjnldsv) [Wed, 15 Aug 2018 06:46:40 +0000 (08:46 +0200)]
Typo

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoEllipsis long username/mails in share view
John Molakvoæ (skjnldsv) [Wed, 15 Aug 2018 06:45:07 +0000 (08:45 +0200)]
Ellipsis long username/mails in share view

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix footer and public min-height
John Molakvoæ (skjnldsv) [Wed, 15 Aug 2018 06:11:13 +0000 (08:11 +0200)]
Fix footer and public min-height

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoUndo button fix in theming
John Molakvoæ (skjnldsv) [Wed, 15 Aug 2018 05:30:57 +0000 (07:30 +0200)]
Undo button fix in theming

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoAdd default theming into accessibility compiler 10689/head
John Molakvoæ (skjnldsv) [Wed, 15 Aug 2018 05:25:31 +0000 (07:25 +0200)]
Add default theming into accessibility compiler

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 15 Aug 2018 00:13:40 +0000 (00:13 +0000)]
[tx-robot] updated from transifex

6 years agoFixes hiding the disabled users nav item if there are no disabled users 10688/head
Michael Weimann [Tue, 14 Aug 2018 20:28:53 +0000 (22:28 +0200)]
Fixes hiding the disabled users nav item if there are no disabled users

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoAdds an acceptance test for the users settings navigation without disabled users
Michael Weimann [Tue, 14 Aug 2018 20:28:11 +0000 (22:28 +0200)]
Adds an acceptance test for the users settings navigation without disabled users

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agodon't force LDAP updates on userExists anymore
Arthur Schiwon [Tue, 14 Aug 2018 15:57:24 +0000 (17:57 +0200)]
don't force LDAP updates on userExists anymore

and remove some deprecated code

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agodon't blame email address changers
Arthur Schiwon [Tue, 14 Aug 2018 15:06:57 +0000 (17:06 +0200)]
don't blame email address changers

the information is being collected with admin_audit

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoMerge pull request #8855 from nextcloud/feature/noid/ldap-integration-autotests
blizzz [Tue, 14 Aug 2018 12:14:22 +0000 (14:14 +0200)]
Merge pull request #8855 from nextcloud/feature/noid/ldap-integration-autotests

behat integration tests for LDAP

6 years agoMerge pull request #10680 from nextcloud/fix/noid/update_lockdownmanagerscope
Roeland Jago Douma [Tue, 14 Aug 2018 11:13:49 +0000 (13:13 +0200)]
Merge pull request #10680 from nextcloud/fix/noid/update_lockdownmanagerscope

Update the scope of the lockdownmanager

6 years agoUpdate the scope of the lockdownmanager 10680/head
Roeland Jago Douma [Tue, 14 Aug 2018 07:45:52 +0000 (09:45 +0200)]
Update the scope of the lockdownmanager

We have the token anyway. So better the scope as well.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #10679 from nextcloud/fix/10667/dialog-button-layout
Roeland Jago Douma [Tue, 14 Aug 2018 07:20:25 +0000 (09:20 +0200)]
Merge pull request #10679 from nextcloud/fix/10667/dialog-button-layout

switches the oc dialog button row to flex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 14 Aug 2018 00:12:05 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #10660 from danielkesselberg/bugfix/noid/fix-warning-signoff-checker
Julius Härtl [Mon, 13 Aug 2018 20:51:43 +0000 (22:51 +0200)]
Merge pull request #10660 from danielkesselberg/bugfix/noid/fix-warning-signoff-checker

Pass HttpHeader as array

6 years agoswitches the oc dialog button row to flex 10679/head
Michael Weimann [Mon, 13 Aug 2018 19:51:58 +0000 (21:51 +0200)]
switches the oc dialog button row to flex

Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
6 years agoMerge pull request #10621 from nextcloud/feature/noid/add-tos-to-enterprise-bundle
blizzz [Mon, 13 Aug 2018 13:47:15 +0000 (15:47 +0200)]
Merge pull request #10621 from nextcloud/feature/noid/add-tos-to-enterprise-bundle

Add the ToS app to the enterprise bundle

6 years agoMerge pull request #10592 from nextcloud/allow-external-actions-userslist
Roeland Jago Douma [Mon, 13 Aug 2018 13:39:22 +0000 (15:39 +0200)]
Merge pull request #10592 from nextcloud/allow-external-actions-userslist

Allow external actions to users list

6 years agoMerge pull request #10659 from danielkesselberg/feature/noid/remove-xcache
Roeland Jago Douma [Mon, 13 Aug 2018 11:55:26 +0000 (13:55 +0200)]
Merge pull request #10659 from danielkesselberg/feature/noid/remove-xcache

Drop support for xcache

6 years agoAllow external actions to users list 10592/head
John Molakvoæ (skjnldsv) [Wed, 8 Aug 2018 17:17:55 +0000 (19:17 +0200)]
Allow external actions to users list
+ Created fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #10666 from nextcloud/update/crl2
Roeland Jago Douma [Mon, 13 Aug 2018 09:31:03 +0000 (11:31 +0200)]
Merge pull request #10666 from nextcloud/update/crl2

Another CRL bump

6 years agoAnother CRL bump 10666/head
Roeland Jago Douma [Mon, 13 Aug 2018 08:28:23 +0000 (10:28 +0200)]
Another CRL bump

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #10664 from nextcloud/update/crl
Roeland Jago Douma [Mon, 13 Aug 2018 08:19:05 +0000 (10:19 +0200)]
Merge pull request #10664 from nextcloud/update/crl

Update CRL

6 years agoUpdate CRL 10664/head
Roeland Jago Douma [Mon, 13 Aug 2018 07:53:19 +0000 (09:53 +0200)]
Update CRL

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 13 Aug 2018 00:12:09 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agodon't add new LDAP configs if one is already present 8855/head
Arthur Schiwon [Sun, 12 Aug 2018 21:12:42 +0000 (23:12 +0200)]
don't add new LDAP configs if one is already present

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoimprove fail info and disable cache for a case
Arthur Schiwon [Sun, 12 Aug 2018 20:45:22 +0000 (22:45 +0200)]
improve fail info and disable cache for a case

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoUpdate autoloader 10659/head
Daniel Kesselberg [Sun, 12 Aug 2018 16:26:50 +0000 (18:26 +0200)]
Update autoloader

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years agoPass HttpHeader as array 10660/head
Daniel Kesselberg [Sun, 12 Aug 2018 16:21:38 +0000 (18:21 +0200)]
Pass HttpHeader as array

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years agoDrop support for xcache
Daniel Kesselberg [Sun, 12 Aug 2018 15:14:08 +0000 (17:14 +0200)]
Drop support for xcache

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
6 years agoPhpunit changed, use proper Assert class
Arthur Schiwon [Sun, 12 Aug 2018 12:46:22 +0000 (14:46 +0200)]
Phpunit changed, use proper Assert class

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 11 Aug 2018 00:12:30 +0000 (00:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #10610 from nextcloud/fix/noid/dontcountwithldap
Roeland Jago Douma [Fri, 10 Aug 2018 18:54:18 +0000 (20:54 +0200)]
Merge pull request #10610 from nextcloud/fix/noid/dontcountwithldap

do not trigger counting on LDAP

6 years agoMerge pull request #10639 from nextcloud/bugfix/10607/appsettings-fixes
Roeland Jago Douma [Fri, 10 Aug 2018 14:18:46 +0000 (16:18 +0200)]
Merge pull request #10639 from nextcloud/bugfix/10607/appsettings-fixes

Fix apps management sorting and app removal

6 years agoMerge pull request #10642 from nextcloud/bump/autoloaders
Roeland Jago Douma [Fri, 10 Aug 2018 14:18:00 +0000 (16:18 +0200)]
Merge pull request #10642 from nextcloud/bump/autoloaders

Bump autoloaders

6 years agodo not trigger counting on LDAP 10610/head
Arthur Schiwon [Thu, 9 Aug 2018 11:22:32 +0000 (13:22 +0200)]
do not trigger counting on LDAP

it's probably too many, degregading performance

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoRecompile 10639/head
Roeland Jago Douma [Fri, 10 Aug 2018 13:22:53 +0000 (15:22 +0200)]
Recompile

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #10615 from nextcloud/fix-trashbin-actions
Roeland Jago Douma [Fri, 10 Aug 2018 13:09:28 +0000 (15:09 +0200)]
Merge pull request #10615 from nextcloud/fix-trashbin-actions

Fix trashbin file actions

6 years agoBump autoloaders 10642/head
Roeland Jago Douma [Fri, 10 Aug 2018 13:03:22 +0000 (15:03 +0200)]
Bump autoloaders

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #10543 from nextcloud/ignore-deactivated-users
Roeland Jago Douma [Fri, 10 Aug 2018 13:01:14 +0000 (15:01 +0200)]
Merge pull request #10543 from nextcloud/ignore-deactivated-users

Do not show deactivated users in sharees and contacts

6 years agoMerge pull request #10623 from nextcloud/bugfix/10622/mobile-header
Roeland Jago Douma [Fri, 10 Aug 2018 12:55:06 +0000 (14:55 +0200)]
Merge pull request #10623 from nextcloud/bugfix/10622/mobile-header

Apply flex-basis to right header

6 years agoBump bundled javascript from settings
Julius Härtl [Fri, 10 Aug 2018 11:56:52 +0000 (13:56 +0200)]
Bump bundled javascript from settings

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoSort apps by a proper hierarchical order (active, update, name)
Julius Härtl [Fri, 10 Aug 2018 11:56:14 +0000 (13:56 +0200)]
Sort apps by a proper hierarchical order (active, update, name)

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoTests fixes 10608/head
John Molakvoæ (skjnldsv) [Fri, 10 Aug 2018 11:54:21 +0000 (13:54 +0200)]
Tests fixes

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix removeing apps in the sidebar
Julius Härtl [Fri, 10 Aug 2018 11:38:06 +0000 (13:38 +0200)]
Fix removeing apps in the sidebar

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #10619 from nextcloud/bugfix/4550/redirect-page-update
Roeland Jago Douma [Fri, 10 Aug 2018 09:14:03 +0000 (11:14 +0200)]
Merge pull request #10619 from nextcloud/bugfix/4550/redirect-page-update

Redirect to the same page after an update

6 years agoMerge pull request #10636 from nextcloud/fix/2fa-enforced-backup-codes
blizzz [Fri, 10 Aug 2018 09:06:40 +0000 (11:06 +0200)]
Merge pull request #10636 from nextcloud/fix/2fa-enforced-backup-codes

Fix 2FA being enforced if only backup codes provider is active

6 years agoMerge pull request #10618 from nextcloud/mimetype-insert-if-not-exists
Roeland Jago Douma [Fri, 10 Aug 2018 08:31:55 +0000 (10:31 +0200)]
Merge pull request #10618 from nextcloud/mimetype-insert-if-not-exists

use insertIfNotExists to store new mimetypes.

6 years agoMerge pull request #10546 from nextcloud/popover-tokens
Christoph Wurst [Fri, 10 Aug 2018 07:38:27 +0000 (09:38 +0200)]
Merge pull request #10546 from nextcloud/popover-tokens

Popovermenu fix and token settings design fixes

6 years agoRemove unused import 10636/head
Christoph Wurst [Fri, 10 Aug 2018 07:30:17 +0000 (09:30 +0200)]
Remove unused import

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>