]>
source.dussan.org Git - nextcloud-server.git/log
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>
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>
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
Lukas Reschke [Fri, 24 Nov 2017 13:40:36 +0000 (14:40 +0100)]
Merge pull request #7277 from nextcloud/12-7268
[stable12] Update CRL due to files_frommail
Morris Jobke [Thu, 23 Nov 2017 16:56:58 +0000 (17:56 +0100)]
Update CRL due to files_frommail
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Fri, 24 Nov 2017 01:10:06 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 23 Nov 2017 12:54:46 +0000 (13:54 +0100)]
Merge pull request #7262 from nextcloud/backport/7168/files-access-list-with-integer-userid
[stable12] Fix accesslist when a user has an ID only containting 0-9
Morris Jobke [Thu, 23 Nov 2017 12:46:08 +0000 (13:46 +0100)]
Merge pull request #7245 from nextcloud/feature/noid/allow-migration-from-comingup-oc-release
Allow migration from upcoming 10.0.4 ownCloud release
Joas Schilling [Tue, 14 Nov 2017 16:21:16 +0000 (17:21 +0100)]
Fix accesslist when a user has an ID only containting 0-9
Signed-off-by: Joas Schilling <coding@schilljs.com>
Morris Jobke [Thu, 23 Nov 2017 12:02:20 +0000 (13:02 +0100)]
Prepare 12.0.4 RC2
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 23 Nov 2017 12:00:37 +0000 (13:00 +0100)]
Merge pull request #7259 from nextcloud/7211-stable12
[stable12] only replace permission popupmenu
Arthur Schiwon [Fri, 17 Nov 2017 16:08:29 +0000 (17:08 +0100)]
only replace permission popupmenu
the contacts popovermenu is also present and is being replaces, ending
up in two permission popupmenus with checkboxes duplicating the id,
breaking further permission changes.
plus, fixing a selector
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
Kyle Fazzari [Thu, 23 Nov 2017 05:30:21 +0000 (21:30 -0800)]
CSSResourceLocator: handle SCSS in apps outside root
Currently static CSS files work fine in apps outside of the root.
However, as soon as an app uses SCSS, Nextcloud starts being unable to
find the web root.
Fix this problem by backporting select snippets from master
specifically targeting this issue, and add a test to ensure it doesn't
regress.
Fix #5289
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
Nextcloud bot [Thu, 23 Nov 2017 01:09:59 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Joas Schilling [Wed, 22 Nov 2017 13:02:22 +0000 (14:02 +0100)]
Allow migration from upcoming 10.0.4 ownCloud release
Signed-off-by: Joas Schilling <coding@schilljs.com>
Nextcloud bot [Wed, 22 Nov 2017 01:10:22 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Tue, 21 Nov 2017 01:10:20 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Mon, 20 Nov 2017 11:59:47 +0000 (12:59 +0100)]
Merge pull request #7225 from nextcloud/12.0.4RC-version
12.0.4 RC
Roeland Jago Douma [Mon, 20 Nov 2017 11:58:10 +0000 (12:58 +0100)]
Merge pull request #7170 from kyrofa/backport/6028/app_path_realpath
[stable12] {J,CS}SResourceLocator: account for symlinks in app path
Morris Jobke [Mon, 20 Nov 2017 10:43:33 +0000 (11:43 +0100)]
12.0.4 RC
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Mon, 20 Nov 2017 01:09:53 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 19 Nov 2017 01:10:04 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 18 Nov 2017 01:10:56 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Björn Schießle [Fri, 17 Nov 2017 13:48:53 +0000 (14:48 +0100)]
Merge pull request #7207 from nextcloud/fix-object-storage-touch-12
[stable12] touch opertation on object storage, don't create the file cache entry to early
Bjoern Schiessle [Fri, 17 Nov 2017 10:59:25 +0000 (11:59 +0100)]
only create the file cache entry after the empty file was created successfully, otherwise file_exists() call on the initial file_put_content() will indicate that the file already exists
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
Björn Schießle [Fri, 17 Nov 2017 11:44:40 +0000 (12:44 +0100)]
Merge pull request #7186 from nextcloud/s3-download-stream-fix-12
[12] Fix s3 download and touch
Nextcloud bot [Fri, 17 Nov 2017 01:10:03 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Thu, 16 Nov 2017 01:10:03 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Robin Appelman [Wed, 8 Nov 2017 16:51:02 +0000 (17:51 +0100)]
Use non empty files for object store touch
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Wed, 8 Nov 2017 16:50:46 +0000 (17:50 +0100)]
Fix contructing headers for s3 download
Signed-off-by: Robin Appelman <robin@icewind.nl>
Nextcloud bot [Wed, 15 Nov 2017 01:10:00 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Kyle Fazzari [Tue, 14 Nov 2017 17:22:33 +0000 (09:22 -0800)]
{J,CS}SResourceLocator: account for symlinks in app path
Currently, if the app path includes a symlink, the calculated webDir
will be incorrect when generating CSS and URLs will be pointing to the
wrong place, breaking CSS.
Use realpath when retrieving app path, and these issues go away.
Fix #6028
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
Nextcloud bot [Tue, 14 Nov 2017 01:09:59 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Mon, 13 Nov 2017 01:10:31 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 12 Nov 2017 01:10:15 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 11 Nov 2017 01:10:24 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
blizzz [Fri, 10 Nov 2017 14:48:37 +0000 (15:48 +0100)]
Merge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12
[stable12] Improve text: 'you have now' -> 'you now have'
Nextcloud bot [Fri, 10 Nov 2017 01:10:05 +0000 (01:10 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Thu, 9 Nov 2017 16:16:00 +0000 (17:16 +0100)]
Merge pull request #7120 from nextcloud/12-6988
[stable12] Improve performance of UserMountCache with external storage folders
Roeland Jago Douma [Thu, 9 Nov 2017 10:37:38 +0000 (11:37 +0100)]
Merge pull request #7116 from nextcloud/12-fix-6033
[stable12] Fix icon for security settings
Roeland Jago Douma [Thu, 9 Nov 2017 10:02:25 +0000 (11:02 +0100)]
Merge pull request #7118 from nextcloud/12-7109
[stable12] If for some reason the json can't be decoded it is not cached
Nextcloud bot [Thu, 9 Nov 2017 09:12:53 +0000 (09:12 +0000)]
[tx-robot] updated from transifex
Dariusz Olszewski [Fri, 27 Oct 2017 21:22:35 +0000 (23:22 +0200)]
Improve performance of UserMountCache with external storage folders
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Roeland Jago Douma [Wed, 8 Nov 2017 11:37:35 +0000 (12:37 +0100)]
If for some reason the json can't be decoded it is not cached
Should fix #6898
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Morris Jobke [Thu, 9 Nov 2017 08:34:24 +0000 (09:34 +0100)]
Merge pull request #6847 from nextcloud/filelist-confict-path-12
[12] still trigger conflict resolution for existing entries when the curre…
Morris Jobke [Thu, 9 Nov 2017 08:24:35 +0000 (09:24 +0100)]
Fix welcome text for better grammar in themed instances
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Thu, 9 Nov 2017 08:13:31 +0000 (09:13 +0100)]
Fix icon for security settings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Nextcloud bot [Thu, 9 Nov 2017 01:09:28 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 8 Nov 2017 21:35:19 +0000 (22:35 +0100)]
Merge pull request #7114 from nextcloud/12-7110
[stable12] theme flow redirection page
Julius Härtl [Wed, 8 Nov 2017 12:04:35 +0000 (13:04 +0100)]
Theming: theme flow redirection page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Morris Jobke [Wed, 8 Nov 2017 09:33:35 +0000 (10:33 +0100)]
Merge pull request #7102 from nextcloud/revert-6774-backport-6645-only-colons-for-ipv6
Revert "[stable12] Only allow colons in db host for IPv6 addresses"
Nextcloud bot [Wed, 8 Nov 2017 01:09:33 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Tue, 7 Nov 2017 23:42:34 +0000 (00:42 +0100)]
Revert "[stable12] Only allow colons in db host for IPv6 addresses"
Lukas Reschke [Tue, 7 Nov 2017 20:58:02 +0000 (21:58 +0100)]
Merge pull request #7096 from nextcloud/backport-stable12-7042
[stable12] ensure uid for calendar objects is unique
Robin Appelman [Wed, 18 Oct 2017 13:16:51 +0000 (15:16 +0200)]
never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Mon, 16 Oct 2017 14:15:15 +0000 (16:15 +0200)]
still trigger conflict resolution for existing entries when the current entry doesn't need it
Signed-off-by: Robin Appelman <robin@icewind.nl>
Morris Jobke [Tue, 7 Nov 2017 13:45:06 +0000 (14:45 +0100)]
Merge pull request #6699 from nextcloud/backport-6522-stable12
[stable12] fix LDAP User deletion (cleanup), fixes #3365
Morris Jobke [Tue, 7 Nov 2017 12:51:20 +0000 (13:51 +0100)]
Merge pull request #7095 from nextcloud/12-7059
[stable12] hide spinner for initial install
Georg Ehrke [Wed, 1 Nov 2017 21:00:53 +0000 (22:00 +0100)]
ensure uid for calendar objects is unique
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Kyle Fazzari [Fri, 3 Nov 2017 20:54:56 +0000 (13:54 -0700)]
core: hide spinner for initial install
core/js/setup.js has logic to show the spinner upon form submission, but
ever since v12 was released the spinner was never hidden in the first
place.
Modify core/css/guest.css to hide it, which allows core/js/setup.js to
do its thing.
Fix #5532
Signed-off-by: Kyle Fazzari <kyrofa@ubuntu.com>
Nextcloud bot [Tue, 7 Nov 2017 01:09:08 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 6 Nov 2017 19:21:35 +0000 (20:21 +0100)]
Merge pull request #7082 from nextcloud/12-6974
[stable12] Fix seeking on object storage
Morris Jobke [Mon, 6 Nov 2017 17:45:32 +0000 (18:45 +0100)]
Merge pull request #7081 from nextcloud/12-6958
[stable12] Improve mimetype detection for object storages
Morris Jobke [Thu, 26 Oct 2017 14:47:54 +0000 (16:47 +0200)]
Fix seeking on object storage
Seeking is not needed if the $from is 0, because then the pointer is already at the correct position. Additionally another fallback is added, that if the fseek fails it just uses an fread to skip the beginning of the file until it is at the correct position. This skipping is done with a chunked fread.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Mon, 6 Nov 2017 14:26:16 +0000 (15:26 +0100)]
Merge pull request #7079 from nextcloud/s3-read-object-fopen-stable12
use fopen directly when reading objects from s3
Morris Jobke [Wed, 25 Oct 2017 15:57:21 +0000 (17:57 +0200)]
Improve mimetype detection for object storages
Object storage instances always fall back to the content based mimetype detection, because the file name for object storage was always random due to the fact that it was temporarily storage in a generated temp file. This patch adds a check before that to make sure to use the original file name for this purpose and also remove possible other extensions like the versioning or part file extension.
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Robin Appelman [Thu, 26 Oct 2017 15:05:09 +0000 (17:05 +0200)]
use fopen directly when reading objects from s3
Signed-off-by: Robin Appelman <robin@icewind.nl>
Nextcloud bot [Mon, 6 Nov 2017 01:09:19 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 5 Nov 2017 01:09:07 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 4 Nov 2017 01:09:10 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Fri, 3 Nov 2017 01:09:18 +0000 (01:09 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Thu, 2 Nov 2017 01:11:03 +0000 (01:11 +0000)]
[tx-robot] updated from transifex
Joas Schilling [Wed, 1 Nov 2017 20:30:55 +0000 (21:30 +0100)]
Merge pull request #7040 from nextcloud/7039_12
[stable12] Translate Grant Access
Roeland Jago Douma [Wed, 1 Nov 2017 14:50:34 +0000 (15:50 +0100)]
Translate Grant Access
Fixes #7038
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Nextcloud bot [Wed, 1 Nov 2017 01:08:55 +0000 (01:08 +0000)]
[tx-robot] updated from transifex
Jan-Christoph Borchardt [Tue, 31 Oct 2017 17:15:20 +0000 (18:15 +0100)]
Merge pull request #7028 from nextcloud/stable12-login-readability
[stable12] Better readability for text on log in page which is directly on backgrounds
Joas Schilling [Tue, 31 Oct 2017 13:47:34 +0000 (14:47 +0100)]
Merge pull request #6878 from nextcloud/allow-migrating-from-10.0.3.3
Allow to migrate from 10.0.3.3
Jan-Christoph Borchardt [Mon, 30 Oct 2017 16:57:25 +0000 (17:57 +0100)]
Better readability for text on log in page which is directly on backgrounds
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
Nextcloud bot [Tue, 31 Oct 2017 01:08:41 +0000 (01:08 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Mon, 30 Oct 2017 11:58:17 +0000 (12:58 +0100)]
Merge pull request #6987 from burned42/stable12-6307-fix_page_title_not_changed
#6307 fix page title not changed (stable12)
Nextcloud bot [Mon, 30 Oct 2017 01:08:44 +0000 (01:08 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sun, 29 Oct 2017 00:08:41 +0000 (00:08 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Sat, 28 Oct 2017 00:08:41 +0000 (00:08 +0000)]
[tx-robot] updated from transifex
Bernd Stellwag [Wed, 18 Oct 2017 17:55:30 +0000 (19:55 +0200)]
bugfix: set/change page title when switching to file tags
Signed-off-by: Bernd Stellwag <burned@zerties.org>
Bernd Stellwag [Wed, 18 Oct 2017 17:51:40 +0000 (19:51 +0200)]
bugfix: set/change page title when switching to filelist
Signed-off-by: Bernd Stellwag <burned@zerties.org>
Nextcloud bot [Fri, 27 Oct 2017 00:08:39 +0000 (00:08 +0000)]
[tx-robot] updated from transifex
Nextcloud bot [Thu, 26 Oct 2017 00:08:49 +0000 (00:08 +0000)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 25 Oct 2017 12:42:46 +0000 (14:42 +0200)]
Merge pull request #6935 from nextcloud/12-5780
Backport of translation string fixes
Morris Jobke [Wed, 25 Oct 2017 12:42:20 +0000 (14:42 +0200)]
Merge vendor/core.js
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Morris Jobke [Wed, 25 Oct 2017 12:33:49 +0000 (14:33 +0200)]
Merge pull request #6944 from nextcloud/12-6433
[stable12] Fix uninitialized variable $this->params
Morris Jobke [Wed, 25 Oct 2017 12:33:20 +0000 (14:33 +0200)]
Merge pull request #6946 from nextcloud/12-6574
[stable12] Fix undefined offset warning when using '/' as external storage root
Joas Schilling [Wed, 25 Oct 2017 09:51:24 +0000 (11:51 +0200)]
Merge pull request #6942 from nextcloud/12-6826
[stable12] Fix class name in exception logger plugin
blizzz [Wed, 25 Oct 2017 09:41:39 +0000 (11:41 +0200)]
Merge pull request #6943 from nextcloud/12-6758
[stable12] Allow quota of 0 again
Roeland Jago Douma [Wed, 25 Oct 2017 06:53:37 +0000 (08:53 +0200)]
Merge pull request #6945 from nextcloud/12-6633
[stable12] Don't add a LIKE condition when it's not needed
Nextcloud bot [Wed, 25 Oct 2017 00:08:56 +0000 (00:08 +0000)]
[tx-robot] updated from transifex
Robin Appelman [Tue, 19 Sep 2017 15:18:04 +0000 (17:18 +0200)]
Fix undefined offset warning when using '/' as external storage root
Signed-off-by: Robin Appelman <robin@icewind.nl>