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
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
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
4bea740775
Fix icon for security settings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-11-09 09:13:31 +01:00
69e61b2892
[tx-robot] updated from transifex
2017-11-09 01:09:28 +00:00
a90db1d325
Merge pull request #7114 from nextcloud/12-7110
...
[stable12] theme flow redirection page
2017-11-08 22:35:19 +01:00
fa380c0b53
Theming: theme flow redirection page
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2017-11-08 21:20:26 +01:00
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
98b012d545
[tx-robot] updated from transifex
2017-11-08 01:09:33 +00:00
e97a58793d
Revert "[stable12] Only allow colons in db host for IPv6 addresses"
2017-11-08 00:42:34 +01:00
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
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
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
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
103bc3ea5d
Merge pull request #7095 from nextcloud/12-7059
...
[stable12] hide spinner for initial install
2017-11-07 13:51:20 +01:00
3059191444
ensure uid for calendar objects is unique
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
2017-11-07 13:18:38 +01:00
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
0756fc0893
[tx-robot] updated from transifex
2017-11-07 01:09:08 +00:00
3cc7c03ddb
Merge pull request #7082 from nextcloud/12-6974
...
[stable12] Fix seeking on object storage
2017-11-06 20:21:35 +01:00
8a8e76561b
Merge pull request #7081 from nextcloud/12-6958
...
[stable12] Improve mimetype detection for object storages
2017-11-06 18:45:32 +01:00
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
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
21b8399e88
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>
2017-11-06 15:23:35 +01:00
1ed9a25ae8
use fopen directly when reading objects from s3
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-11-06 10:39:52 +01:00
e873b1a3d1
[tx-robot] updated from transifex
2017-11-06 01:09:19 +00:00
0b25217ba6
[tx-robot] updated from transifex
2017-11-05 01:09:07 +00:00
270b16a4a2
[tx-robot] updated from transifex
2017-11-04 01:09:10 +00:00
43341833fd
[tx-robot] updated from transifex
2017-11-03 01:09:18 +00:00
8b1417a269
[tx-robot] updated from transifex
2017-11-02 01:11:03 +00:00
c04576ab1b
Merge pull request #7040 from nextcloud/7039_12
...
[stable12] Translate Grant Access
2017-11-01 21:30:55 +01:00
1ff6f67474
Translate Grant Access
...
Fixes #7038
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2017-11-01 20:48:49 +01:00
52b31a09ef
[tx-robot] updated from transifex
2017-11-01 01:08:55 +00:00
2bf0c70d63
Merge pull request #7028 from nextcloud/stable12-login-readability
...
[stable12] Better readability for text on log in page which is directly on backgrounds
2017-10-31 18:15:20 +01:00
2857d784e9
Merge pull request #6878 from nextcloud/allow-migrating-from-10.0.3.3
...
Allow to migrate from 10.0.3.3
2017-10-31 14:47:34 +01:00
1f280bd59f
Better readability for text on log in page which is directly on backgrounds
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2017-10-31 14:17:24 +01:00
00ffed5a19
[tx-robot] updated from transifex
2017-10-31 01:08:41 +00:00
0ce718796e
Merge pull request #6987 from burned42/stable12-6307-fix_page_title_not_changed
...
#6307 fix page title not changed (stable12)
2017-10-30 12:58:17 +01:00
76ede89b6b
[tx-robot] updated from transifex
2017-10-30 01:08:44 +00:00
e20c4c6a71
[tx-robot] updated from transifex
2017-10-29 00:08:41 +00:00
09a0048f77
[tx-robot] updated from transifex
2017-10-28 00:08:41 +00:00
8eb47de969
bugfix: set/change page title when switching to file tags
...
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 17:32:00 +02:00
bf3f86f1ff
bugfix: set/change page title when switching to filelist
...
Signed-off-by: Bernd Stellwag <burned@zerties.org>
2017-10-27 17:32:00 +02:00
85f612c819
[tx-robot] updated from transifex
2017-10-27 00:08:39 +00:00
f7ac152a6c
[tx-robot] updated from transifex
2017-10-26 00:08:49 +00:00
7ec5689d0e
Merge pull request #6935 from nextcloud/12-5780
...
Backport of translation string fixes
2017-10-25 14:42:46 +02:00
5097e698e1
Merge vendor/core.js
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-10-25 14:42:20 +02:00
9c3f6a7ca0
Merge pull request #6944 from nextcloud/12-6433
...
[stable12] Fix uninitialized variable $this->params
2017-10-25 14:33:49 +02:00
aab0c3f18e
Merge pull request #6946 from nextcloud/12-6574
...
[stable12] Fix undefined offset warning when using '/' as external storage root
2017-10-25 14:33:20 +02:00
aef69efe2e
Merge pull request #6942 from nextcloud/12-6826
...
[stable12] Fix class name in exception logger plugin
2017-10-25 11:51:24 +02:00
469285a505
Merge pull request #6943 from nextcloud/12-6758
...
[stable12] Allow quota of 0 again
2017-10-25 11:41:39 +02:00
Roeland Jago Douma
Morris Jobke
Nextcloud bot
Julius Härtl
Lukas Reschke
Robin Appelman
Georg Ehrke
Kyle Fazzari
Joas Schilling
Jan-Christoph Borchardt
Bernd Stellwag
blizzz