]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agoFix navigation more menu background for dark theme 12580/head
John Molakvoæ (skjnldsv) [Thu, 22 Nov 2018 09:04:50 +0000 (10:04 +0100)]
Fix navigation more menu background for dark theme

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12468 from nextcloud/multiselect-removal-fix
John Molakvoæ [Thu, 22 Nov 2018 07:49:09 +0000 (08:49 +0100)]
Merge pull request #12468 from nextcloud/multiselect-removal-fix

Remove conflicting multiselect

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 22 Nov 2018 01:12:20 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12570 from nextcloud/do-not-show-tab-headers-marked-as-hidden
Roeland Jago Douma [Wed, 21 Nov 2018 21:34:41 +0000 (22:34 +0100)]
Merge pull request #12570 from nextcloud/do-not-show-tab-headers-marked-as-hidden

Do not show tab headers marked as hidden

6 years agoDo not show tab headers marked as hidden 12570/head
Daniel Calviño Sánchez [Wed, 21 Nov 2018 14:21:22 +0000 (15:21 +0100)]
Do not show tab headers marked as hidden

Tab headers that should not be shown are marked with the "hidden" CSS
class. The CSS rules set "display: none" for ".hidden" elements, but as
the rules for ".tabHeaders .tabHeader" are more specific than rules for
".hidden" the "display" property is overriden and ends being "flex".
Therefore, it is necessary to explicitly set a rule for ".tabHeaders
.tabHeader.hidden" elements.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 21 Nov 2018 01:12:15 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12531 from nextcloud/bugfix/noid/hide-download-folders
Roeland Jago Douma [Tue, 20 Nov 2018 19:51:23 +0000 (20:51 +0100)]
Merge pull request #12531 from nextcloud/bugfix/noid/hide-download-folders

Allow to hide download option for folders shared by link

6 years agoFix whitespace and file action cleanup 12531/head
Julius Härtl [Tue, 20 Nov 2018 11:20:06 +0000 (12:20 +0100)]
Fix whitespace and file action cleanup

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoClear link to avoid downloads
Roeland Jago Douma [Mon, 19 Nov 2018 18:25:13 +0000 (19:25 +0100)]
Clear link to avoid downloads

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoCompile handlebars
Roeland Jago Douma [Mon, 19 Nov 2018 14:53:34 +0000 (15:53 +0100)]
Compile handlebars

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoAllow to hide download option for folders shared by link
Julius Härtl [Mon, 19 Nov 2018 13:19:42 +0000 (14:19 +0100)]
Allow to hide download option for folders shared by link

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #12544 from nextcloud/fix/better_update_share_handling
Roeland Jago Douma [Tue, 20 Nov 2018 15:19:11 +0000 (16:19 +0100)]
Merge pull request #12544 from nextcloud/fix/better_update_share_handling

Handle permission in update of share better

6 years agoMerge pull request #12552 from nextcloud/fix/11146/respect_disabled_password_reset
Roeland Jago Douma [Tue, 20 Nov 2018 14:52:32 +0000 (15:52 +0100)]
Merge pull request #12552 from nextcloud/fix/11146/respect_disabled_password_reset

Respect the disabled setting for lost_password_link

6 years agoMerge pull request #12491 from nextcloud/share-menu-click-fix
John Molakvoæ [Tue, 20 Nov 2018 14:35:22 +0000 (15:35 +0100)]
Merge pull request #12491 from nextcloud/share-menu-click-fix

Fix share link password input

6 years agoFix share link password input 12491/head
John Molakvoæ (skjnldsv) [Fri, 16 Nov 2018 15:19:13 +0000 (16:19 +0100)]
Fix share link password input

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12350 from nextcloud/filepicker-sorting
Morris Jobke [Tue, 20 Nov 2018 12:34:51 +0000 (13:34 +0100)]
Merge pull request #12350 from nextcloud/filepicker-sorting

Enable sorting in file picker

6 years agoRespect the disabled setting for lost_password_link 12552/head
Roeland Jago Douma [Tue, 20 Nov 2018 12:28:40 +0000 (13:28 +0100)]
Respect the disabled setting for lost_password_link

Fixes #11146
As documented when it is set to disabled the user can't request a lost
password.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #12543 from nextcloud/fix/12498/bearer_tokens_are_apptokens
Morris Jobke [Tue, 20 Nov 2018 10:49:33 +0000 (11:49 +0100)]
Merge pull request #12543 from nextcloud/fix/12498/bearer_tokens_are_apptokens

Bearer tokens are app token

6 years agoMerge pull request #12494 from nextcloud/cache-notfound-id
Morris Jobke [Tue, 20 Nov 2018 08:51:18 +0000 (09:51 +0100)]
Merge pull request #12494 from nextcloud/cache-notfound-id

return the correct value when trying to get a non existing item from cache by id

6 years agoMerge pull request #12500 from nextcloud/swift-object-not-found
Morris Jobke [Tue, 20 Nov 2018 08:49:57 +0000 (09:49 +0100)]
Merge pull request #12500 from nextcloud/swift-object-not-found

forward object not found error in swift as dav 404

6 years agoHandle permission in update of share better 12544/head
Roeland Jago Douma [Tue, 20 Nov 2018 08:42:01 +0000 (09:42 +0100)]
Handle permission in update of share better

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #12539 from nextcloud/fix-redirect-design
Morris Jobke [Tue, 20 Nov 2018 08:34:15 +0000 (09:34 +0100)]
Merge pull request #12539 from nextcloud/fix-redirect-design

Fix redirect page design details

6 years agoBearer tokens are app token 12543/head
Roeland Jago Douma [Tue, 20 Nov 2018 08:23:57 +0000 (09:23 +0100)]
Bearer tokens are app token

Fixes #12498

This means that we set that it is a proper app token once it is
validated. This will allow the 2FA middleware to just run the same
check.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 20 Nov 2018 01:12:39 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoFix CSS specificity preventing buttons displayed in pill style 12539/head
Jan-Christoph Borchardt [Mon, 19 Nov 2018 20:56:38 +0000 (21:56 +0100)]
Fix CSS specificity preventing buttons displayed in pill style

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agoFix header text color on redirect page
Jan-Christoph Borchardt [Mon, 19 Nov 2018 20:54:37 +0000 (21:54 +0100)]
Fix header text color on redirect page

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
6 years agoadd test for non existing file by id 12494/head
Robin Appelman [Mon, 19 Nov 2018 16:37:59 +0000 (17:37 +0100)]
add test for non existing file by id

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #12525 from nextcloud/contrast-fix-updatenotifications
Morris Jobke [Mon, 19 Nov 2018 15:05:50 +0000 (16:05 +0100)]
Merge pull request #12525 from nextcloud/contrast-fix-updatenotifications

Fix updatenotifications display, dependencies and csp

6 years agoAdd PHPDoc for thrown exception 12500/head
Morris Jobke [Mon, 19 Nov 2018 14:34:07 +0000 (15:34 +0100)]
Add PHPDoc for thrown exception

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12495 from nextcloud/login-theming-primary-fix
Morris Jobke [Mon, 19 Nov 2018 14:26:40 +0000 (15:26 +0100)]
Merge pull request #12495 from nextcloud/login-theming-primary-fix

Fix login primary colour and feedback

6 years agoMerge pull request #12401 from pachulo/fix/11107/fix-php-mail-warning
Morris Jobke [Mon, 19 Nov 2018 14:23:45 +0000 (15:23 +0100)]
Merge pull request #12401 from pachulo/fix/11107/fix-php-mail-warning

Fix the warning appearing in the admin section when mail_smtpmode is not configured

6 years agoFix login primary colour and feedback 12495/head
John Molakvoæ (skjnldsv) [Fri, 16 Nov 2018 17:21:58 +0000 (18:21 +0100)]
Fix login primary colour and feedback

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoforward object not found error in switch as dav 404
Robin Appelman [Fri, 16 Nov 2018 19:21:21 +0000 (20:21 +0100)]
forward object not found error in switch as dav 404

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoUse the proper default values 12401/head
Morris Jobke [Mon, 19 Nov 2018 09:57:51 +0000 (10:57 +0100)]
Use the proper default values

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12515 from nextcloud/papercut/12295/grid-view-lazy-loading
Morris Jobke [Mon, 19 Nov 2018 09:52:54 +0000 (10:52 +0100)]
Merge pull request #12515 from nextcloud/papercut/12295/grid-view-lazy-loading

Make number of file list entries depending on the width for grid view

6 years agoFix updatenotifications display, dependencies and csp 12525/head
John Molakvoæ (skjnldsv) [Mon, 19 Nov 2018 09:26:04 +0000 (10:26 +0100)]
Fix updatenotifications display, dependencies and csp

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12496 from nextcloud/revert-icon-theming-fix
Morris Jobke [Mon, 19 Nov 2018 09:19:58 +0000 (10:19 +0100)]
Merge pull request #12496 from nextcloud/revert-icon-theming-fix

Fix revert icon position on theming settings

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 19 Nov 2018 01:12:04 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #12517 from nextcloud/bugfix/noid/files-external-templates
Roeland Jago Douma [Sun, 18 Nov 2018 19:18:08 +0000 (20:18 +0100)]
Merge pull request #12517 from nextcloud/bugfix/noid/files-external-templates

Fix loading of files external templates file

6 years agoMerge pull request #12518 from nextcloud/bugfix/noid/htaccess-woff2
Roeland Jago Douma [Sun, 18 Nov 2018 13:07:22 +0000 (14:07 +0100)]
Merge pull request #12518 from nextcloud/bugfix/noid/htaccess-woff2

Fix loading of .woff2 files in .htaccess

6 years agoFix loading of files external templates file 12517/head
Julius Härtl [Sun, 18 Nov 2018 10:13:46 +0000 (11:13 +0100)]
Fix loading of files external templates file

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoFix loading of .woff2 files in .htaccess 12518/head
Julius Härtl [Sun, 18 Nov 2018 10:02:20 +0000 (11:02 +0100)]
Fix loading of .woff2 files in .htaccess

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMake number of file list entries depending on the width for grid view 12515/head
Julius Härtl [Sun, 18 Nov 2018 09:34:35 +0000 (10:34 +0100)]
Make number of file list entries depending on the width for grid view

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 18 Nov 2018 01:12:58 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 17 Nov 2018 01:12:47 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoFix revert icon position on theming settings 12496/head
John Molakvoæ (skjnldsv) [Fri, 16 Nov 2018 17:35:42 +0000 (18:35 +0100)]
Fix revert icon position on theming settings

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoreturn the correct value when trying to get a non existing item from cache by id
Robin Appelman [Fri, 16 Nov 2018 16:26:42 +0000 (17:26 +0100)]
return the correct value when trying to get a non existing item from cache by id

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #12489 from nextcloud/bugfix/11179/safari-performance
Morris Jobke [Fri, 16 Nov 2018 15:24:49 +0000 (16:24 +0100)]
Merge pull request #12489 from nextcloud/bugfix/11179/safari-performance

Only use width and opacity for transition

6 years agoMerge pull request #12487 from nextcloud/settings-svg-icons-scss-fix
John Molakvoæ [Fri, 16 Nov 2018 15:23:26 +0000 (16:23 +0100)]
Merge pull request #12487 from nextcloud/settings-svg-icons-scss-fix

Remove unused svg api route

6 years agoOnly use width and opacity for transition 12489/head
Julius Härtl [Fri, 16 Nov 2018 14:42:23 +0000 (15:42 +0100)]
Only use width and opacity for transition

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoRemove unused sg api route 12487/head
John Molakvoæ (skjnldsv) [Fri, 16 Nov 2018 14:39:46 +0000 (15:39 +0100)]
Remove unused sg api route

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12484 from nextcloud/loader-color-fixes
Morris Jobke [Fri, 16 Nov 2018 13:53:09 +0000 (14:53 +0100)]
Merge pull request #12484 from nextcloud/loader-color-fixes

Fix loader colours for better visibility

6 years agoProperly align loading indicator when switching folders 12350/head
Julius Härtl [Fri, 16 Nov 2018 13:50:40 +0000 (14:50 +0100)]
Properly align loading indicator when switching folders

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #12483 from nextcloud/fix-login-loader
Morris Jobke [Fri, 16 Nov 2018 13:24:04 +0000 (14:24 +0100)]
Merge pull request #12483 from nextcloud/fix-login-loader

Fix login loader position and theming support

6 years agoFlip sort indicators
Julius Härtl [Thu, 8 Nov 2018 12:32:10 +0000 (13:32 +0100)]
Flip sort indicators

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoAllow sorting in the file picker
Julius Härtl [Thu, 8 Nov 2018 12:30:39 +0000 (13:30 +0100)]
Allow sorting in the file picker

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #12476 from nextcloud/welcome-bot
Morris Jobke [Fri, 16 Nov 2018 12:59:21 +0000 (13:59 +0100)]
Merge pull request #12476 from nextcloud/welcome-bot

Add welcome bot

6 years agoMerge pull request #12474 from nextcloud/default-to-files-list
Morris Jobke [Fri, 16 Nov 2018 12:48:16 +0000 (13:48 +0100)]
Merge pull request #12474 from nextcloud/default-to-files-list

Rollback to default list view

6 years agoFix loader colours for better visibility 12484/head
John Molakvoæ (skjnldsv) [Fri, 16 Nov 2018 12:40:00 +0000 (13:40 +0100)]
Fix loader colours for better visibility

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12481 from nextcloud/bugfix/noid/fix-navigation-layout-of-new...
Morris Jobke [Fri, 16 Nov 2018 12:39:20 +0000 (13:39 +0100)]
Merge pull request #12481 from nextcloud/bugfix/noid/fix-navigation-layout-of-new-items

Fix navigation layout for items that are added on a re-render

6 years agoFix login loader position and theming support 12483/head
John Molakvoæ (skjnldsv) [Fri, 16 Nov 2018 11:48:11 +0000 (12:48 +0100)]
Fix login loader position and theming support

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix navigation layout for items that are added on a re-render 12481/head
Joas Schilling [Fri, 16 Nov 2018 09:53:31 +0000 (10:53 +0100)]
Fix navigation layout for items that are added on a re-render

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoUpdate .github/config.yml 12476/head
Morris Jobke [Fri, 16 Nov 2018 10:00:59 +0000 (11:00 +0100)]
Update .github/config.yml

Co-Authored-By: rullzer <rullzer@users.noreply.github.com>
6 years agoUpdate .github/config.yml
Morris Jobke [Fri, 16 Nov 2018 10:00:49 +0000 (11:00 +0100)]
Update .github/config.yml

Co-Authored-By: rullzer <rullzer@users.noreply.github.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 16 Nov 2018 01:12:14 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agoAdd welcome bot
Roeland Jago Douma [Thu, 15 Nov 2018 22:07:27 +0000 (23:07 +0100)]
Add welcome bot

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoRollback to default list view 12474/head
John Molakvoæ (skjnldsv) [Thu, 15 Nov 2018 19:29:10 +0000 (20:29 +0100)]
Rollback to default list view

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoMerge pull request #12472 from nextcloud/dav-versions-user
Robin Appelman [Thu, 15 Nov 2018 18:23:10 +0000 (19:23 +0100)]
Merge pull request #12472 from nextcloud/dav-versions-user

actually return the user when creating version dav nodes

6 years agoMerge pull request #12355 from nextcloud/version/noid/15.0.0beta2 v15.0.0beta2
Morris Jobke [Thu, 15 Nov 2018 16:21:16 +0000 (17:21 +0100)]
Merge pull request #12355 from nextcloud/version/noid/15.0.0beta2

15.0.0 Beta 2

6 years agoactually return the user when creating version dav nodes 12472/head
Robin Appelman [Thu, 15 Nov 2018 16:17:54 +0000 (17:17 +0100)]
actually return the user when creating version dav nodes

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years ago15.0.0 Beta 2 12355/head
Morris Jobke [Thu, 8 Nov 2018 13:35:46 +0000 (14:35 +0100)]
15.0.0 Beta 2

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12467 from nextcloud/bugfix/11901/show-thumbnail-on-rename
Morris Jobke [Thu, 15 Nov 2018 13:09:55 +0000 (14:09 +0100)]
Merge pull request #12467 from nextcloud/bugfix/11901/show-thumbnail-on-rename

Show thumbnail on rename

6 years agoRemove conflicting multiselect 12468/head
John Molakvoæ (skjnldsv) [Thu, 15 Nov 2018 13:08:13 +0000 (14:08 +0100)]
Remove conflicting multiselect

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoEnhance jsunit tests 12467/head
Morris Jobke [Thu, 15 Nov 2018 12:40:05 +0000 (13:40 +0100)]
Enhance jsunit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12458 from nextcloud/bugfix/dav_shares_hickup
Morris Jobke [Thu, 15 Nov 2018 12:32:54 +0000 (13:32 +0100)]
Merge pull request #12458 from nextcloud/bugfix/dav_shares_hickup

fixes dav share issue with owner

6 years agofix caldav tests 12458/head
Georg Ehrke [Thu, 15 Nov 2018 10:45:47 +0000 (11:45 +0100)]
fix caldav tests

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agoMerge pull request #12466 from nextcloud/fix/sting-doctype-casing
Morris Jobke [Thu, 15 Nov 2018 11:25:29 +0000 (12:25 +0100)]
Merge pull request #12466 from nextcloud/fix/sting-doctype-casing

Fix string doctype casing

6 years agoMerge pull request #12421 from nextcloud/bugfix/noid/icons-cacher-app-prefix
Morris Jobke [Thu, 15 Nov 2018 11:24:23 +0000 (12:24 +0100)]
Merge pull request #12421 from nextcloud/bugfix/noid/icons-cacher-app-prefix

Prefix icon variables with app name to avoid conflicts

6 years agoShow thumbnail on rename
Morris Jobke [Thu, 15 Nov 2018 11:14:15 +0000 (12:14 +0100)]
Show thumbnail on rename

* does not hide thumbnail when rename is shown
* fixes layout for grid and list view
* fixes #11901

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoFix string doc type casing 12466/head
Christoph Wurst [Thu, 15 Nov 2018 10:51:28 +0000 (11:51 +0100)]
Fix string doc type casing

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
6 years agoPrefix icon variables with app name to avoid conflicts 12421/head
Julius Härtl [Mon, 12 Nov 2018 16:32:15 +0000 (17:32 +0100)]
Prefix icon variables with app name to avoid conflicts

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #12292 from nextcloud/fix/2947/lapse-sizelimit-error
Morris Jobke [Thu, 15 Nov 2018 09:48:57 +0000 (10:48 +0100)]
Merge pull request #12292 from nextcloud/fix/2947/lapse-sizelimit-error

avoid logging of "Partial search results returned: Sizelimit exceeded…"

6 years agoMerge pull request #12447 from nextcloud/bugfix/12446/fix-oracle-install-again
Morris Jobke [Thu, 15 Nov 2018 09:47:51 +0000 (10:47 +0100)]
Merge pull request #12447 from nextcloud/bugfix/12446/fix-oracle-install-again

Shorten index name of calendar changes table

6 years agoMerge pull request #11200 from nextcloud/bugfix/2954/interaction-with-groups-containi...
Morris Jobke [Thu, 15 Nov 2018 09:30:38 +0000 (10:30 +0100)]
Merge pull request #11200 from nextcloud/bugfix/2954/interaction-with-groups-containing-a-slash

Fix interaction with groups that contain a slash

6 years agoFix interaction with groups that contain a slash 11200/head
Joas Schilling [Thu, 13 Sep 2018 08:04:45 +0000 (10:04 +0200)]
Fix interaction with groups that contain a slash

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 15 Nov 2018 01:12:14 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

6 years agofixes dav share issue with owner
Georg Ehrke [Wed, 14 Nov 2018 19:50:46 +0000 (20:50 +0100)]
fixes dav share issue with owner

Signed-off-by: Georg Ehrke <developer@georgehrke.com>
6 years agoMerge pull request #12448 from nextcloud/bugfix/noid/dav-loadapps
Morris Jobke [Wed, 14 Nov 2018 20:42:47 +0000 (21:42 +0100)]
Merge pull request #12448 from nextcloud/bugfix/noid/dav-loadapps

Load apps that have a dav type set before the dav server plugins

6 years agoMerge pull request #12457 from nextcloud/fix/noid/fix-phpdoc
Morris Jobke [Wed, 14 Nov 2018 20:37:26 +0000 (21:37 +0100)]
Merge pull request #12457 from nextcloud/fix/noid/fix-phpdoc

Update PHPDoc to fix typos

6 years agoUpdate PHPDoc to fix typos 12457/head
Morris Jobke [Wed, 14 Nov 2018 20:18:16 +0000 (21:18 +0100)]
Update PHPDoc to fix typos

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #12417 from nextcloud/bugfix/noid/app-files_external-replace-inser...
Morris Jobke [Wed, 14 Nov 2018 20:05:32 +0000 (21:05 +0100)]
Merge pull request #12417 from nextcloud/bugfix/noid/app-files_external-replace-insertIfNotExist

Fix UniqueConstraintViolationException while insert into files_external config tables

6 years agoMerge pull request #12456 from nextcloud/move_to_github_bot
Morris Jobke [Wed, 14 Nov 2018 20:04:44 +0000 (21:04 +0100)]
Merge pull request #12456 from nextcloud/move_to_github_bot

Sign-off check is now handled by a github app

6 years agoMerge pull request #12454 from nextcloud/list-shrink-fix
Morris Jobke [Wed, 14 Nov 2018 19:58:24 +0000 (20:58 +0100)]
Merge pull request #12454 from nextcloud/list-shrink-fix

Fix breakpoint and shrinking of the content + list

6 years agoSign-off check is now handled by a github app 12456/head
Roeland Jago Douma [Wed, 14 Nov 2018 18:47:06 +0000 (19:47 +0100)]
Sign-off check is now handled by a github app

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoMerge pull request #12455 from nextcloud/twofactor-backup-settings
Roeland Jago Douma [Wed, 14 Nov 2018 18:35:13 +0000 (19:35 +0100)]
Merge pull request #12455 from nextcloud/twofactor-backup-settings

Don't register twofactor_backup settings as "regular" settings

6 years agoMerge pull request #12450 from nextcloud/fix/11868/decryption_hardening
Roeland Jago Douma [Wed, 14 Nov 2018 18:34:26 +0000 (19:34 +0100)]
Merge pull request #12450 from nextcloud/fix/11868/decryption_hardening

Throw exception if decryption fails

6 years agoAllow apps to use the variables too 12454/head
John Molakvoæ (skjnldsv) [Wed, 14 Nov 2018 17:34:26 +0000 (18:34 +0100)]
Allow apps to use the variables too

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agotwofactor auth settings are not regular settings 12455/head
Robin Appelman [Wed, 14 Nov 2018 17:05:13 +0000 (18:05 +0100)]
twofactor auth settings are not regular settings

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoLog invalid settings class
Robin Appelman [Wed, 14 Nov 2018 17:04:52 +0000 (18:04 +0100)]
Log invalid settings class

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoVerify that isPhpMailerUsed uses config as expected
Kyle Fazzari [Wed, 14 Nov 2018 16:41:38 +0000 (08:41 -0800)]
Verify that isPhpMailerUsed uses config as expected

Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>