]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
6 years agoMerge pull request #7774 from nextcloud/smb-2.0.3-12
Morris Jobke [Wed, 10 Jan 2018 14:58:26 +0000 (15:58 +0100)]
Merge pull request #7774 from nextcloud/smb-2.0.3-12

[12] update icewind/smb to 2.0.3

6 years agoMerge pull request #7770 from nextcloud/stable12-7756
Morris Jobke [Wed, 10 Jan 2018 13:58:23 +0000 (14:58 +0100)]
Merge pull request #7770 from nextcloud/stable12-7756

[stable12] Fix SCSS processing when undoing theming values

6 years agoMerge pull request #7777 from nextcloud/stable12-7769
Morris Jobke [Wed, 10 Jan 2018 13:43:28 +0000 (14:43 +0100)]
Merge pull request #7777 from nextcloud/stable12-7769

[stable12] Set height for sidebar icons

6 years agoSet height for sidebar icons 7777/head
Julius Härtl [Wed, 10 Jan 2018 08:51:48 +0000 (09:51 +0100)]
Set height for sidebar icons

This makes sure they are properly scaled in IE11

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoupdate icewind/smb to 2.0.3 7774/head
Robin Appelman [Wed, 10 Jan 2018 11:18:35 +0000 (12:18 +0100)]
update icewind/smb to 2.0.3

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoFix SCSS processing when undoing theming values 7770/head
Julius Härtl [Tue, 9 Jan 2018 13:18:03 +0000 (14:18 +0100)]
Fix SCSS processing when undoing theming values

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 10 Jan 2018 01:11:34 +0000 (01:11 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #7758 from nextcloud/12-7570 v12.0.5RC1
Roeland Jago Douma [Tue, 9 Jan 2018 20:19:24 +0000 (21:19 +0100)]
Merge pull request #7758 from nextcloud/12-7570

[stable12] add option to use legacy v2 auth with s3

6 years agoMerge pull request #7759 from nextcloud/7712_12
Roeland Jago Douma [Tue, 9 Jan 2018 18:28:19 +0000 (19:28 +0100)]
Merge pull request #7759 from nextcloud/7712_12

[stable12] Use correct L10N files for jsconfig

6 years agoadd option to use legacy v2 auth with s3 7758/head
Robin Appelman [Tue, 19 Dec 2017 10:54:55 +0000 (11:54 +0100)]
add option to use legacy v2 auth with s3

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #7757 from nextcloud/12-7605
Morris Jobke [Tue, 9 Jan 2018 17:10:31 +0000 (18:10 +0100)]
Merge pull request #7757 from nextcloud/12-7605

[stable12] Wait for the shared link to be set in the acceptance tests

6 years agoUse correct L10N files for jsconfig 7759/head
Roeland Jago Douma [Fri, 5 Jan 2018 12:58:28 +0000 (13:58 +0100)]
Use correct L10N files for jsconfig

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoAdd missing timeout multiplier 7757/head
Daniel Calviño Sánchez [Fri, 22 Dec 2017 08:12:29 +0000 (09:12 +0100)]
Add missing timeout multiplier

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #7740 from nextcloud/12.0.5-rc1-prep
Roeland Jago Douma [Tue, 9 Jan 2018 14:58:02 +0000 (15:58 +0100)]
Merge pull request #7740 from nextcloud/12.0.5-rc1-prep

12.0.5 RC1

6 years agoWait for the shared link to be set in the acceptance tests
Daniel Calviño Sánchez [Fri, 22 Dec 2017 07:58:19 +0000 (08:58 +0100)]
Wait for the shared link to be set in the acceptance tests

When clicking on "Share link" in the "Sharing" tab of the Files app an
input field with the link appears. That input field already exists in
the DOM, although empty, before clicking on "Share link", and when that
is done the proper value is set and then the input field is shown.

In the acceptance tests "getValue()" can return the value of hidden
elements too, so as long as an element exists its value is returned
without waiting for the field to be visible. Due to this if the test
code runs too fast the "I write down the shared link" step could be
executed before the proper value was set, so the shared link got in that
case would be an empty value, and this would lead to failures when the
following steps were executed.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoFix typo in callback name
Daniel Calviño Sánchez [Fri, 22 Dec 2017 07:57:50 +0000 (08:57 +0100)]
Fix typo in callback name

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years ago12.0.5 RC1 7740/head
Morris Jobke [Mon, 8 Jan 2018 15:21:43 +0000 (16:21 +0100)]
12.0.5 RC1

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #7747 from nextcloud/composer_up_12
Morris Jobke [Tue, 9 Jan 2018 10:45:37 +0000 (11:45 +0100)]
Merge pull request #7747 from nextcloud/composer_up_12

Update of composer

6 years agoProperly catch InvalidTokenException for better error response
Morris Jobke [Tue, 9 Jan 2018 10:41:08 +0000 (11:41 +0100)]
Properly catch InvalidTokenException for better error response

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #7745 from nextcloud/7692_12
Morris Jobke [Tue, 9 Jan 2018 10:27:53 +0000 (11:27 +0100)]
Merge pull request #7745 from nextcloud/7692_12

[stable12] Don't lie about preview types

6 years agoMerge pull request #7708 from nextcloud/stable12-7599
Morris Jobke [Tue, 9 Jan 2018 10:23:36 +0000 (11:23 +0100)]
Merge pull request #7708 from nextcloud/stable12-7599

[stable12] don't show recurring msg when pages result was turned off

6 years agoMerge pull request #7684 from nextcloud/backport-ie-fix-invert
Morris Jobke [Tue, 9 Jan 2018 10:22:54 +0000 (11:22 +0100)]
Merge pull request #7684 from nextcloud/backport-ie-fix-invert

[stable12] Fix inverted app icons on IE11

6 years agoMerge pull request #7674 from nextcloud/12_7644
Morris Jobke [Tue, 9 Jan 2018 10:14:16 +0000 (11:14 +0100)]
Merge pull request #7674 from nextcloud/12_7644

[stable12] Do no run SyncJob in cron

6 years agoMerge pull request #7666 from nextcloud/stable12-7527-fix-drag-shadow-not-visible...
Morris Jobke [Tue, 9 Jan 2018 10:12:15 +0000 (11:12 +0100)]
Merge pull request #7666 from nextcloud/stable12-7527-fix-drag-shadow-not-visible-when-dragging-a-file-on-a-narrow-screen

[stable12] Fix drag shadow not visible when dragging a file on a narrow screen

6 years agoMerge pull request #7742 from nextcloud/stable12-7716-hide-favourite-icon-in-details...
Morris Jobke [Tue, 9 Jan 2018 10:08:53 +0000 (11:08 +0100)]
Merge pull request #7742 from nextcloud/stable12-7716-hide-favourite-icon-in-details-view-if-favourite-action-is-not-available

[stable12] Hide favourite icon in details view if favourite action is not available

6 years agoUpdate of composer 7747/head
Roeland Jago Douma [Mon, 8 Jan 2018 20:09:32 +0000 (21:09 +0100)]
Update of composer

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

6 years agoMerge pull request #7694 from nextcloud/stable12-7611
Roeland Jago Douma [Mon, 8 Jan 2018 20:10:11 +0000 (21:10 +0100)]
Merge pull request #7694 from nextcloud/stable12-7611

[stable12] Don't attempt to translate login names to uids when uids are provided

6 years agoOnly return 1 type 7745/head
Roeland Jago Douma [Sun, 7 Jan 2018 10:46:24 +0000 (11:46 +0100)]
Only return 1 type

Throw proper exception if we can't get the mimetype for a preview. Catch
it later on so we can just return a not found for the preview.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoDon't lie about the preview mimetype
Roeland Jago Douma [Thu, 4 Jan 2018 09:00:07 +0000 (10:00 +0100)]
Don't lie about the preview mimetype

For legacy reasons we stored all the previews with a png extention.
However we did not put png data in them all the time.

This caused the preview endpoints to always report that a preview is a
png file. Which was a lie.

Since we abstract away from the storage etc in the previewmanager. There
is no need anymore to store them as .png files and instead we can use
the actual file extention.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoHide favourite icon in details view if favourite action is not available 7742/head
Daniel Calviño Sánchez [Fri, 5 Jan 2018 18:06:06 +0000 (19:06 +0100)]
Hide favourite icon in details view if favourite action is not available

When the favourite icon in the details view is clicked the "Favorite"
action is triggered. However, if the action name given to
"triggerAction" is not found then the "Download" action is triggered
instead. As the "Favorite" action is not available in some file lists
(like "Recents") the "Download" action was executed instead in those
cases, which was a strange behaviour. Now the favourite icon is
hidden if its action is not available.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 8 Jan 2018 01:11:31 +0000 (01:11 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #7717 from nextcloud/stable12-7662
Roeland Jago Douma [Sun, 7 Jan 2018 10:40:18 +0000 (11:40 +0100)]
Merge pull request #7717 from nextcloud/stable12-7662

[stable12] throw ServerNotAvailableException when LDAP is caught shutting down

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 7 Jan 2018 01:11:25 +0000 (01:11 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 6 Jan 2018 01:11:22 +0000 (01:11 +0000)]
[tx-robot] updated from transifex

6 years agothrow ServerNotAvailableException when LDAP is caught shutting down 7717/head
Arthur Schiwon [Tue, 2 Jan 2018 11:20:44 +0000 (12:20 +0100)]
throw ServerNotAvailableException when LDAP is caught shutting down

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoMerge pull request #7688 from nextcloud/stable12-fix-scss-webroot-and-url-rewrite
Morris Jobke [Fri, 5 Jan 2018 16:29:08 +0000 (17:29 +0100)]
Merge pull request #7688 from nextcloud/stable12-fix-scss-webroot-and-url-rewrite

[Stable12] fix scss webroot and url rewrite

6 years agoRevert rebaseurl function edit 7688/head
John Molakvoæ (skjnldsv) [Fri, 5 Jan 2018 07:35:38 +0000 (08:35 +0100)]
Revert rebaseurl function edit

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoRollback caching fix
John Molakvoæ (skjnldsv) [Fri, 5 Jan 2018 07:34:32 +0000 (08:34 +0100)]
Rollback caching fix

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFix faulty path in theming scss generation
Julius Härtl [Fri, 5 Jan 2018 07:15:42 +0000 (08:15 +0100)]
Fix faulty path in theming scss generation

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 5 Jan 2018 01:11:32 +0000 (01:11 +0000)]
[tx-robot] updated from transifex

6 years agodon't show recurring msg when pages result was turned off 7708/head
Arthur Schiwon [Thu, 21 Dec 2017 13:29:56 +0000 (14:29 +0100)]
don't show recurring msg when pages result was turned off

and only as debug level otherwise.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agotest adoption for stable12 7694/head
Arthur Schiwon [Thu, 4 Jan 2018 23:10:10 +0000 (00:10 +0100)]
test adoption for stable12

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoFixup! Proberly detect variable changes
John Molakvoæ (skjnldsv) [Thu, 4 Jan 2018 18:11:38 +0000 (19:11 +0100)]
Fixup! Proberly detect variable changes

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoProberly detect variable changes
John Molakvoæ (skjnldsv) [Thu, 4 Jan 2018 18:10:27 +0000 (19:10 +0100)]
Proberly detect variable changes

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFixed url rebase with theming
John Molakvoæ (skjnldsv) [Thu, 4 Jan 2018 12:24:21 +0000 (13:24 +0100)]
Fixed url rebase with theming

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoupdate autoloader
Arthur Schiwon [Thu, 4 Jan 2018 12:16:05 +0000 (13:16 +0100)]
update autoloader

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoremoves invalid tests, adapts another one
Arthur Schiwon [Wed, 3 Jan 2018 20:44:30 +0000 (21:44 +0100)]
removes invalid tests, adapts another one

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agonever translate login names when requiring with a user id
Arthur Schiwon [Fri, 22 Dec 2017 14:22:49 +0000 (15:22 +0100)]
never translate login names when requiring with a user id

where appropriate, the preLoginNameUsedAsUserName hook should be thrown.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoextend tests for status quo
Arthur Schiwon [Fri, 22 Dec 2017 12:38:10 +0000 (13:38 +0100)]
extend tests for status quo

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 4 Jan 2018 09:48:45 +0000 (09:48 +0000)]
[tx-robot] updated from transifex

6 years agoFixed tests
John Molakvoæ (skjnldsv) [Thu, 4 Jan 2018 07:35:38 +0000 (08:35 +0100)]
Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFixed tests
John Molakvoæ (skjnldsv) [Thu, 28 Dec 2017 13:19:13 +0000 (14:19 +0100)]
Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoCorrectly remove temp test directory tree
John Molakvoæ (skjnldsv) [Thu, 28 Dec 2017 12:41:38 +0000 (13:41 +0100)]
Correctly remove temp test directory tree

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoAdded tests for various installations types
John Molakvoæ (skjnldsv) [Thu, 28 Dec 2017 12:32:45 +0000 (13:32 +0100)]
Added tests for various installations types
- With root installation
 - Core css
 - App inside server root
 - Secondary apps directory outside server root
- With an installation in a sub directory
 - Core css
 - App inside server root
 - Secondary apps directory outside server root

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFixup! getWebdir return
John Molakvoæ (skjnldsv) [Thu, 28 Dec 2017 09:28:16 +0000 (10:28 +0100)]
Fixup! getWebdir return

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoUse OC_Util function for app web path
John Molakvoæ (skjnldsv) [Thu, 28 Dec 2017 09:25:10 +0000 (10:25 +0100)]
Use OC_Util function for app web path

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agogetWebDir function
John Molakvoæ (skjnldsv) [Wed, 27 Dec 2017 15:44:14 +0000 (16:44 +0100)]
getWebDir function

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFixed webroot for scss files
John Molakvoæ (skjnldsv) [Wed, 27 Dec 2017 10:01:27 +0000 (11:01 +0100)]
Fixed webroot for scss files
Fixed tests

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years agoFixed scss url rewriting
John Molakvoæ (skjnldsv) [Wed, 27 Dec 2017 10:00:46 +0000 (11:00 +0100)]
Fixed scss url rewriting

Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
6 years ago Fix height of table rows in apps management on IE11 7684/head
Julius Härtl [Wed, 3 Jan 2018 16:12:16 +0000 (17:12 +0100)]
 Fix height of table rows in apps management on IE11

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoRemove css invert since we are using svg filters for now
Julius Härtl [Wed, 3 Jan 2018 13:41:55 +0000 (14:41 +0100)]
Remove css invert since we are using svg filters for now

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoFix icon rendering in apps management for IE11
Julius Härtl [Wed, 3 Jan 2018 08:18:12 +0000 (09:18 +0100)]
Fix icon rendering in apps management for IE11

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoInvert app icons on IE11 as well
Julius Härtl [Wed, 3 Jan 2018 08:17:14 +0000 (09:17 +0100)]
Invert app icons on IE11 as well

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoMerge pull request #7672 from nextcloud/backport/6977/log-censor
Roeland Jago Douma [Wed, 3 Jan 2018 11:54:56 +0000 (12:54 +0100)]
Merge pull request #7672 from nextcloud/backport/6977/log-censor

[stable12] Added additional methods for removal of sensitive info

6 years agoDo no run SyncJob in cron 7674/head
Roeland Jago Douma [Fri, 29 Dec 2017 13:07:00 +0000 (14:07 +0100)]
Do no run SyncJob in cron

Fixes #7184

The SyncJob can be very resource intensive. Since it requests all users
on the system to create the system addressbook. In order to do this it
creates a vcard for every user and updates the addressbook.

There is no need for this job since the proper signals are emitted and
handled in the carddav backend to update the addressbook live.

Worst comes to worst there is always the occ command to bring the
address book in sync again.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoUnit tests for #6977 7672/head
Joas Schilling [Fri, 27 Oct 2017 09:46:20 +0000 (11:46 +0200)]
Unit tests for #6977

Signed-off-by: Joas Schilling <coding@schilljs.com>
6 years agoAdded additional methods for removal of sensitive info
Johannes Schlichenmaier [Thu, 26 Oct 2017 21:13:37 +0000 (23:13 +0200)]
Added additional methods for removal of sensitive info

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
6 years agoFix drag shadow not visible when dragging a file on a narrow screen 7666/head
Daniel Calviño Sánchez [Thu, 14 Dec 2017 03:05:49 +0000 (04:05 +0100)]
Fix drag shadow not visible when dragging a file on a narrow screen

When a file from the file list is dragged a drag shadow (a copy of the
file row that follows the cursor position) is created. The drag shadow
element is created as a direct child of the body element, so it needs a
higher "z-index" than the one used for the file list to be visible.

In narrow screens the "#app-content" uses a "z-index" of 1000 in order
to be visible over the "#navigation-bar" when they overlap, so the
"z-index" of the drag shadow must be at least 1000 to be visible over
the file list.

Instead of updating the hardcoded "z-index" it was removed and replaced
by CSS rules for ".dragshadow" elements to ease theming.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years agoMerge pull request #7567 from nextcloud/stable-12_fix7428
Morris Jobke [Wed, 20 Dec 2017 13:18:33 +0000 (14:18 +0100)]
Merge pull request #7567 from nextcloud/stable-12_fix7428

Respect sharing options when searching for Sharees

6 years agoMerge pull request #7577 from nextcloud/7361_12
Roeland Jago Douma [Tue, 19 Dec 2017 14:51:32 +0000 (15:51 +0100)]
Merge pull request #7577 from nextcloud/7361_12

[stable12] check userExists later, saves lookups for appData_INSTANCEID userids

6 years agocheck userExists later, saves lookups for appData_INSTANCEID userids 7577/head
Arthur Schiwon [Fri, 1 Dec 2017 10:47:56 +0000 (11:47 +0100)]
check userExists later, saves lookups for appData_INSTANCEID userids

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
6 years agoMerge pull request #7568 from nextcloud/stable12-fix-duplicate-session-token
Roeland Jago Douma [Tue, 19 Dec 2017 12:33:35 +0000 (13:33 +0100)]
Merge pull request #7568 from nextcloud/stable12-fix-duplicate-session-token

[stable12] Fix duplicate session token after remembered login

6 years agoFix duplicate session token after remembered login 7568/head
Christoph Wurst [Mon, 18 Sep 2017 08:33:19 +0000 (10:33 +0200)]
Fix duplicate session token after remembered login

On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
6 years agoDon't show users which e-mail address match if they belong to a group we may not... 7567/head
Tobia De Koninck [Tue, 19 Dec 2017 07:43:08 +0000 (08:43 +0100)]
Don't show users which e-mail address match if they belong to a group we may not share with

Signed-off-by: Tobia De Koninck <tobia@ledfan.be>
6 years agoMerge pull request #7558 from nextcloud/12-7427
Morris Jobke [Mon, 18 Dec 2017 20:19:51 +0000 (21:19 +0100)]
Merge pull request #7558 from nextcloud/12-7427

[stable12] Fix email buttons for white theme

6 years agoFix email buttons for white theme 7558/head
Morris Jobke [Fri, 8 Dec 2017 11:16:05 +0000 (12:16 +0100)]
Fix email buttons for white theme

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #7464 from nextcloud/cached-mount-info-filepath-12
Morris Jobke [Wed, 13 Dec 2017 12:28:25 +0000 (13:28 +0100)]
Merge pull request #7464 from nextcloud/cached-mount-info-filepath-12

[12] Allow getting the filepath when getting cached mounts by fileid

6 years agoMerge pull request #7468 from nextcloud/update-user-agent-regex-stable12
Morris Jobke [Tue, 12 Dec 2017 14:44:55 +0000 (15:44 +0100)]
Merge pull request #7468 from nextcloud/update-user-agent-regex-stable12

allow 'Nextcloud' in the user agent string of Android

6 years agofix dav unit tests 7468/head
Bjoern Schiessle [Tue, 12 Dec 2017 12:55:32 +0000 (13:55 +0100)]
fix dav unit tests

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoallow 'Nextcloud' in the user agent string of Android
Bjoern Schiessle [Tue, 12 Dec 2017 11:16:01 +0000 (12:16 +0100)]
allow 'Nextcloud' in the user agent string of Android

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
6 years agoAllow getting the filepath when getting cached mounts by fileid 7464/head
Robin Appelman [Tue, 22 Aug 2017 13:44:52 +0000 (15:44 +0200)]
Allow getting the filepath when getting cached mounts by fileid

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoMerge pull request #7456 from nextcloud/12_7342
Morris Jobke [Tue, 12 Dec 2017 09:04:40 +0000 (10:04 +0100)]
Merge pull request #7456 from nextcloud/12_7342

[stable12] CardDAV convertor check should not be to wide

6 years agoMerge pull request #7457 from nextcloud/stable12-7271
Roeland Jago Douma [Tue, 12 Dec 2017 06:50:40 +0000 (07:50 +0100)]
Merge pull request #7457 from nextcloud/stable12-7271

[stable12] Fix loading icon position in the app menu

6 years agoMerge pull request #7455 from nextcloud/12_7230
Morris Jobke [Mon, 11 Dec 2017 21:45:25 +0000 (22:45 +0100)]
Merge pull request #7455 from nextcloud/12_7230

[stable12] Remove wrong entry in admin_settings that causes 500

6 years agoFix loading icon position in the app menu 7457/head
Julius Härtl [Thu, 23 Nov 2017 20:15:05 +0000 (21:15 +0100)]
Fix loading icon position in the app menu

Signed-off-by: Julius Härtl <jus@bitgrid.net>
6 years agoCardDAV convertor check should not be to wide 7456/head
Roeland Jago Douma [Wed, 29 Nov 2017 14:24:08 +0000 (15:24 +0100)]
CardDAV convertor check should not be to wide

Case: email is set to null, but the avatar is set. In the old case the
email would set $emptyValue but $noImage would still be false. This we
would set the empty string as email.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
6 years agoRemove wrong entry in admin_settings that causes 500 7455/head
Morris Jobke [Mon, 20 Nov 2017 16:23:20 +0000 (17:23 +0100)]
Remove wrong entry in admin_settings that causes 500

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
6 years agoMerge pull request #7451 from nextcloud/12-7433
Morris Jobke [Mon, 11 Dec 2017 16:25:36 +0000 (17:25 +0100)]
Merge pull request #7451 from nextcloud/12-7433

[stable12] Fix constructor spy in unit test with Sinon 4.1.3

6 years agoFix constructor spy in unit test with Sinon 4.1.3 7451/head
Daniel Calviño Sánchez [Fri, 8 Dec 2017 17:55:38 +0000 (18:55 +0100)]
Fix constructor spy in unit test with Sinon 4.1.3

When a constructor is spied using Sinon it is wrapped by a proxy
function, which calls the original constructor when invoked. When "new
Foo()" is executed a "Foo" object is created, "Foo" is invoked with the
object as "this", and the object is returned as the result of the whole
"new" expression.

Before Sinon 4.1.3 the proxy called the original constructor directly
using the "thisValue" of the spied call; "thisValue" was the object
created by the "new" operator that called the proxy. The proxy assigned
"thisValue" to "returnValue", so it was also the value returned by the
proxy and, in turn, the value returned by the whole "new" expression.

Since Sinon 4.1.3 (see pull request 1626) the proxy calls the original
constructor using "new" instead of directly. The "thisValue" created by
the outermost "new" (the one that called the proxy) is no longer used by
the original constructor; the internal "new" creates a new object, which
is the one passed to the original constructor and returned by the
internal "new" expression. This object is also the value returned by the
proxy ("returnValue") and, in turn, the value returned by the whole
outermost "new" expression.

Thus, now "returnValue" should be used instead of "thisValue" to get the
object created by the spied constructor.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
6 years ago[tx-robot] updated from transifex
Nextcloud bot [Mon, 11 Dec 2017 01:10:34 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 10 Dec 2017 01:10:38 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 9 Dec 2017 01:10:36 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years agoMerge pull request #7409 from nextcloud/swift-retry-12
Roeland Jago Douma [Fri, 8 Dec 2017 08:26:41 +0000 (09:26 +0100)]
Merge pull request #7409 from nextcloud/swift-retry-12

[12]add retry wrapper when reading files from swift

6 years agoMerge pull request #7407 from nextcloud/12_7348
Morris Jobke [Fri, 8 Dec 2017 08:22:07 +0000 (09:22 +0100)]
Merge pull request #7407 from nextcloud/12_7348

[stable12] Check if owner of share exists

6 years agoMerge pull request #7323 from nextcloud/shared-jailed-source-root-12
Morris Jobke [Fri, 8 Dec 2017 08:03:03 +0000 (09:03 +0100)]
Merge pull request #7323 from nextcloud/shared-jailed-source-root-12

[12]Use the correct root for shared jail when the source storage is also a jail

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 8 Dec 2017 01:10:26 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 7 Dec 2017 01:10:49 +0000 (01:10 +0000)]
[tx-robot] updated from transifex

6 years agoadd retry wrapper when reading files from swift 7409/head
Robin Appelman [Mon, 4 Dec 2017 15:34:53 +0000 (16:34 +0100)]
add retry wrapper when reading files from swift

Signed-off-by: Robin Appelman <robin@icewind.nl>
6 years agoFix tests 7407/head
Roeland Jago Douma [Fri, 1 Dec 2017 11:34:37 +0000 (12:34 +0100)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>