]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoRevert "cache the storage info for 5 min" 3515/head
Morris Jobke [Thu, 16 Feb 2017 17:58:45 +0000 (11:58 -0600)]
Revert "cache the storage info for 5 min"

7 years agoMerge pull request #3439 from nextcloud/oc-26963
Lukas Reschke [Thu, 16 Feb 2017 15:34:18 +0000 (16:34 +0100)]
Merge pull request #3439 from nextcloud/oc-26963

Make sure invalid images don't flood the log file

7 years agoMerge pull request #3507 from nextcloud/if-backend-implements-get-display-name-dont...
Lukas Reschke [Thu, 16 Feb 2017 13:20:06 +0000 (14:20 +0100)]
Merge pull request #3507 from nextcloud/if-backend-implements-get-display-name-dont-force-one

Don't force displayname if backend already provides one

7 years agoDon't force displayname if backend already provides one 3507/head
Lukas Reschke [Thu, 16 Feb 2017 12:23:04 +0000 (13:23 +0100)]
Don't force displayname if backend already provides one

`\OC_User::loginWithApache` is used in combination with backend mechanisms like our SSO / SAML integration. Those can optionally already provide a displayname using other means. For example by mapping SAML attributes.

The current approach makes it however impossible for backends using `\OCP\Authentication\IApacheBackend` to set a displayname on their own. Because the display name will simply be overwritten with the loginname.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #2287 from nextcloud/registrationEmail
John Molakvoæ [Thu, 16 Feb 2017 06:16:45 +0000 (07:16 +0100)]
Merge pull request #2287 from nextcloud/registrationEmail

Send password/activation link to new user

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 16 Feb 2017 01:07:44 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoadd unit tests 2287/head
Morris Jobke [Thu, 16 Feb 2017 00:07:21 +0000 (18:07 -0600)]
add unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd l10n
Roeland Jago Douma [Wed, 15 Feb 2017 19:30:55 +0000 (20:30 +0100)]
Add l10n

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix setup issue and refine error messages
Morris Jobke [Wed, 15 Feb 2017 18:17:55 +0000 (12:17 -0600)]
Fix setup issue and refine error messages

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agouse random password if "password link" is enabled
tobiasKaminsky [Thu, 24 Nov 2016 18:30:36 +0000 (19:30 +0100)]
use random password if "password link" is enabled

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoempty password only allowed if password link is sent
tobiasKaminsky [Wed, 23 Nov 2016 20:44:38 +0000 (21:44 +0100)]
empty password only allowed if password link is sent

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoadd setting for "send password link"
tobiasKaminsky [Wed, 23 Nov 2016 20:30:15 +0000 (21:30 +0100)]
add setting for "send password link"

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agosend email to new user with password forgotten link to create own password
tobiasKaminsky [Wed, 23 Nov 2016 18:50:58 +0000 (19:50 +0100)]
send email to new user with password forgotten link to create own password

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #2606 from temparus/master
blizzz [Wed, 15 Feb 2017 20:47:47 +0000 (21:47 +0100)]
Merge pull request #2606 from temparus/master

Add preLoginValidation hook

7 years agoMerge pull request #3495 from nextcloud/dav-protected
Roeland Jago Douma [Wed, 15 Feb 2017 19:49:06 +0000 (20:49 +0100)]
Merge pull request #3495 from nextcloud/dav-protected

Make it easier to subclass DAV storage

7 years agoMerge pull request #3449 from nextcloud/notify-subfolder-self-test
Roeland Jago Douma [Wed, 15 Feb 2017 19:33:05 +0000 (20:33 +0100)]
Merge pull request #3449 from nextcloud/notify-subfolder-self-test

Make the notify self test for subfolders more reliable

7 years agoMerge pull request #3447 from nextcloud/getmetadata-permissions-mask
Roeland Jago Douma [Wed, 15 Feb 2017 19:22:08 +0000 (20:22 +0100)]
Merge pull request #3447 from nextcloud/getmetadata-permissions-mask

also apply permissions mask in getMetaData

7 years agoMerge pull request #3262 from nextcloud/jail-scanner-storage-id
Roeland Jago Douma [Wed, 15 Feb 2017 19:21:03 +0000 (20:21 +0100)]
Merge pull request #3262 from nextcloud/jail-scanner-storage-id

Make sure we use the correct storage id and parent id when scanning a jailed storage

7 years agoMerge pull request #2704 from nextcloud/2fa-fix-backup-codes-print
Roeland Jago Douma [Wed, 15 Feb 2017 19:18:48 +0000 (20:18 +0100)]
Merge pull request #2704 from nextcloud/2fa-fix-backup-codes-print

print the backup codes tab and not the current one

7 years agoMerge pull request #3421 from espro/freeipa-uuid-fix
Morris Jobke [Wed, 15 Feb 2017 14:07:58 +0000 (08:07 -0600)]
Merge pull request #3421 from espro/freeipa-uuid-fix

Update uuidAttributes list to include FreeIPA's ipauniqueid

7 years agoMake it easier to subclass DAV storage 3495/head
Robin Appelman [Wed, 15 Feb 2017 13:00:00 +0000 (14:00 +0100)]
Make it easier to subclass DAV storage

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3485 from nextcloud/Popovermenu-files-css-fix
blizzz [Wed, 15 Feb 2017 11:33:08 +0000 (12:33 +0100)]
Merge pull request #3485 from nextcloud/Popovermenu-files-css-fix

Popovermenu files css fix

7 years agoMerge pull request #3473 from nextcloud/fix-addressbook-deletion
blizzz [Wed, 15 Feb 2017 10:34:03 +0000 (11:34 +0100)]
Merge pull request #3473 from nextcloud/fix-addressbook-deletion

Address book data lost when any user receiving a share is deleted

7 years agoMerge pull request #3487 from nextcloud/fix-files-header-name
blizzz [Wed, 15 Feb 2017 10:30:30 +0000 (11:30 +0100)]
Merge pull request #3487 from nextcloud/fix-files-header-name

Fix app name of files app

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 15 Feb 2017 01:07:29 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3480 from nextcloud/screensharing-icon
Morris Jobke [Tue, 14 Feb 2017 23:45:11 +0000 (17:45 -0600)]
Merge pull request #3480 from nextcloud/screensharing-icon

add screensharing icon

7 years agoMerge pull request #3477 from nextcloud/fix-cloud-id-manager-injection
Morris Jobke [Tue, 14 Feb 2017 23:42:53 +0000 (17:42 -0600)]
Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injection

Fix DI of the cloud id manager into apps

7 years agoFix app name of files app 3487/head
Morris Jobke [Tue, 14 Feb 2017 23:13:09 +0000 (17:13 -0600)]
Fix app name of files app

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoCss fix 3485/head
John Molakvoæ (skjnldsv) [Tue, 14 Feb 2017 23:05:48 +0000 (00:05 +0100)]
Css fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoadd screensharing icon 3480/head
Jan-Christoph Borchardt [Tue, 14 Feb 2017 19:58:49 +0000 (20:58 +0100)]
add screensharing icon

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoMerge pull request #3341 from nextcloud/transparent-white-checkbox
Jan-Christoph Borchardt [Tue, 14 Feb 2017 18:32:39 +0000 (19:32 +0100)]
Merge pull request #3341 from nextcloud/transparent-white-checkbox

Transparent white checkbox

7 years agothis is public 3473/head
John Molakvoæ (skjnldsv) [Tue, 14 Feb 2017 15:56:56 +0000 (16:56 +0100)]
this is public

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoMerge pull request #3472 from nextcloud/enable-avatars-always
Morris Jobke [Tue, 14 Feb 2017 15:22:02 +0000 (09:22 -0600)]
Merge pull request #3472 from nextcloud/enable-avatars-always

Always enable avatars

7 years agoMerge pull request #3465 from nextcloud/storage-log-locks
Lukas Reschke [Tue, 14 Feb 2017 14:08:21 +0000 (15:08 +0100)]
Merge pull request #3465 from nextcloud/storage-log-locks

Add option to enable locking debug logging

7 years agoFix DI of the cloud id manager into apps 3477/head
Joas Schilling [Tue, 14 Feb 2017 11:47:46 +0000 (12:47 +0100)]
Fix DI of the cloud id manager into apps

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoTest fix
John Molakvoæ (skjnldsv) [Tue, 14 Feb 2017 09:47:07 +0000 (10:47 +0100)]
Test fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agotests
John Molakvoæ (skjnldsv) [Tue, 14 Feb 2017 08:33:04 +0000 (09:33 +0100)]
tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agogetUsersOwnAddressBooks
John Molakvoæ (skjnldsv) [Tue, 14 Feb 2017 08:21:33 +0000 (09:21 +0100)]
getUsersOwnAddressBooks

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 14 Feb 2017 01:07:20 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3444 from nextcloud/recognize-bat-and-cmd
Morris Jobke [Tue, 14 Feb 2017 00:09:12 +0000 (18:09 -0600)]
Merge pull request #3444 from nextcloud/recognize-bat-and-cmd

Recognize .bat and .cmd files

7 years agoAdd missing PHPDoc and properly throw exception 3465/head
Morris Jobke [Tue, 14 Feb 2017 00:03:35 +0000 (18:03 -0600)]
Add missing PHPDoc and properly throw exception

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAlways enable avatars 3472/head
Morris Jobke [Mon, 13 Feb 2017 23:49:05 +0000 (17:49 -0600)]
Always enable avatars

* we introduced this setting in the begining because our
  avatar support caused some performance issues, but we
  fixed them and should only provide one way how Nextcloud
  looks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3324 from nextcloud/fix-2431
Lukas Reschke [Mon, 13 Feb 2017 22:21:08 +0000 (23:21 +0100)]
Merge pull request #3324 from nextcloud/fix-2431

LDAP's checkPassword should only catch when a user was not found, fixes #2431

7 years agoMerge pull request #3448 from kuimovvg/master
Lukas Reschke [Mon, 13 Feb 2017 22:00:44 +0000 (23:00 +0100)]
Merge pull request #3448 from kuimovvg/master

bug when connect to yandex webdav server

7 years agoAdd storage to log item as well
Lukas Reschke [Mon, 13 Feb 2017 21:49:44 +0000 (22:49 +0100)]
Add storage to log item as well

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoAdd comment about log.condition
Morris Jobke [Mon, 13 Feb 2017 21:32:57 +0000 (15:32 -0600)]
Add comment about log.condition

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdd option to enable locking debug logging
Robin Appelman [Mon, 13 Feb 2017 14:03:46 +0000 (15:03 +0100)]
Add option to enable locking debug logging

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 13 Feb 2017 01:07:10 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 12 Feb 2017 01:07:26 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 11 Feb 2017 01:07:23 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3417 from nextcloud/push-notification
Morris Jobke [Fri, 10 Feb 2017 22:00:47 +0000 (16:00 -0600)]
Merge pull request #3417 from nextcloud/push-notification

Push notification

7 years agoalso apply permissions mask in getMetaData 3447/head
Robin Appelman [Fri, 10 Feb 2017 14:29:48 +0000 (15:29 +0100)]
also apply permissions mask in getMetaData

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3430 from nextcloud/fix-ios-client-detection
Morris Jobke [Fri, 10 Feb 2017 20:24:45 +0000 (14:24 -0600)]
Merge pull request #3430 from nextcloud/fix-ios-client-detection

Fix detection of the new iOS app

7 years agoMerge pull request #3443 from nextcloud/add-integration-tests-for-dav
blizzz [Fri, 10 Feb 2017 18:00:17 +0000 (19:00 +0100)]
Merge pull request #3443 from nextcloud/add-integration-tests-for-dav

Add integration tests for legacy DAV endpoints

7 years agofix self test for non leading slash 3449/head
Robin Appelman [Fri, 10 Feb 2017 17:04:59 +0000 (18:04 +0100)]
fix self test for non leading slash

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMake the notify self test for subfolders more reliable
Robin Appelman [Fri, 10 Feb 2017 16:38:29 +0000 (17:38 +0100)]
Make the notify self test for subfolders more reliable

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agobug when connect to yandex webdav server 3448/head
vkuimov [Fri, 10 Feb 2017 16:31:49 +0000 (16:31 +0000)]
bug when connect to yandex webdav server

server think that request like
<?xml version="1.0" encoding="UTF-8"?>
<d:propfind xmlns:d="DAV:">
<d:prop/>
</d:propfind>

is 400: Bad Request

7 years agoCheck if color exists in palette before using it 3439/head
Victor Dubiniuk [Tue, 31 Jan 2017 20:13:40 +0000 (23:13 +0300)]
Check if color exists in palette before using it

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUpdate uuidAttributes list to include FreeIPA's ipauniqueid 3421/head
Brent Bloxam [Fri, 10 Feb 2017 15:23:13 +0000 (10:23 -0500)]
Update uuidAttributes list to include FreeIPA's ipauniqueid

Signed-off-by: Brent Bloxam <brent.bloxam@gmail.com>
7 years agoAdd integration tests for legacy DAV endpoints 3443/head
Lukas Reschke [Fri, 10 Feb 2017 13:01:26 +0000 (14:01 +0100)]
Add integration tests for legacy DAV endpoints

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3371 from m3ntalsp00n/reload_countdown
blizzz [Fri, 10 Feb 2017 13:47:33 +0000 (14:47 +0100)]
Merge pull request #3371 from m3ntalsp00n/reload_countdown

showUpdate funciton allows updated messages

7 years agoRecognize .bat and .cmd files 3444/head
Joas Schilling [Fri, 10 Feb 2017 13:25:25 +0000 (14:25 +0100)]
Recognize .bat and .cmd files

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMake sure invalid images don't flood the log file
Joas Schilling [Fri, 10 Feb 2017 12:44:16 +0000 (13:44 +0100)]
Make sure invalid images don't flood the log file

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3424 from nextcloud/fix-upgrade-path
Björn Schießle [Fri, 10 Feb 2017 10:48:30 +0000 (11:48 +0100)]
Merge pull request #3424 from nextcloud/fix-upgrade-path

Fix return value of getAllowedPreviousVersions()

7 years agoMerge pull request #3425 from nextcloud/set-vendor-during-install
Björn Schießle [Fri, 10 Feb 2017 10:45:50 +0000 (11:45 +0100)]
Merge pull request #3425 from nextcloud/set-vendor-during-install

Set vendor during install

7 years agoMerge pull request #3181 from nextcloud/fix-favorite-activity-mail
Björn Schießle [Fri, 10 Feb 2017 10:35:45 +0000 (11:35 +0100)]
Merge pull request #3181 from nextcloud/fix-favorite-activity-mail

Make sure the file information is available when sending the email

7 years agoMerge pull request #3429 from nextcloud/oparoz-issuetemplate
Joas Schilling [Fri, 10 Feb 2017 09:30:01 +0000 (10:30 +0100)]
Merge pull request #3429 from nextcloud/oparoz-issuetemplate

Fix issue template log formatting

7 years agoFix detection of the new iOS app 3430/head
Joas Schilling [Fri, 10 Feb 2017 09:05:24 +0000 (10:05 +0100)]
Fix detection of the new iOS app

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix log formatting 3429/head
Olivier Paroz [Fri, 10 Feb 2017 08:08:05 +0000 (09:08 +0100)]
Fix log formatting

7 years agoSet vendor during install 3425/head
Morris Jobke [Fri, 10 Feb 2017 05:37:00 +0000 (23:37 -0600)]
Set vendor during install

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoFix return value of getAllowedPreviousVersions() 3424/head
Morris Jobke [Fri, 10 Feb 2017 05:24:24 +0000 (23:24 -0600)]
Fix return value of getAllowedPreviousVersions()

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #3422 from nextcloud/transifex
Morris Jobke [Fri, 10 Feb 2017 02:14:10 +0000 (20:14 -0600)]
Merge pull request #3422 from nextcloud/transifex

add transifex config for sharebymail

7 years agoadd transifex config for sharebymail 3422/head
Morris Jobke [Fri, 10 Feb 2017 01:53:32 +0000 (19:53 -0600)]
add transifex config for sharebymail

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 10 Feb 2017 01:07:02 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMake sure to use the right appdata directory 3417/head
Joas Schilling [Wed, 8 Feb 2017 15:33:58 +0000 (16:33 +0100)]
Make sure to use the right appdata directory

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoSave the used token id in the session so it can be used later on
Joas Schilling [Thu, 26 Jan 2017 10:08:26 +0000 (11:08 +0100)]
Save the used token id in the session so it can be used later on

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3297 from nextcloud/cloud-id-resolve
Robin Appelman [Thu, 9 Feb 2017 13:54:32 +0000 (14:54 +0100)]
Merge pull request #3297 from nextcloud/cloud-id-resolve

Add a single public api for resolving a cloud id to a user and remote and back

7 years agofix copyright headers 3297/head
Robin Appelman [Thu, 9 Feb 2017 12:32:36 +0000 (13:32 +0100)]
fix copyright headers

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoclean cloud ids
Robin Appelman [Thu, 9 Feb 2017 12:31:06 +0000 (13:31 +0100)]
clean cloud ids

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3184 from nextcloud/issue-3165
Lukas Reschke [Thu, 9 Feb 2017 12:29:08 +0000 (13:29 +0100)]
Merge pull request #3184 from nextcloud/issue-3165

Prevent migration from ownCloud 11 to Nextcloud 12

7 years agoMerge pull request #3408 from nextcloud/nullstorage-free-space
Joas Schilling [Thu, 9 Feb 2017 12:17:54 +0000 (13:17 +0100)]
Merge pull request #3408 from nextcloud/nullstorage-free-space

return unknown free space from nullstorage

7 years agoMerge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation
Lukas Reschke [Thu, 9 Feb 2017 11:19:53 +0000 (12:19 +0100)]
Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation

Don't log the password on confirmPassword when LDAP throws an exception

7 years agoMerge pull request #3407 from nextcloud/issue-3312-user-settings-email-accounts-table
Björn Schießle [Thu, 9 Feb 2017 11:10:45 +0000 (12:10 +0100)]
Merge pull request #3407 from nextcloud/issue-3312-user-settings-email-accounts-table

Update the email in the accounts table as well

7 years agoMerge pull request #3362 from nextcloud/fix/nc-token-cookie-name
Joas Schilling [Thu, 9 Feb 2017 09:07:59 +0000 (10:07 +0100)]
Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name

oc_token should be nc_token

7 years agoFix unit tests 3408/head
Morris Jobke [Thu, 9 Feb 2017 02:39:34 +0000 (20:39 -0600)]
Fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 9 Feb 2017 01:07:10 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoreturn unknown free space from nullstorage
Robin Appelman [Wed, 8 Feb 2017 15:38:00 +0000 (16:38 +0100)]
return unknown free space from nullstorage

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoadd tests
Robin Appelman [Wed, 8 Feb 2017 14:06:38 +0000 (15:06 +0100)]
add tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoregister cloudidmanager for files_sharing
Robin Appelman [Mon, 6 Feb 2017 13:50:31 +0000 (14:50 +0100)]
register cloudidmanager for files_sharing

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agolog ocs exceptions
Robin Appelman [Mon, 6 Feb 2017 13:46:52 +0000 (14:46 +0100)]
log ocs exceptions

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoremove test for removed code
Robin Appelman [Mon, 6 Feb 2017 12:19:33 +0000 (13:19 +0100)]
remove test for removed code

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd a single public api for resolving a cloud id to a user and remote and back
Robin Appelman [Fri, 27 Jan 2017 11:52:17 +0000 (12:52 +0100)]
Add a single public api for resolving a cloud id to a user and remote and back

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #3394 from nextcloud/issue-3344-files-activity-expects-parameter...
Lukas Reschke [Wed, 8 Feb 2017 13:47:45 +0000 (14:47 +0100)]
Merge pull request #3394 from nextcloud/issue-3344-files-activity-expects-parameter-1-to-be-an-array

Make sure ownCloud 8.2 activities also can get displayed

7 years agoUpdate the email in the accounts table as well 3407/head
Joas Schilling [Wed, 8 Feb 2017 12:52:55 +0000 (13:52 +0100)]
Update the email in the accounts table as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoMerge pull request #3403 from nextcloud/rename-dbpassword-toggle
Joas Schilling [Wed, 8 Feb 2017 11:16:53 +0000 (12:16 +0100)]
Merge pull request #3403 from nextcloud/rename-dbpassword-toggle

Rename database password toggle

7 years agoFix files sharing legacy as well 3394/head
Joas Schilling [Wed, 8 Feb 2017 10:55:50 +0000 (11:55 +0100)]
Fix files sharing legacy as well

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix indentation and l10n compliance. 3371/head
m3ntalsp00n [Wed, 8 Feb 2017 06:55:31 +0000 (16:55 +1000)]
Fix indentation and  l10n compliance.

Signed-off-by: m3ntalsp00n <m3ntalsp00n@gmail.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 8 Feb 2017 01:07:09 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoRename database password toggle 3403/head
Morris Jobke [Tue, 7 Feb 2017 22:59:12 +0000 (16:59 -0600)]
Rename database password toggle

* otherwise submitting the form with the password show will be overwritten
* see https://github.com/nextcloud/server/blob/2c9d7eeb763d2f907eea8234f6c60a829a5d39f7/core/Controller/SetupController.php#L59
* seems to be a legacy fallback
* fixes #3381

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoDon't log the password on confirmPassword when LDAP throws an exception 3396/head
Joas Schilling [Tue, 7 Feb 2017 11:16:11 +0000 (12:16 +0100)]
Don't log the password on confirmPassword when LDAP throws an exception

Signed-off-by: Joas Schilling <coding@schilljs.com>