]>
source.dussan.org Git - nextcloud-server.git/log
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
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
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
Nextcloud bot [Tue, 9 Jan 2018 01:11:29 +0000 (01:11 +0000)]
[tx-robot] updated from transifex
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
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>
Nextcloud bot [Mon, 8 Jan 2018 01:11:31 +0000 (01:11 +0000)]
[tx-robot] updated from transifex
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
Nextcloud bot [Sun, 7 Jan 2018 01:11:25 +0000 (01:11 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 6 Jan 2018 01:11:22 +0000 (01:11 +0000)]
[tx-robot] updated from transifex
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>
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
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>
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>
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>
Nextcloud bot [Fri, 5 Jan 2018 01:11:32 +0000 (01:11 +0000)]
[tx-robot] updated from transifex
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>
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>
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>
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>
Arthur Schiwon [Thu, 4 Jan 2018 12:16:05 +0000 (13:16 +0100)]
update autoloader
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
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>
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>
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>
Nextcloud bot [Thu, 4 Jan 2018 09:48:45 +0000 (09:48 +0000)]
[tx-robot] updated from transifex
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>
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>
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>
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>
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>
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>
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>
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>
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>
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
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>
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>
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>
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>
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
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
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>
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
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>
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>
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
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>
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
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
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>
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>
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>
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
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
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
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>
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>
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>
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
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>
Nextcloud bot [Mon, 11 Dec 2017 01:10:34 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 10 Dec 2017 01:10:38 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 9 Dec 2017 01:10:36 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
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
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
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
Nextcloud bot [Fri, 8 Dec 2017 01:10:26 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Thu, 7 Dec 2017 01:10:49 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
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>
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>
Roeland Jago Douma [Thu, 30 Nov 2017 20:29:06 +0000 (21:29 +0100)]
A failed storage is a not available storage
We have to double check. Since getting the info of the root returns a
generic entry. But actually the stroage is not available. Else we get
very weird sync and web behavior.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Nextcloud bot [Wed, 6 Dec 2017 01:10:37 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Tue, 5 Dec 2017 01:10:33 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Robin Appelman [Mon, 4 Dec 2017 14:16:39 +0000 (15:16 +0100)]
delay calculating the shared cache root until it's used
Signed-off-by: Robin Appelman <robin@icewind.nl>
Morris Jobke [Mon, 4 Dec 2017 10:13:19 +0000 (11:13 +0100)]
Merge pull request #7144 from nextcloud/rename-locks-stable12
Unlock files even if an exception occurs (stable12)
Morris Jobke [Mon, 4 Dec 2017 10:12:51 +0000 (11:12 +0100)]
Merge pull request #7322 from nextcloud/12-6303
[stable12] Set primary action button color to same as theming color
Morris Jobke [Mon, 4 Dec 2017 10:12:32 +0000 (11:12 +0100)]
Merge pull request #7353 from nextcloud/12-7346
[stable12] Fix translation of federation scope menu
Morris Jobke [Mon, 4 Dec 2017 10:06:01 +0000 (11:06 +0100)]
Merge pull request #7362 from nextcloud/12-7347
[stable12] Allow to skip data dir permission checks by config
Morris Jobke [Mon, 4 Dec 2017 07:17:45 +0000 (08:17 +0100)]
Merge pull request #7355 from nextcloud/12.0.4-final
Release 12.0.4
Nextcloud bot [Mon, 4 Dec 2017 01:10:42 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 3 Dec 2017 01:10:35 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 2 Dec 2017 01:10:44 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Arthur Schiwon [Thu, 30 Nov 2017 10:16:00 +0000 (11:16 +0100)]
Allow to skip data dir permission checks by config
Enables installation on services that don't allow/support permission
changes.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Nextcloud bot [Fri, 1 Dec 2017 01:10:32 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 30 Nov 2017 15:25:04 +0000 (16:25 +0100)]
Release 12.0.4
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 30 Nov 2017 10:11:40 +0000 (11:11 +0100)]
Fix translation of federation scope menu
* l10n in Nextcloud works by extracting the values only passed on their location and not based on the first parameter
* we need to change the translation pool from `core` to `settings` then
* fixes #7345
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Thu, 30 Nov 2017 01:13:31 +0000 (01:13 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Wed, 29 Nov 2017 01:10:26 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Tue, 28 Nov 2017 19:21:47 +0000 (20:21 +0100)]
Merge pull request #7330 from nextcloud/1204-rc3
12.0.4 RC3
Morris Jobke [Tue, 28 Nov 2017 19:19:23 +0000 (20:19 +0100)]
12.0.4 RC3
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Tue, 28 Nov 2017 19:16:32 +0000 (20:16 +0100)]
Merge pull request #7328 from nextcloud/backport/7327/access-list-regression-for-not-current-accesss
[stable12] Only in case of $currentAccess the array uses the id as index
Joas Schilling [Tue, 28 Nov 2017 15:38:16 +0000 (16:38 +0100)]
Only in case of $currentAccess the array uses the id as index
Otherwise its a normal string[] with the user ids, in that
case the array_merge did it's job just fine, apart from it
not being deduplicated.
The array+array is only needed when the user id is the key,
so integer only user ids are kept as they are instead of being
reindexed.
Regression from
3820d6883dffcaa49deb1054ae0f32ab3d3e39b1
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Tue, 28 Nov 2017 16:16:47 +0000 (17:16 +0100)]
Fix current access list test and add one for $currentAccess === false
Signed-off-by: Joas Schilling <coding@schilljs.com>
Robin Appelman [Fri, 10 Nov 2017 16:02:35 +0000 (17:02 +0100)]
Use the correct root for shared jail when the source storage is also a jail
Signed-off-by: Robin Appelman <robin@icewind.nl>
Jan-Christoph Borchardt [Tue, 29 Aug 2017 14:05:18 +0000 (16:05 +0200)]
Set primary action button color to same as theming color
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Nextcloud bot [Tue, 28 Nov 2017 01:10:05 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Mon, 27 Nov 2017 09:09:30 +0000 (10:09 +0100)]
Merge pull request #7261 from nextcloud/prepare-12.0.4-RC2
Prepare 12.0.4 RC2
Roeland Jago Douma [Mon, 27 Nov 2017 09:08:27 +0000 (10:08 +0100)]
Merge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webroot
[stable12] CSSResourceLocator: handle SCSS in apps outside root
Nextcloud bot [Mon, 27 Nov 2017 01:10:03 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 25 Nov 2017 01:10:10 +0000 (01:10 +0000)]
[tx-robot] updated from transifex