]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agoSet a status code when setting a body 3764/head
Joas Schilling [Tue, 7 Mar 2017 16:31:32 +0000 (17:31 +0100)]
Set a status code when setting a body

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd new user agent of windows 10 dav backend
Joas Schilling [Tue, 7 Mar 2017 16:24:26 +0000 (17:24 +0100)]
Add new user agent of windows 10 dav backend

Thanks Microsoft

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 8 Mar 2017 01:07:56 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3722 from nextcloud/backport-3678-dav-share-order-issue
Roeland Jago Douma [Tue, 7 Mar 2017 13:28:49 +0000 (14:28 +0100)]
Merge pull request #3722 from nextcloud/backport-3678-dav-share-order-issue

[stable11] DAV sharing permissions should not depend on the order

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 7 Mar 2017 01:07:49 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3700 from nextcloud/stable11-3687
Joas Schilling [Mon, 6 Mar 2017 14:31:30 +0000 (15:31 +0100)]
Merge pull request #3700 from nextcloud/stable11-3687

Use a proper date format for transfer ownership

7 years agoMake sure shares use read-write when available 3722/head
Joas Schilling [Thu, 2 Mar 2017 10:34:27 +0000 (11:34 +0100)]
Make sure shares use read-write when available

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoAdd a unit test for the broken case
Joas Schilling [Thu, 2 Mar 2017 11:27:59 +0000 (12:27 +0100)]
Add a unit test for the broken case

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoDon't waste energy unless necessary
Joas Schilling [Thu, 2 Mar 2017 10:24:56 +0000 (11:24 +0100)]
Don't waste energy unless necessary

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 6 Mar 2017 01:08:07 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 5 Mar 2017 01:07:54 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 4 Mar 2017 01:07:51 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoUse a proper date format for transfer ownership 3700/head
Morris Jobke [Fri, 3 Mar 2017 04:34:50 +0000 (22:34 -0600)]
Use a proper date format for transfer ownership

* on Windows : is not allowed as filename and doesn't get synced then
* uses 2017-03-02 22-00-00 instead of 2017-03-02T22:00:00+00:00 as format

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

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 2 Mar 2017 16:49:01 +0000 (16:49 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3675 from nextcloud/stable11-transifex-for-theming
Joas Schilling [Thu, 2 Mar 2017 08:26:47 +0000 (09:26 +0100)]
Merge pull request #3675 from nextcloud/stable11-transifex-for-theming

[stable11] Transifex config for theming app

7 years agoMerge pull request #3658 from GreenArchon/stable11_issue_#3461
Roeland Jago Douma [Thu, 2 Mar 2017 07:54:28 +0000 (08:54 +0100)]
Merge pull request #3658 from GreenArchon/stable11_issue_#3461

[stable11] Typecast shared mount's storage_id to int as documented + some refactor to avoid similar bugs

7 years agoTransifex config for theming app 3675/head
Morris Jobke [Thu, 2 Mar 2017 04:05:25 +0000 (22:05 -0600)]
Transifex config for theming app

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

7 years agoMerge pull request #3665 from nextcloud/fix-string-comparison-and-return-docs
Morris Jobke [Wed, 1 Mar 2017 19:04:42 +0000 (13:04 -0600)]
Merge pull request #3665 from nextcloud/fix-string-comparison-and-return-docs

Fix string comparison and return docs

7 years agoMerge pull request #3293 from nextcloud/streams52-11
Robin Appelman [Wed, 1 Mar 2017 14:40:03 +0000 (15:40 +0100)]
Merge pull request #3293 from nextcloud/streams52-11

update icewind/streams to 0.5.2

7 years agoFix string comparison and return docs 3665/head
Joas Schilling [Wed, 1 Mar 2017 12:42:41 +0000 (13:42 +0100)]
Fix string comparison and return docs

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 1 Mar 2017 01:07:51 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3652 from nextcloud/stable11-fix-saving-backup-codes
Morris Jobke [Tue, 28 Feb 2017 21:53:53 +0000 (15:53 -0600)]
Merge pull request #3652 from nextcloud/stable11-fix-saving-backup-codes

[stable11] Fix saving backup codes by using a correct data uri

7 years agoupdate icewind/streams to 0.5.2 3293/head
Robin Appelman [Fri, 27 Jan 2017 09:19:44 +0000 (10:19 +0100)]
update icewind/streams to 0.5.2

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoFix saving backup codes by using a correct data uri 3652/head
Christoph Wurst [Tue, 28 Feb 2017 09:20:30 +0000 (10:20 +0100)]
Fix saving backup codes by using a correct data uri

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

7 years agoMerge pull request #3608 from nextcloud/backport-3598-shared-addressbooks-fail-on...
Lukas Reschke [Mon, 27 Feb 2017 20:07:27 +0000 (21:07 +0100)]
Merge pull request #3608 from nextcloud/backport-3598-shared-addressbooks-fail-on-legacy-endpoint

[stable11] Use the correct principal for shared addressbooks

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 27 Feb 2017 01:19:59 +0000 (01:19 +0000)]
[tx-robot] updated from transifex

7 years agoIncrease patch version
Lukas Reschke [Sun, 26 Feb 2017 19:40:48 +0000 (20:40 +0100)]
Increase patch version

Due to a bug in the release script it already included https://github.com/nextcloud/3rdparty/pull/33

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agov11.0.2
Lukas Reschke [Sun, 26 Feb 2017 18:39:38 +0000 (19:39 +0100)]
v11.0.2

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 26 Feb 2017 01:24:22 +0000 (01:24 +0000)]
[tx-robot] updated from transifex

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

7 years agoRefactor files' CacheEntry object creation to call cacheEntryFromData() all the time... 3658/head
Frédéric Fortier [Thu, 23 Feb 2017 01:03:32 +0000 (20:03 -0500)]
Refactor files' CacheEntry object creation to call cacheEntryFromData() all the time thus allowing proper casts to be done

Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
7 years agoTypecast filecache 'storage' as int to return it as documented, fixes #3461
Frédéric Fortier [Tue, 21 Feb 2017 03:07:37 +0000 (22:07 -0500)]
Typecast filecache 'storage' as int to return it as documented, fixes #3461

Signed-off-by: Frédéric Fortier <frederic.fortier@oronospolytechnique.com>
7 years agoUse the correct principal for shared addressbooks 3608/head
Joas Schilling [Thu, 23 Feb 2017 13:16:00 +0000 (14:16 +0100)]
Use the correct principal for shared addressbooks

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 24 Feb 2017 01:21:48 +0000 (01:21 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 23 Feb 2017 01:18:59 +0000 (01:18 +0000)]
[tx-robot] updated from transifex

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 22 Feb 2017 01:12:35 +0000 (01:12 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3552 from nextcloud/rc3-it-is
Lukas Reschke [Tue, 21 Feb 2017 20:38:43 +0000 (21:38 +0100)]
Merge pull request #3552 from nextcloud/rc3-it-is

v11.0.2 RC3

7 years agoMerge pull request #3560 from nextcloud/fix-misleading-wording-stable11
Lukas Reschke [Tue, 21 Feb 2017 20:38:09 +0000 (21:38 +0100)]
Merge pull request #3560 from nextcloud/fix-misleading-wording-stable11

[stable11] Fix misleading wording: searching is affected, not user access

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 21 Feb 2017 01:08:55 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoFix misleading wording: searching is affected, not user access. 3560/head
Arthur Schiwon [Mon, 20 Feb 2017 18:26:16 +0000 (19:26 +0100)]
Fix misleading wording: searching is affected, not user access.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agov11.0.2 RC3 3552/head
Lukas Reschke [Mon, 20 Feb 2017 20:35:52 +0000 (21:35 +0100)]
v11.0.2 RC3

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3528 from nextcloud/backport-3521
Lukas Reschke [Mon, 20 Feb 2017 20:34:13 +0000 (21:34 +0100)]
Merge pull request #3528 from nextcloud/backport-3521

[stable11] Backport of Fix Broken UUID Attribute Detection #3521

7 years agoalso adjust version no in unit tests 3528/head
Arthur Schiwon [Mon, 20 Feb 2017 16:29:31 +0000 (17:29 +0100)]
also adjust version no in unit tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 20 Feb 2017 01:07:46 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

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

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 18 Feb 2017 01:08:33 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoBackport of Fix Broken UUID Attribute Detection #3521
Arthur Schiwon [Fri, 17 Feb 2017 01:04:42 +0000 (02:04 +0100)]
Backport of Fix Broken UUID Attribute Detection #3521

Fix integration test by not relying on Fake instances

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Fix determining the UUID attribute, default of the override is null

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
add integration test for uuid attr detection

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Add repair steps

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Background jobs can take 4k of characters only. We find a good batch size.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
add tests to DB group

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 17 Feb 2017 01:08:07 +0000 (01:08 +0000)]
[tx-robot] updated from transifex

7 years agoIncrease patchlevel to 4 v11.0.2
Lukas Reschke [Fri, 17 Feb 2017 00:15:06 +0000 (01:15 +0100)]
Increase patchlevel to 4

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3519 from nextcloud/final-stable11-version
Lukas Reschke [Fri, 17 Feb 2017 00:11:10 +0000 (01:11 +0100)]
Merge pull request #3519 from nextcloud/final-stable11-version

11.0.2 version number

7 years ago11.0.2 version number 3519/head
Lukas Reschke [Thu, 16 Feb 2017 23:38:36 +0000 (00:38 +0100)]
11.0.2 version number

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoBump minor version
Lukas Reschke [Thu, 16 Feb 2017 23:05:18 +0000 (00:05 +0100)]
Bump minor version

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3512 from nextcloud/beta2-it-is
Lukas Reschke [Thu, 16 Feb 2017 22:02:07 +0000 (23:02 +0100)]
Merge pull request #3512 from nextcloud/beta2-it-is

RC2 it is

7 years agoMerge pull request #3510 from nextcloud/backport-2704-stable11
Lukas Reschke [Thu, 16 Feb 2017 22:01:56 +0000 (23:01 +0100)]
Merge pull request #3510 from nextcloud/backport-2704-stable11

[stable11] fix printing backup codes

7 years agoMerge pull request #3511 from nextcloud/backport-3362-stable11
Morris Jobke [Thu, 16 Feb 2017 17:33:02 +0000 (11:33 -0600)]
Merge pull request #3511 from nextcloud/backport-3362-stable11

[stable11] Fix cookie name (nc_token instead of oc_token)

7 years agoMerge pull request #3493 from nextcloud/backport-3324
Morris Jobke [Thu, 16 Feb 2017 17:32:37 +0000 (11:32 -0600)]
Merge pull request #3493 from nextcloud/backport-3324

[stable11] LDAP's checkPassword should only catch when a user was not found

7 years agoMerge pull request #3508 from nextcloud/nullstorage-free-space-11
Morris Jobke [Thu, 16 Feb 2017 16:53:06 +0000 (10:53 -0600)]
Merge pull request #3508 from nextcloud/nullstorage-free-space-11

[11] return unknown free space from nullstorage

7 years agofix unit tests 3511/head
Morris Jobke [Thu, 16 Feb 2017 16:29:45 +0000 (10:29 -0600)]
fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoRC2 it is 3512/head
Lukas Reschke [Thu, 16 Feb 2017 15:40:06 +0000 (16:40 +0100)]
RC2 it is

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix cookie name (nc_token instead of oc_token)
Christoph Wurst [Thu, 16 Feb 2017 15:27:20 +0000 (16:27 +0100)]
Fix cookie name (nc_token instead of oc_token)

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoadd title to backup codes print page 3510/head
Christoph Wurst [Tue, 20 Dec 2016 13:52:24 +0000 (14:52 +0100)]
add title to backup codes print page

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoprint and close the new tab, not the current one when printing backup codes
Christoph Wurst [Thu, 15 Dec 2016 17:16:41 +0000 (18:16 +0100)]
print and close the new tab, not the current one when printing backup codes

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
7 years agoFix unit tests 3508/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 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 ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 16 Feb 2017 01:07:53 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3499 from nextcloud/fix-addressbook-deletion
Morris Jobke [Thu, 16 Feb 2017 00:37:05 +0000 (18:37 -0600)]
Merge pull request #3499 from nextcloud/fix-addressbook-deletion

[stable11] Address book data lost when any user receiving a share is deleted backport

7 years agoMerge pull request #3500 from nextcloud/stable11-3403
Roeland Jago Douma [Wed, 15 Feb 2017 19:15:38 +0000 (20:15 +0100)]
Merge pull request #3500 from nextcloud/stable11-3403

[stable11] Rename database password toggle

7 years agoMerge pull request #3494 from nextcloud/backport-3485
Morris Jobke [Wed, 15 Feb 2017 16:29:28 +0000 (10:29 -0600)]
Merge pull request #3494 from nextcloud/backport-3485

[stable11] Popovermenu files css fix

7 years agoRename database password toggle 3500/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 agoAddress book data lost when any user receiving a share is deleted backport 3499/head
John Molakvoæ (skjnldsv) [Wed, 15 Feb 2017 15:09:00 +0000 (16:09 +0100)]
Address book data lost when any user receiving a share is deleted backport

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
7 years agoCss fix 3494/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 agoLDAP's checkPassword should only catch when a user was not found, fixes #2431 3493/head
Arthur Schiwon [Mon, 30 Jan 2017 15:57:40 +0000 (16:57 +0100)]
LDAP's checkPassword should only catch when a user was not found, fixes #2431

Also fixes error processing after ldap_search, due to different return format

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 15 Feb 2017 01:07:38 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

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

[stable11] add screensharing icon

7 years agoadd screensharing icon 3481/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 ago[tx-robot] updated from transifex
Nextcloud bot [Tue, 14 Feb 2017 01:07:30 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3440 from nextcloud/backport-oc-26963 v11.0.2RC1
Lukas Reschke [Mon, 13 Feb 2017 09:13:16 +0000 (10:13 +0100)]
Merge pull request #3440 from nextcloud/backport-oc-26963

[stable11] Make sure invalid images don't flood the log file

7 years agoMerge pull request #3445 from nextcloud/stable11-add-integration-tests-for-dav
Lukas Reschke [Mon, 13 Feb 2017 09:11:28 +0000 (10:11 +0100)]
Merge pull request #3445 from nextcloud/stable11-add-integration-tests-for-dav

[stable11] Add integration tests for legacy DAV endpoints

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 13 Feb 2017 01:07:19 +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:36 +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:33 +0000 (01:07 +0000)]
[tx-robot] updated from transifex

7 years agoCheck if color exists in palette before using it 3440/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 agoAdd integration tests for legacy DAV endpoints 3445/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 #3431 from nextcloud/backport-3430-fix-ios-client-detection
Lukas Reschke [Fri, 10 Feb 2017 13:45:54 +0000 (14:45 +0100)]
Merge pull request #3431 from nextcloud/backport-3430-fix-ios-client-detection

[stable11] Fix detection of the new iOS app

7 years agoMerge pull request #3436 from nextcloud/stable11-increase-version
Lukas Reschke [Fri, 10 Feb 2017 13:03:49 +0000 (14:03 +0100)]
Merge pull request #3436 from nextcloud/stable11-increase-version

Increase version to 11.0.2 RC1

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 #3259 from nextcloud/add-profile-data-to-provisioning-api-stable11
Lukas Reschke [Fri, 10 Feb 2017 12:00:04 +0000 (13:00 +0100)]
Merge pull request #3259 from nextcloud/add-profile-data-to-provisioning-api-stable11

Add profile data to provisioning api stable11

7 years agoIncrease version to 11.0.2 RC1 3436/head
Lukas Reschke [Fri, 10 Feb 2017 10:03:32 +0000 (11:03 +0100)]
Increase version to 11.0.2 RC1

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoMerge pull request #3433 from nextcloud/backport-3181-fix-favorite-activity-mail
Lukas Reschke [Fri, 10 Feb 2017 11:49:39 +0000 (12:49 +0100)]
Merge pull request #3433 from nextcloud/backport-3181-fix-favorite-activity-mail

[stable11] Make sure the file information is available when sending the email

7 years agoMerge pull request #3426 from nextcloud/stable11-set-vendor-during-install
Lukas Reschke [Fri, 10 Feb 2017 10:41:06 +0000 (11:41 +0100)]
Merge pull request #3426 from nextcloud/stable11-set-vendor-during-install

[stable11] Set vendor during install

7 years agoMerge pull request #3286 from nextcloud/popover-backport
Lukas Reschke [Fri, 10 Feb 2017 10:27:03 +0000 (11:27 +0100)]
Merge pull request #3286 from nextcloud/popover-backport

[stable11] popovermenu backport

7 years agoMerge pull request #3412 from nextcloud/backport-3394-files-activity-expects-paramete...
Lukas Reschke [Fri, 10 Feb 2017 09:44:14 +0000 (10:44 +0100)]
Merge pull request #3412 from nextcloud/backport-3394-files-activity-expects-parameter-1-to-be-an-array

[stable11] Make sure ownCloud 8.2 activities also can get displayed

7 years agoMake sure the file information is available when sending the email 3433/head
Joas Schilling [Fri, 20 Jan 2017 11:48:46 +0000 (12:48 +0100)]
Make sure the file information is available when sending the email

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix detection of the new iOS app 3431/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 agoMerge pull request #3414 from nextcloud/backport-3396-dont-log-password-on-failed...
Morris Jobke [Fri, 10 Feb 2017 06:08:47 +0000 (00:08 -0600)]
Merge pull request #3414 from nextcloud/backport-3396-dont-log-password-on-failed-confirmation

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

7 years agoMerge pull request #3411 from nextcloud/backport-3407-user-settings-email-accounts...
Morris Jobke [Fri, 10 Feb 2017 05:52:41 +0000 (23:52 -0600)]
Merge pull request #3411 from nextcloud/backport-3407-user-settings-email-accounts-table

[stable11] Update the email in the accounts table as well

7 years agoSet vendor during install 3426/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>