Commit Graph

40087 Commits

Author SHA1 Message Date
Nextcloud bot 44d6fe99ef
[tx-robot] updated from transifex 2017-11-22 01:10:22 +00:00
Nextcloud bot 6b189ba1ee
[tx-robot] updated from transifex 2017-11-21 01:10:20 +00:00
Roeland Jago Douma b8d3577b92
Merge pull request #7225 from nextcloud/12.0.4RC-version
12.0.4 RC
2017-11-20 12:59:47 +01:00
Roeland Jago Douma 6bfeec049e
Merge pull request #7170 from kyrofa/backport/6028/app_path_realpath
[stable12] {J,CS}SResourceLocator: account for symlinks in app path
2017-11-20 12:58:10 +01:00
Morris Jobke f6573ca72e
12.0.4 RC
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-20 12:14:12 +01:00
Nextcloud bot 9583910104
[tx-robot] updated from transifex 2017-11-20 01:09:53 +00:00
Nextcloud bot 54dcd70dae
[tx-robot] updated from transifex 2017-11-19 01:10:04 +00:00
Nextcloud bot ccf4f87441
[tx-robot] updated from transifex 2017-11-18 01:10:56 +00:00
Björn Schießle d9cea2fb61
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
2017-11-17 14:48:53 +01:00
Bjoern Schiessle 83ef3d2411
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>
2017-11-17 12:46:52 +01:00
Björn Schießle 031bde5c88
Merge pull request #7186 from nextcloud/s3-download-stream-fix-12
[12] Fix s3 download and touch
2017-11-17 12:44:40 +01:00
Nextcloud bot 9942c39e64
[tx-robot] updated from transifex 2017-11-17 01:10:03 +00:00
Nextcloud bot fec4e3947e
[tx-robot] updated from transifex 2017-11-16 01:10:03 +00:00
Robin Appelman e041c7a92f
Use non empty files for object store touch
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-15 14:23:47 +01:00
Robin Appelman a21f2c2813
Fix contructing headers for s3 download
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-15 14:23:43 +01:00
Nextcloud bot 2d8d248d28
[tx-robot] updated from transifex 2017-11-15 01:10:00 +00:00
Kyle Fazzari 697774112f
{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>
2017-11-14 09:22:33 -08:00
Nextcloud bot 82e4d9b9cc
[tx-robot] updated from transifex 2017-11-14 01:09:59 +00:00
Nextcloud bot b1ac0b6198
[tx-robot] updated from transifex 2017-11-13 01:10:31 +00:00
Nextcloud bot faabc3594d
[tx-robot] updated from transifex 2017-11-12 01:10:15 +00:00
Nextcloud bot 097e8a4994
[tx-robot] updated from transifex 2017-11-11 01:10:24 +00:00
blizzz 14986e0f5c
Merge pull request #6464 from nextcloud/proper-english-nowhave-backport-stable12
[stable12] Improve text: 'you have now' -> 'you now have'
2017-11-10 15:48:37 +01:00
Nextcloud bot 5e14b64c55
[tx-robot] updated from transifex 2017-11-10 01:10:05 +00:00
Morris Jobke 20e5220103
Merge pull request #7120 from nextcloud/12-6988
[stable12] Improve performance of UserMountCache with external storage folders
2017-11-09 17:16:00 +01:00
Roeland Jago Douma ab69cea7b2
Merge pull request #7116 from nextcloud/12-fix-6033
[stable12] Fix icon for security settings
2017-11-09 11:37:38 +01:00
Roeland Jago Douma 531ab6f8aa
Merge pull request #7118 from nextcloud/12-7109
[stable12]  If for some reason the json can't be decoded it is not cached
2017-11-09 11:02:25 +01:00
Nextcloud bot 656ea773e1
[tx-robot] updated from transifex 2017-11-09 09:12:53 +00:00
Dariusz Olszewski b9898c5b87
Improve performance of UserMountCache with external storage folders
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 10:07:27 +01:00
Roeland Jago Douma 9cbb39511f
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>
2017-11-09 09:50:57 +01:00
Morris Jobke c91515cfed
Merge pull request #6847 from nextcloud/filelist-confict-path-12
[12] still trigger conflict resolution for existing entries when the curre…
2017-11-09 09:34:24 +01:00
Morris Jobke d8cf19b258
Fix welcome text for better grammar in themed instances
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:28:29 +01:00
Morris Jobke 4bea740775
Fix icon for security settings
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:13:31 +01:00
Nextcloud bot 69e61b2892
[tx-robot] updated from transifex 2017-11-09 01:09:28 +00:00
Morris Jobke a90db1d325
Merge pull request #7114 from nextcloud/12-7110
[stable12] theme flow redirection page
2017-11-08 22:35:19 +01:00
Julius Härtl fa380c0b53
Theming: theme flow redirection page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-08 21:20:26 +01:00
Morris Jobke 7e92bcdbb4
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"
2017-11-08 10:33:35 +01:00
Nextcloud bot 98b012d545
[tx-robot] updated from transifex 2017-11-08 01:09:33 +00:00
Morris Jobke e97a58793d
Revert "[stable12] Only allow colons in db host for IPv6 addresses" 2017-11-08 00:42:34 +01:00
Lukas Reschke 4d117a5e23
Merge pull request #7096 from nextcloud/backport-stable12-7042
[stable12] ensure uid for calendar objects is unique
2017-11-07 21:58:02 +01:00
Robin Appelman fe6b4d432b
never show '/' as path for conflicting file names
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:11 +01:00
Robin Appelman e51acfc717
still trigger conflict resolution for existing entries when the current entry doesn't need it
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-07 15:54:07 +01:00
Morris Jobke 70e20727e5
Merge pull request #6699 from nextcloud/backport-6522-stable12
[stable12] fix LDAP User deletion (cleanup), fixes #3365
2017-11-07 14:45:06 +01:00
Morris Jobke 103bc3ea5d
Merge pull request #7095 from nextcloud/12-7059
[stable12] hide spinner for initial install
2017-11-07 13:51:20 +01:00
Georg Ehrke 3059191444
ensure uid for calendar objects is unique
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-07 13:18:38 +01:00
Kyle Fazzari 653c385d62
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>
2017-11-07 13:07:07 +01:00
Nextcloud bot 0756fc0893
[tx-robot] updated from transifex 2017-11-07 01:09:08 +00:00
Morris Jobke 3cc7c03ddb
Merge pull request #7082 from nextcloud/12-6974
[stable12] Fix seeking on object storage
2017-11-06 20:21:35 +01:00
Morris Jobke 8a8e76561b
Merge pull request #7081 from nextcloud/12-6958
[stable12] Improve mimetype detection for object storages
2017-11-06 18:45:32 +01:00
Morris Jobke d459351ce2
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>
2017-11-06 15:28:39 +01:00
Morris Jobke f9e29d09b5
Merge pull request #7079 from nextcloud/s3-read-object-fopen-stable12
use fopen directly when reading objects from s3
2017-11-06 15:26:16 +01:00