]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoMerge pull request #6509 from nextcloud/backport-5689
Roeland Jago Douma [Wed, 20 Sep 2017 18:11:30 +0000 (20:11 +0200)]
Merge pull request #6509 from nextcloud/backport-5689

[stable12] LDAP: simplify returning the homePath and fixing #4117

7 years agoMerge pull request #6502 from nextcloud/backport-6453-stable12
Morris Jobke [Wed, 20 Sep 2017 14:07:28 +0000 (16:07 +0200)]
Merge pull request #6502 from nextcloud/backport-6453-stable12

[stable12] Fix initializing paged search under some circumstances

7 years agoMerge pull request #6524 from nextcloud/12-6506
Morris Jobke [Wed, 20 Sep 2017 14:06:09 +0000 (16:06 +0200)]
Merge pull request #6524 from nextcloud/12-6506

[stable12] Fix sharer name overlap with filename

7 years agoMerge pull request #6525 from nextcloud/12-6499
Morris Jobke [Wed, 20 Sep 2017 14:05:59 +0000 (16:05 +0200)]
Merge pull request #6525 from nextcloud/12-6499

[stable12] Allow to close sidebar for text files

7 years agoMerge pull request #6528 from nextcloud/fix_4654_3375-12
Morris Jobke [Wed, 20 Sep 2017 14:05:49 +0000 (16:05 +0200)]
Merge pull request #6528 from nextcloud/fix_4654_3375-12

[stable12] Pass new value to triggerChange

7 years agoMerge pull request #6547 from nextcloud/backport-6545-stable12
Morris Jobke [Wed, 20 Sep 2017 14:05:41 +0000 (16:05 +0200)]
Merge pull request #6547 from nextcloud/backport-6545-stable12

[stable12] throw 101 when an empty group string is provided

7 years agoMerge pull request #6527 from nextcloud/fix_quota_new_endpoint_12
Joas Schilling [Wed, 20 Sep 2017 07:19:06 +0000 (09:19 +0200)]
Merge pull request #6527 from nextcloud/fix_quota_new_endpoint_12

[stable12] Fix quota new endpoint 12

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 20 Sep 2017 00:08:36 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #6572 from nextcloud/bump-version-another-time v12.0.3
Roeland Jago Douma [Tue, 19 Sep 2017 18:18:36 +0000 (20:18 +0200)]
Merge pull request #6572 from nextcloud/bump-version-another-time

[stable12] Bump version to 12.0.3.3

7 years agoBump version to 12.0.3.3 6572/head
Lukas Reschke [Tue, 19 Sep 2017 14:48:11 +0000 (16:48 +0200)]
Bump version to 12.0.3.3

For a build with https://github.com/nextcloud/server/pull/6570

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #6570 from nextcloud/fix-comments-activity-error-12
Lukas Reschke [Tue, 19 Sep 2017 14:07:44 +0000 (16:07 +0200)]
Merge pull request #6570 from nextcloud/fix-comments-activity-error-12

[stable12] Use the wrapper to get the parameters which was added in #6369

7 years agoUse the wrapper to get the parameters which was added in #6369 6570/head
Joas Schilling [Tue, 19 Sep 2017 13:01:43 +0000 (15:01 +0200)]
Use the wrapper to get the parameters which was added in #6369

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 19 Sep 2017 00:08:39 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #6556 from nextcloud/stable12-bump-version-to-final
Roeland Jago Douma [Mon, 18 Sep 2017 18:01:51 +0000 (20:01 +0200)]
Merge pull request #6556 from nextcloud/stable12-bump-version-to-final

[stable12] Bump version to 12.0.3

7 years agoBump version to 12.0.3 6556/head
Lukas Reschke [Mon, 18 Sep 2017 16:22:09 +0000 (18:22 +0200)]
Bump version to 12.0.3

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agothrow 101 when an empty group string is provided 6547/head
Arthur Schiwon [Mon, 18 Sep 2017 08:56:13 +0000 (10:56 +0200)]
throw 101 when an empty group string is provided

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 18 Sep 2017 00:08:41 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 17 Sep 2017 00:08:34 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 16 Sep 2017 00:08:34 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoPass new value to triggerChange 6528/head
Roeland Jago Douma [Thu, 31 Aug 2017 19:59:27 +0000 (21:59 +0200)]
Pass new value to triggerChange

it is not used. but pass in the empty string (on delete) and the new
file (on create)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix quota calculation on new dav upload endpoint 6527/head
Roeland Jago Douma [Wed, 13 Sep 2017 11:12:16 +0000 (13:12 +0200)]
Fix quota calculation on new dav upload endpoint

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAllow to close sidebar for text files 6525/head
Morris Jobke [Thu, 14 Sep 2017 09:30:54 +0000 (11:30 +0200)]
Allow to close sidebar for text files

* the close button was overlapped by the text preview and you could not close the sidebar then

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoCorrectly ellipsize file names, fix #6498 6524/head
Jan-Christoph Borchardt [Thu, 14 Sep 2017 14:40:24 +0000 (16:40 +0200)]
Correctly ellipsize file names, fix #6498

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoEllipsize sharer name, ref #6498
Jan-Christoph Borchardt [Thu, 14 Sep 2017 14:38:31 +0000 (16:38 +0200)]
Ellipsize sharer name, ref #6498

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 15 Sep 2017 00:08:17 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agolisten to deletion hooks for proper handling, adjust and add tests 6509/head
Arthur Schiwon [Thu, 13 Jul 2017 12:32:52 +0000 (14:32 +0200)]
listen to deletion hooks for proper handling, adjust and add tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agosimplify returning the homePath and fixing #4117
Arthur Schiwon [Tue, 11 Jul 2017 20:43:47 +0000 (22:43 +0200)]
simplify returning the homePath and fixing #4117

homesToKill was not set in runtime since some changes some place else. It
required deleteUser() to be called first. The method acts independent of it
now.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoadapted integration tests 6502/head
Arthur Schiwon [Mon, 11 Sep 2017 13:36:44 +0000 (15:36 +0200)]
adapted integration tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agofix counting found results in search op
Arthur Schiwon [Mon, 11 Sep 2017 13:30:44 +0000 (15:30 +0200)]
fix counting found results  in search op

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoimprove and extend paging integration test
Arthur Schiwon [Mon, 11 Sep 2017 11:31:50 +0000 (13:31 +0200)]
improve and extend paging integration test

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoreplace hard-coded attribute with the corresponding settings option
Arthur Schiwon [Mon, 11 Sep 2017 10:11:25 +0000 (12:11 +0200)]
replace hard-coded attribute with the corresponding settings option

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agofix limit-flaw in search on paged results
Arthur Schiwon [Mon, 11 Sep 2017 10:10:32 +0000 (12:10 +0200)]
fix limit-flaw in search on paged results

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 14 Sep 2017 00:08:21 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex v12.0.3RC2
Nextcloud bot [Wed, 13 Sep 2017 00:08:21 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #6472 from nextcloud/rc2
Roeland Jago Douma [Tue, 12 Sep 2017 21:24:47 +0000 (23:24 +0200)]
Merge pull request #6472 from nextcloud/rc2

v12.0.3RC2

7 years agoMerge pull request #6474 from nextcloud/2fa_apppasword_auth_12
Roeland Jago Douma [Tue, 12 Sep 2017 21:23:46 +0000 (23:23 +0200)]
Merge pull request #6474 from nextcloud/2fa_apppasword_auth_12

[stable12] Fix AppPassword 2FA auth

7 years agoFix AppPassword 2FA auth 6474/head
Roeland Jago Douma [Tue, 12 Sep 2017 20:28:43 +0000 (22:28 +0200)]
Fix AppPassword 2FA auth

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agov12.0.3RC2 6472/head
Lukas Reschke [Tue, 12 Sep 2017 20:11:17 +0000 (22:11 +0200)]
v12.0.3RC2

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #6466 from nextcloud/12-0-3-rc1 v12.0.3RC1
Morris Jobke [Tue, 12 Sep 2017 14:12:06 +0000 (16:12 +0200)]
Merge pull request #6466 from nextcloud/12-0-3-rc1

12.0.3 RC1

7 years ago12.0.3 RC1 6466/head
Lukas Reschke [Tue, 12 Sep 2017 12:46:18 +0000 (14:46 +0200)]
12.0.3 RC1

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #6443 from nextcloud/backport-6064-absolute-path-must-be-relative...
Morris Jobke [Tue, 12 Sep 2017 08:03:29 +0000 (10:03 +0200)]
Merge pull request #6443 from nextcloud/backport-6064-absolute-path-must-be-relative-to-files-on-theming-update

[stable12] Still throw a locked exception when the path is not relative to $user/files/

7 years agoMerge pull request #6444 from nextcloud/backport-6351-sql-syntax-on-caldav
Morris Jobke [Tue, 12 Sep 2017 07:43:24 +0000 (09:43 +0200)]
Merge pull request #6444 from nextcloud/backport-6351-sql-syntax-on-caldav

[stable12] not to backquote LIMIT on CalDavBackend.php

7 years agoMerge pull request #6359 from nextcloud/12-6082
Morris Jobke [Tue, 12 Sep 2017 07:41:10 +0000 (09:41 +0200)]
Merge pull request #6359 from nextcloud/12-6082

[stable12] Use separate element color in theming

7 years agoMerge pull request #6446 from nextcloud/backport-6414-share-notification-wrong-language
Morris Jobke [Tue, 12 Sep 2017 07:40:19 +0000 (09:40 +0200)]
Merge pull request #6446 from nextcloud/backport-6414-share-notification-wrong-language

[stable12] Use the language of the recipient for the share notification

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 12 Sep 2017 00:08:34 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #6442 from nextcloud/backport-6416-make-sure-sqlite-works-without...
Morris Jobke [Mon, 11 Sep 2017 21:20:58 +0000 (23:20 +0200)]
Merge pull request #6442 from nextcloud/backport-6416-make-sure-sqlite-works-without-content

[stable12] Ask the schema whether the table and column exist

7 years agoMerge pull request #6427 from nextcloud/backport-to-fix-popover-hovering
Morris Jobke [Mon, 11 Sep 2017 21:11:40 +0000 (23:11 +0200)]
Merge pull request #6427 from nextcloud/backport-to-fix-popover-hovering

[stable12] Fix hovering on all popover types

7 years agoMerge pull request #6441 from nextcloud/backport-6369-missing-translations-of-comment...
Morris Jobke [Mon, 11 Sep 2017 21:09:56 +0000 (23:09 +0200)]
Merge pull request #6441 from nextcloud/backport-6369-missing-translations-of-comment-activity-in-email

[stable12] Allow translations of the comments activity in the emails too

7 years agoMerge pull request #6440 from nextcloud/stable12-session-timeout-refresh-csrf-token
Morris Jobke [Mon, 11 Sep 2017 20:34:37 +0000 (22:34 +0200)]
Merge pull request #6440 from nextcloud/stable12-session-timeout-refresh-csrf-token

[stable12] Fix failing csp/nonce check due to timed out session

7 years agoUse the language of the recipient for the share notification 6446/head
Joas Schilling [Fri, 8 Sep 2017 08:34:19 +0000 (10:34 +0200)]
Use the language of the recipient for the share notification

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agonot to backquote LIMIT on CalDavBackend.php 6444/head
nhirokinet [Sun, 3 Sep 2017 14:51:49 +0000 (23:51 +0900)]
not to backquote LIMIT on CalDavBackend.php

7 years agoDon't lock in the appdata_ directory 6443/head
Joas Schilling [Thu, 10 Aug 2017 10:35:33 +0000 (12:35 +0200)]
Don't lock in the appdata_ directory

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoStill throw a locked exception when the path is not relative to $user/files/
Joas Schilling [Thu, 10 Aug 2017 09:58:01 +0000 (11:58 +0200)]
Still throw a locked exception when the path is not relative to $user/files/

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix Nextcloud 12 compatibility 6442/head
Joas Schilling [Mon, 11 Sep 2017 09:14:33 +0000 (11:14 +0200)]
Fix Nextcloud 12 compatibility

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAsk the schema whether the table and column exist
Joas Schilling [Fri, 8 Sep 2017 09:37:22 +0000 (11:37 +0200)]
Ask the schema whether the table and column exist

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAllow translations of the comments activity in the emails too 6441/head
Joas Schilling [Tue, 5 Sep 2017 16:10:32 +0000 (18:10 +0200)]
Allow translations of the comments activity in the emails too

Message and object data is not available on emails atm,
so we can not use them either...

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix failing csp/nonce check due to timed out session 6440/head
Christoph Wurst [Mon, 4 Sep 2017 15:29:26 +0000 (17:29 +0200)]
Fix failing csp/nonce check due to timed out session

The CSP nonce is based on the CSRF token. This token does not change,
unless you log in (or out). In case of the session data being lost,
e.g. because php gets rid of old sessions, a new CSRF token is gen-
erated. While this is fine in theory, it actually caused some annoying
problems where the browser restored a tab and Nextcloud js was blocked
due to an outdated nonce.
The main problem here is that, while processing the request, we write
out security headers relatively early. At that point the CSRF token
is known/generated and transformed into a CSP nonce. During this request,
however, we also log the user in because the session information was
lost. At that point we also refresh the CSRF token, which eventually
causes the browser to block any scripts as the nonce in the header
does not match the one which is used to include scripts.
This patch adds a flag to indicate whether the CSRF token should be
refreshed or not. It is assumed that refreshing is only necessary
if we want to re-generate the session id too. To my knowledge, this
case only happens on fresh logins, not when we recover from a deleted
session file.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 11 Sep 2017 00:08:28 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 10 Sep 2017 00:08:33 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoFix hovering on all popover types 6427/head
John Molakvoæ (skjnldsv) [Thu, 7 Sep 2017 16:43:31 +0000 (18:43 +0200)]
Fix hovering on all popover types

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 9 Sep 2017 00:08:30 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #6421 from nextcloud/12-6419
Morris Jobke [Fri, 8 Sep 2017 14:58:49 +0000 (16:58 +0200)]
Merge pull request #6421 from nextcloud/12-6419

[stable12] Use tmpfs for mysql CI containers

7 years agoUse tmpfs for mysql CI containers 6421/head
Morris Jobke [Fri, 8 Sep 2017 12:54:58 +0000 (14:54 +0200)]
Use tmpfs for mysql CI containers

Should improve performance

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 8 Sep 2017 00:08:25 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #6396 from nextcloud/12-6329
Joas Schilling [Thu, 7 Sep 2017 10:48:13 +0000 (12:48 +0200)]
Merge pull request #6396 from nextcloud/12-6329

[stable12] Don't log LDAP password when server is not available

7 years agoMerge pull request #6386 from nextcloud/12-6247
Morris Jobke [Thu, 7 Sep 2017 07:32:45 +0000 (09:32 +0200)]
Merge pull request #6386 from nextcloud/12-6247

[stable12] Fix undefined index oauthState

7 years agoDon't log LDAP password when server is not available 6396/head
Joas Schilling [Fri, 1 Sep 2017 08:31:11 +0000 (10:31 +0200)]
Don't log LDAP password when server is not available

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 7 Sep 2017 00:08:32 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #6319 from nextcloud/improve_2fa-12
Roeland Jago Douma [Wed, 6 Sep 2017 18:07:46 +0000 (20:07 +0200)]
Merge pull request #6319 from nextcloud/improve_2fa-12

[stable12] Improve 2FA

7 years agoFix tests 6386/head
Morris Jobke [Wed, 6 Sep 2017 09:25:19 +0000 (11:25 +0200)]
Fix tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix undefined index oauthState
Morris Jobke [Thu, 24 Aug 2017 10:15:26 +0000 (12:15 +0200)]
Fix undefined index oauthState

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #6368 from nextcloud/backport-5436-fix-group-check
Lukas Reschke [Wed, 6 Sep 2017 15:19:15 +0000 (17:19 +0200)]
Merge pull request #6368 from nextcloud/backport-5436-fix-group-check

[stable12] Fix group check on share provider

7 years agoMerge pull request #6357 from nextcloud/swift-tmpfiles-12
Lukas Reschke [Wed, 6 Sep 2017 15:17:36 +0000 (17:17 +0200)]
Merge pull request #6357 from nextcloud/swift-tmpfiles-12

[12] Remove tmpFiles Array in Swift.php

7 years agoFix login with basic auth 6319/head
Roeland Jago Douma [Tue, 5 Sep 2017 10:14:28 +0000 (12:14 +0200)]
Fix login with basic auth

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 6 Sep 2017 00:08:30 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #6366 from nextcloud/backport-6358-email-update
Morris Jobke [Tue, 5 Sep 2017 18:57:06 +0000 (20:57 +0200)]
Merge pull request #6366 from nextcloud/backport-6358-email-update

Backport email update

7 years agoFix 500 Internal Server Error on writing 6368/head
Jan-Philipp Litza [Fri, 16 Jun 2017 09:38:22 +0000 (11:38 +0200)]
Fix 500 Internal Server Error on writing

In some not yet completely determined configurations, the following error could occur while writing a file:

Error: Call to a member function getUsers() on null
    /var/www/nextcloud/lib/private/Share20/Manager.php - line 1277: OC\Share20\DefaultShareProvider->getAccessList(Array, true)
    /var/www/nextcloud/lib/private/Share20/ShareHelper.php - line 51: OC\Share20\Manager->getAccessList(Object(OC\Files\Node\Folder), true, true)
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 616: OC\Share20\ShareHelper->getPathsForAccessList(Object(OC\Files\Node\File))
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 196: OCA\Activity\FilesHooks->getUserPathsFromPath('/path/to/file', 'user')
    /var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 157: OCA\Activity\FilesHooks->addNotificationsForFileAction('/path/to/file', 'file_changed', 'changed_self', 'changed_by')
    /var/www/nextcloud/apps/activity/lib/FilesHooksStatic.php - line 55: OCA\Activity\FilesHooks->fileUpdate('/path/to/file')
    /var/www/nextcloud/lib/private/legacy/hook.php - line 106: OCA\Activity\FilesHooksStatic fileUpdate(Array)
    /var/www/nextcloud/lib/private/Files/View.php - line 1245: OC_Hook emit('OC_Filesystem', 'post_update', Array)
    /var/www/nextcloud/lib/private/Files/View.php - line 1173: OC\Files\View->runHooks(Array, '/path/to/file', true)
    /var/www/nextcloud/lib/private/Files/View.php - line 679: OC\Files\View->basicOperation('file_put_conten...', '/path/to/file', Array, '<?xml version="...')
    /var/www/nextcloud/lib/private/Files/Node/File.php - line 64: OC\Files\View->file_put_contents('/path/to/file', '<?xml version="...')
    [...]

Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de>
7 years agoFix tests 6366/head
Morris Jobke [Tue, 5 Sep 2017 11:55:36 +0000 (13:55 +0200)]
Fix tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix unit tests
Joas Schilling [Mon, 4 Sep 2017 15:01:31 +0000 (17:01 +0200)]
Fix unit tests

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge setMetaData into constructor
Joas Schilling [Mon, 4 Sep 2017 13:07:19 +0000 (15:07 +0200)]
Merge setMetaData into constructor

This ensures that the meta data is set in the beginning

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoSet the meta data before everything
Joas Schilling [Mon, 4 Sep 2017 12:46:05 +0000 (14:46 +0200)]
Set the meta data before everything

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix naming of user id in email meta data
Joas Schilling [Fri, 1 Sep 2017 13:04:17 +0000 (15:04 +0200)]
Fix naming of user id in email meta data

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoImplement metadata for email templates of remaining emails
Morris Jobke [Wed, 30 Aug 2017 20:56:14 +0000 (22:56 +0200)]
Implement metadata for email templates of remaining emails

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 5 Sep 2017 00:08:33 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoCleanup theming styles to fit the new login page 6359/head
Julius Härtl [Fri, 1 Sep 2017 21:27:34 +0000 (23:27 +0200)]
Cleanup theming styles to fit the new login page

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoFix tests for primary element color
Julius Härtl [Fri, 1 Sep 2017 21:06:44 +0000 (23:06 +0200)]
Fix tests for primary element color

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoUse separate element color in theming
Julius Härtl [Fri, 11 Aug 2017 13:11:47 +0000 (15:11 +0200)]
Use separate element color in theming

This way we can use a grey color when the primary color is to bright

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agoRemove tmpFiles Array in Swift.php 6357/head
Christopher Bartz [Mon, 14 Aug 2017 13:03:30 +0000 (15:03 +0200)]
Remove tmpFiles Array in Swift.php

tmpFiles Array is unnecessary and there has been
a reference without an assignment which lead to a bug making swift external
storage unuseable.

7 years agoMerge pull request #6355 from nextcloud/6221-12
blizzz [Mon, 4 Sep 2017 10:52:44 +0000 (12:52 +0200)]
Merge pull request #6355 from nextcloud/6221-12

[stable12] Correctly format OCS response with favorites

7 years agoMerge pull request #6333 from nextcloud/new-dav-event-stable12
Morris Jobke [Mon, 4 Sep 2017 09:57:22 +0000 (11:57 +0200)]
Merge pull request #6333 from nextcloud/new-dav-event-stable12

[stable12] add a new dav event to allow apps to register their own sabredav plugins

7 years agoCorrectly format OCS response with favorites 6355/head
Roeland Jago Douma [Tue, 22 Aug 2017 16:46:47 +0000 (18:46 +0200)]
Correctly format OCS response with favorites

The helper funtion did not handle the response correctly and basically
only returned the last share with tags.

This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 3 Sep 2017 00:08:24 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 2 Sep 2017 00:08:39 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoalso allow to register additional plugins if the old endpoint is used 6333/head
Bjoern Schiessle [Wed, 30 Aug 2017 10:32:52 +0000 (12:32 +0200)]
also allow to register additional plugins if the old endpoint is used

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoadd a new dav event to allow apps to register their own sabredav plugins
Bjoern Schiessle [Wed, 30 Aug 2017 10:15:01 +0000 (12:15 +0200)]
add a new dav event to allow apps to register their own sabredav plugins

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 1 Sep 2017 00:08:36 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoImprove 2FA
Roeland Jago Douma [Thu, 10 Aug 2017 10:46:33 +0000 (12:46 +0200)]
Improve 2FA

* Store the auth state in the session so we don't have to query it every
time.
* Added some tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 31 Aug 2017 00:08:40 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #6285 from nextcloud/generate-system-wide-key-pair-12
Morris Jobke [Wed, 30 Aug 2017 19:31:31 +0000 (21:31 +0200)]
Merge pull request #6285 from nextcloud/generate-system-wide-key-pair-12

Generate system wide key pair

7 years agoMerge pull request #5841 from nextcloud/bugfix-stable12/2855/dont_send_invitations_fo...
Morris Jobke [Wed, 30 Aug 2017 19:01:32 +0000 (21:01 +0200)]
Merge pull request #5841 from nextcloud/bugfix-stable12/2855/dont_send_invitations_for_past_events

[stable12] dont send invitations for past events