]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
7 years agofix unit tests 4093/head
Bjoern Schiessle [Mon, 3 Apr 2017 08:54:25 +0000 (10:54 +0200)]
fix unit tests

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agolet the user set an empty password for share link
Timo Benk [Mon, 17 Oct 2016 12:23:55 +0000 (14:23 +0200)]
let the user set an empty password for share link

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agoendorseLinkPassword changed to enableLinkPasswordByDefault
Timo Benk [Mon, 17 Oct 2016 07:11:30 +0000 (09:11 +0200)]
endorseLinkPassword changed to enableLinkPasswordByDefault

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agofeature endorse password for share links
Timo Benk [Fri, 14 Oct 2016 07:58:24 +0000 (09:58 +0200)]
feature endorse password for share links

works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set.

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
7 years agofeature endorse password for share links
Bjoern Schiessle [Mon, 27 Mar 2017 13:11:13 +0000 (15:11 +0200)]
feature endorse password for share links

works like "enforce password protection", but let the
user optionally remove the password protection after the
password is set. by Timo Benk

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

7 years agoMerge pull request #4183 from nextcloud/css-shortcuts-view
Lukas Reschke [Sun, 2 Apr 2017 14:45:07 +0000 (16:45 +0200)]
Merge pull request #4183 from nextcloud/css-shortcuts-view

Add CSS for styling of keyboard shortcuts view

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sun, 2 Apr 2017 00:07:48 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4139 from nextcloud/phpseclib
Roeland Jago Douma [Sat, 1 Apr 2017 12:00:25 +0000 (14:00 +0200)]
Merge pull request #4139 from nextcloud/phpseclib

[3rdparty] Bump phpseclib to 2.0.4

7 years agoMerge pull request #4174 from nextcloud/mergejs-newline
Christoph Wurst [Sat, 1 Apr 2017 06:38:47 +0000 (08:38 +0200)]
Merge pull request #4174 from nextcloud/mergejs-newline

mergejs should print a newline between imports

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Sat, 1 Apr 2017 00:08:09 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agomergejs should print a newline between imports 4174/head
Roeland Jago Douma [Fri, 31 Mar 2017 15:06:38 +0000 (17:06 +0200)]
mergejs should print a newline between imports

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #3438 from nextcloud/external-storage-user-folder
Roeland Jago Douma [Fri, 31 Mar 2017 13:07:39 +0000 (15:07 +0200)]
Merge pull request #3438 from nextcloud/external-storage-user-folder

Allow using '/' as external storage mountpoint

7 years agoMerge pull request #4140 from nextcloud/no_encryption_no_wrapper
Björn Schießle [Fri, 31 Mar 2017 12:49:38 +0000 (14:49 +0200)]
Merge pull request #4140 from nextcloud/no_encryption_no_wrapper

Don't add the Encryption Storage Wrapper if there are no encryption modules

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Fri, 31 Mar 2017 00:08:35 +0000 (00:08 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #3832 from nextcloud/fix_1303
Roeland Jago Douma [Thu, 30 Mar 2017 16:25:50 +0000 (18:25 +0200)]
Merge pull request #3832 from nextcloud/fix_1303

Do not clear CSRF token on logout (fix for #1303)

7 years agofix setup of external storage integration tests 4140/head
Robin Appelman [Thu, 30 Mar 2017 15:16:59 +0000 (17:16 +0200)]
fix setup of external storage integration tests

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4150 from nextcloud/capped-memcache-push
Joas Schilling [Thu, 30 Mar 2017 13:16:33 +0000 (15:16 +0200)]
Merge pull request #4150 from nextcloud/capped-memcache-push

support pushing to CappedMemoryCache

7 years agoMerge pull request #4128 from nextcloud/updateclipboard
Joas Schilling [Thu, 30 Mar 2017 12:37:03 +0000 (14:37 +0200)]
Merge pull request #4128 from nextcloud/updateclipboard

Update clipboard.js

7 years agoMerge pull request #4143 from nextcloud/ldap-downstream-64
Roeland Jago Douma [Thu, 30 Mar 2017 12:10:21 +0000 (14:10 +0200)]
Merge pull request #4143 from nextcloud/ldap-downstream-64

Correctly apply quota

7 years agoMerge pull request #3089 from nextcloud/cache-move-single-query
Roeland Jago Douma [Thu, 30 Mar 2017 12:08:31 +0000 (14:08 +0200)]
Merge pull request #3089 from nextcloud/cache-move-single-query

Move all children of a folder in a single query

7 years agoAdd CSS for styling of keyboard shortcuts view 4183/head
Jan-Christoph Borchardt [Thu, 30 Mar 2017 11:07:26 +0000 (13:07 +0200)]
Add CSS for styling of keyboard shortcuts view

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agouser ids are strings 4150/head
Robin Appelman [Thu, 30 Mar 2017 10:24:46 +0000 (12:24 +0200)]
user ids are strings

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agosupport pushing to CappedMemoryCache
Robin Appelman [Wed, 29 Mar 2017 17:16:12 +0000 (19:16 +0200)]
support pushing to CappedMemoryCache

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agorename fun to func 3089/head
Robin Appelman [Sun, 26 Mar 2017 18:45:49 +0000 (20:45 +0200)]
rename fun to func

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd tests for query builder (i)like
Robin Appelman [Tue, 21 Feb 2017 13:48:00 +0000 (14:48 +0100)]
Add tests for query builder (i)like

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agodont double escape
Robin Appelman [Thu, 26 Jan 2017 11:15:26 +0000 (12:15 +0100)]
dont double escape

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoupdate autoloader
Robin Appelman [Thu, 26 Jan 2017 11:02:09 +0000 (12:02 +0100)]
update autoloader

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agofix licence headers
Robin Appelman [Wed, 18 Jan 2017 14:47:05 +0000 (15:47 +0100)]
fix licence headers

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMove all children of a folder in a single query
Robin Appelman [Mon, 16 Jan 2017 15:20:53 +0000 (16:20 +0100)]
Move all children of a folder in a single query

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd function builder to the query builder
Robin Appelman [Mon, 16 Jan 2017 14:31:04 +0000 (15:31 +0100)]
Add function builder to the query builder

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoadd support for escaping like parameters when using the query builder
Robin Appelman [Mon, 16 Jan 2017 14:12:30 +0000 (15:12 +0100)]
add support for escaping like parameters when using the query builder

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoAdd MD5() to sqlite
Robin Appelman [Mon, 16 Jan 2017 15:16:32 +0000 (16:16 +0100)]
Add MD5() to sqlite

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4132 from nextcloud/fix-safari-gzip
Lukas Reschke [Thu, 30 Mar 2017 08:47:28 +0000 (10:47 +0200)]
Merge pull request #4132 from nextcloud/fix-safari-gzip

Fix gzip files for Safari

7 years ago[3rdparty] Bump phpseclib to 2.0.4 4139/head
Roeland Jago Douma [Wed, 29 Mar 2017 10:14:57 +0000 (12:14 +0200)]
[3rdparty] Bump phpseclib to 2.0.4

See: https://github.com/phpseclib/phpseclib/blob/master/CHANGELOG.md

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4100 from nextcloud/header-indicator
Morris Jobke [Thu, 30 Mar 2017 03:43:18 +0000 (21:43 -0600)]
Merge pull request #4100 from nextcloud/header-indicator

show triangle below user menu too when an entry inside there is active

7 years ago[tx-robot] updated from transifex
Nextcloud bot [Thu, 30 Mar 2017 00:07:41 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4142 from nextcloud/numeric_avatar
Morris Jobke [Wed, 29 Mar 2017 23:17:19 +0000 (17:17 -0600)]
Merge pull request #4142 from nextcloud/numeric_avatar

Allow avatars for full numeric users

7 years agoMerge pull request #4141 from nextcloud/ldap-downstream-9
Morris Jobke [Wed, 29 Mar 2017 21:47:28 +0000 (15:47 -0600)]
Merge pull request #4141 from nextcloud/ldap-downstream-9

Convert the group limit to match the same behaviour as the user search

7 years agoFix tests 4142/head
Roeland Jago Douma [Wed, 29 Mar 2017 20:54:08 +0000 (22:54 +0200)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4145 from nextcloud/ldap-downstream-54
Roeland Jago Douma [Wed, 29 Mar 2017 17:31:35 +0000 (19:31 +0200)]
Merge pull request #4145 from nextcloud/ldap-downstream-54

Add tooltips to LDAP wizard special attributtes

7 years agoMerge pull request #4108 from nextcloud/color-variable-rename
Roeland Jago Douma [Wed, 29 Mar 2017 17:13:36 +0000 (19:13 +0200)]
Merge pull request #4108 from nextcloud/color-variable-rename

rename confusing getMailHeaderColor to getColorPrimary, ref #3491

7 years agoMerge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid
Roeland Jago Douma [Wed, 29 Mar 2017 17:12:51 +0000 (19:12 +0200)]
Merge pull request #3329 from andreas-p/ldap_no-memberof-with-memberuid

Ldap no memberof with memberuid

7 years agoDon't add the Encryption Storage Wrapper if there are no encryption modules
Roeland Jago Douma [Wed, 29 Mar 2017 10:23:46 +0000 (12:23 +0200)]
Don't add the Encryption Storage Wrapper if there are no encryption modules

fixes #4125

If there is no encryption module enabled it makes no sense to setup the
encryption wrapper (because we can't do anything anyway).

This saves reading the header of files.
Especialy on external storage/objectstore this should improve
performance

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4062 from nextcloud/downstream-26872
Morris Jobke [Wed, 29 Mar 2017 16:30:22 +0000 (10:30 -0600)]
Merge pull request #4062 from nextcloud/downstream-26872

Adding dav resource for avatars

7 years agoalso rename defaultMailHeaderColor to defaultColorPrimary 4108/head
Jan-Christoph Borchardt [Tue, 28 Mar 2017 16:10:02 +0000 (18:10 +0200)]
also rename defaultMailHeaderColor to defaultColorPrimary

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoAdd fallback to getMailHeaderColor so we don't break existing themes
Julius Härtl [Tue, 28 Mar 2017 11:29:59 +0000 (13:29 +0200)]
Add fallback to getMailHeaderColor so we don't break existing themes

Signed-off-by: Julius Härtl <jus@bitgrid.net>
7 years agorename confusing getMailHeaderColor to getColorPrimary, ref #3491
Jan-Christoph Borchardt [Mon, 27 Mar 2017 23:37:47 +0000 (01:37 +0200)]
rename confusing getMailHeaderColor to getColorPrimary, ref #3491

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years agoAdd tooltips to LDAP wizard special attributtes 4145/head
David Toledo [Thu, 16 Feb 2017 13:42:11 +0000 (14:42 +0100)]
Add tooltips to LDAP wizard special attributtes

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Update settings.php

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoAllow avatars for full numeric users
Roeland Jago Douma [Wed, 29 Mar 2017 11:39:48 +0000 (13:39 +0200)]
Allow avatars for full numeric users

Fixes #4087

Because of fancy javascript if a full numeric uid was used javascript
would convert this to an int. Now we just convert everything to a string
first.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoInclude tests for "default" and "none" quotas 4143/head
Juan Pablo Villafáñez [Fri, 17 Mar 2017 12:02:08 +0000 (13:02 +0100)]
Include tests for "default" and "none" quotas

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoAdd comments in the updateQuota method to explain the behavior
Juan Pablo Villafáñez [Fri, 17 Mar 2017 11:56:27 +0000 (12:56 +0100)]
Add comments in the updateQuota method to explain the behavior

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoAdd new testes to cover more cases
Juan Pablo Villafáñez [Thu, 16 Mar 2017 11:22:02 +0000 (12:22 +0100)]
Add new testes to cover more cases

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoAdjust current tests to match the expectations
Juan Pablo Villafáñez [Wed, 15 Mar 2017 07:55:14 +0000 (08:55 +0100)]
Adjust current tests to match the expectations

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoCheck if the user exists before trying to set the quota
Juan Pablo Villafáñez [Tue, 14 Mar 2017 16:08:05 +0000 (17:08 +0100)]
Check if the user exists before trying to set the quota

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoCorrectly apply quota
Juan Pablo Villafáñez [Tue, 14 Mar 2017 13:07:33 +0000 (14:07 +0100)]
Correctly apply quota

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoConvert the group limit to match the same behaviour as the user search 4141/head
Juan Pablo Villafáñez [Tue, 12 Jul 2016 07:04:48 +0000 (09:04 +0200)]
Convert the group limit to match the same behaviour as the user search

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
7 years agoMerge pull request #4116 from nextcloud/swift-cache-token
Roeland Jago Douma [Wed, 29 Mar 2017 09:23:13 +0000 (11:23 +0200)]
Merge pull request #4116 from nextcloud/swift-cache-token

Cache swift authentication token in memcache

7 years agoMerge pull request #4066 from nextcloud/always-fix-the-values-live
Roeland Jago Douma [Wed, 29 Mar 2017 08:13:10 +0000 (10:13 +0200)]
Merge pull request #4066 from nextcloud/always-fix-the-values-live

Directly fix invalid values of DTEND and DTSTART

7 years agoMerge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-p
Joas Schilling [Wed, 29 Mar 2017 08:02:10 +0000 (10:02 +0200)]
Merge pull request #4130 from nextcloud/replace-useless-print-unescaped-with-p

Replace unecessary unescaped prints with print

7 years agoMerge pull request #4129 from nextcloud/remove-verbose-error-message
Joas Schilling [Wed, 29 Mar 2017 08:01:17 +0000 (10:01 +0200)]
Merge pull request #4129 from nextcloud/remove-verbose-error-message

Remove verbose error message

7 years agoMerge pull request #4060 from nextcloud/shared_by_for_own_calendars
Morris Jobke [Wed, 29 Mar 2017 06:29:54 +0000 (00:29 -0600)]
Merge pull request #4060 from nextcloud/shared_by_for_own_calendars

fix bug with shared_by for own calendars if shared

7 years agoFix gzip files for Safari 4132/head
Morris Jobke [Wed, 29 Mar 2017 06:11:51 +0000 (00:11 -0600)]
Fix gzip files for Safari

* Safari support gzip only if the filename does not
  end on .gz - so this renames them to .gzip

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoMerge pull request #4091 from nextcloud/Rudloff-manifest
Morris Jobke [Wed, 29 Mar 2017 03:36:54 +0000 (21:36 -0600)]
Merge pull request #4091 from nextcloud/Rudloff-manifest

Web app manifest for adding to Android home screen

7 years agoFix unit tests 4091/head
Morris Jobke [Wed, 29 Mar 2017 00:44:15 +0000 (18:44 -0600)]
Fix unit tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoWeb app manifest
Pierre Rudloff [Tue, 20 Sep 2016 15:24:29 +0000 (17:24 +0200)]
Web app manifest

Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
7 years ago[tx-robot] updated from transifex
Nextcloud bot [Wed, 29 Mar 2017 00:07:41 +0000 (00:07 +0000)]
[tx-robot] updated from transifex

7 years agoMerge pull request #4120 from nextcloud/newest-item-first-in-activity
Morris Jobke [Tue, 28 Mar 2017 23:51:30 +0000 (17:51 -0600)]
Merge pull request #4120 from nextcloud/newest-item-first-in-activity

Change the order on merging activities so the newest item is first

7 years agoMerge pull request #4126 from nextcloud/better-empty-content-in-the-sidebar
Morris Jobke [Tue, 28 Mar 2017 23:50:10 +0000 (17:50 -0600)]
Merge pull request #4126 from nextcloud/better-empty-content-in-the-sidebar

Better styling of the empty content messages in the sidebar

7 years agoMerge pull request #4127 from nextcloud/update-legacy-csp-policy
Morris Jobke [Tue, 28 Mar 2017 23:47:32 +0000 (17:47 -0600)]
Merge pull request #4127 from nextcloud/update-legacy-csp-policy

Update legacy CSP policy

7 years agoMerge pull request #4121 from nextcloud/split-sharing-integration-tests
Morris Jobke [Tue, 28 Mar 2017 23:24:40 +0000 (17:24 -0600)]
Merge pull request #4121 from nextcloud/split-sharing-integration-tests

Split long running features/sharing-v1.feature into two smaller parts

7 years agoMerge pull request #4070 from nextcloud/gzip_scss_js
Morris Jobke [Tue, 28 Mar 2017 23:11:17 +0000 (17:11 -0600)]
Merge pull request #4070 from nextcloud/gzip_scss_js

GZip generated CSS/JS files

7 years agoSplit long running features/sharing-v1.feature into two smaller parts 4121/head
Morris Jobke [Tue, 28 Mar 2017 15:57:18 +0000 (09:57 -0600)]
Split long running features/sharing-v1.feature into two smaller parts

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoReplace unecessary unescaped prints with print 4130/head
Lukas Reschke [Tue, 28 Mar 2017 22:42:22 +0000 (00:42 +0200)]
Replace unecessary unescaped prints with print

There's no need to have those unescaped from what I can see.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoRemove verbose error message 4129/head
Lukas Reschke [Tue, 28 Mar 2017 22:34:33 +0000 (00:34 +0200)]
Remove verbose error message

There's no need to have this included in the error message.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoUse minified clipboard.js 4128/head
Roeland Jago Douma [Tue, 28 Mar 2017 22:27:50 +0000 (00:27 +0200)]
Use minified clipboard.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoUpdate clipboard.js
Roeland Jago Douma [Tue, 28 Mar 2017 22:26:05 +0000 (00:26 +0200)]
Update clipboard.js

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoDon't output jpeg if we request png 4062/head
Roeland Jago Douma [Sun, 26 Mar 2017 09:54:29 +0000 (11:54 +0200)]
Don't output jpeg if we request png

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoFix PHPDoc
Lukas Reschke [Sun, 26 Mar 2017 09:34:21 +0000 (11:34 +0200)]
Fix PHPDoc

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix inspection results
Roeland Jago Douma [Sun, 26 Mar 2017 09:32:29 +0000 (11:32 +0200)]
Fix inspection results

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoAdding AvatarNodeTest
Thomas Müller [Tue, 21 Mar 2017 22:34:37 +0000 (23:34 +0100)]
Adding AvatarNodeTest

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdding AvatarHomeTest
Thomas Müller [Tue, 21 Mar 2017 22:10:39 +0000 (23:10 +0100)]
Adding AvatarHomeTest

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoReturn last modification time to allow proper listing in cadaver
Thomas Müller [Fri, 23 Dec 2016 12:44:40 +0000 (13:44 +0100)]
Return last modification time to allow proper listing in cadaver

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoAdding dav resource for avatars
Thomas Müller [Fri, 23 Dec 2016 11:12:38 +0000 (12:12 +0100)]
Adding dav resource for avatars

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
7 years agoUpdate legacy CSP policy 4127/head
Lukas Reschke [Tue, 28 Mar 2017 21:55:31 +0000 (23:55 +0200)]
Update legacy CSP policy

Aligns it with the one enforced by the AppFramework

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
7 years agoFix controller tests 4070/head
Roeland Jago Douma [Tue, 28 Mar 2017 21:42:20 +0000 (23:42 +0200)]
Fix controller tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoBetter styling of the empty content messages in the sidebar 4126/head
Joas Schilling [Tue, 28 Mar 2017 21:26:10 +0000 (23:26 +0200)]
Better styling of the empty content messages in the sidebar

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agoFix tests
Roeland Jago Douma [Tue, 28 Mar 2017 21:13:59 +0000 (23:13 +0200)]
Fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4054 from nextcloud/inlinejsfirst
Joas Schilling [Tue, 28 Mar 2017 20:36:50 +0000 (22:36 +0200)]
Merge pull request #4054 from nextcloud/inlinejsfirst

Moving the inline js before the CSS

7 years agoMoving the inline js before the CSS 4054/head
Roeland Jago Douma [Sat, 25 Mar 2017 14:33:28 +0000 (15:33 +0100)]
Moving the inline js before the CSS

This allows browsers to do smarted parallel downloads

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoMerge pull request #4004 from nextcloud/backport-27172
Roeland Jago Douma [Tue, 28 Mar 2017 19:56:44 +0000 (21:56 +0200)]
Merge pull request #4004 from nextcloud/backport-27172

Remove SharedCache::getNumericStorageId to let CacheWrapper do it

7 years agoAllow to gzip CSS/JS files
Roeland Jago Douma [Sun, 26 Mar 2017 14:30:08 +0000 (16:30 +0200)]
Allow to gzip CSS/JS files

Since in production the SCSS files are compiled once and the javascript
files are combined once we can just as well gzip them aggresively.

This means that once they are requested and the browser supports gzip we
can just serve the gzipped file saving precious bandwidth.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
7 years agoserialize the token to json instead of using php's serialize 4116/head
Robin Appelman [Tue, 28 Mar 2017 19:31:50 +0000 (21:31 +0200)]
serialize the token to json instead of using php's serialize

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agocache swift tokens in memcache
Robin Appelman [Tue, 28 Mar 2017 11:06:09 +0000 (13:06 +0200)]
cache swift tokens in memcache

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoupdate rackspace/opencloud to 1.16.0
Robin Appelman [Tue, 28 Mar 2017 11:05:45 +0000 (13:05 +0200)]
update rackspace/opencloud to 1.16.0

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4112 from nextcloud/swift-config
Robin Appelman [Tue, 28 Mar 2017 15:51:18 +0000 (17:51 +0200)]
Merge pull request #4112 from nextcloud/swift-config

Better error messages for objectsack swift configuration

7 years agoChange the order on merging activities so the newest item is first 4120/head
Joas Schilling [Tue, 28 Mar 2017 15:19:34 +0000 (17:19 +0200)]
Change the order on merging activities so the newest item is first

Signed-off-by: Joas Schilling <coding@schilljs.com>
7 years agobetter error messages for invalid regions, urltypes and service names 4112/head
Robin Appelman [Tue, 28 Mar 2017 09:39:25 +0000 (11:39 +0200)]
better error messages for invalid regions, urltypes and service names

Signed-off-by: Robin Appelman <robin@icewind.nl>
7 years agoMerge pull request #4101 from nextcloud/header-detail
Morris Jobke [Tue, 28 Mar 2017 14:57:09 +0000 (08:57 -0600)]
Merge pull request #4101 from nextcloud/header-detail

show active indicator on current app even when hovering other icons

7 years agobetter error messages when swift authentication fails
Robin Appelman [Tue, 28 Mar 2017 09:02:18 +0000 (11:02 +0200)]
better error messages when swift authentication fails

Signed-off-by: Robin Appelman <robin@icewind.nl>