Roeland Jago Douma
ee69dc128a
Merge pull request #7261 from nextcloud/prepare-12.0.4-RC2
...
Prepare 12.0.4 RC2
2017-11-27 10:09:30 +01:00
Roeland Jago Douma
7e1ca611f8
Merge pull request #7257 from kyrofa/bugfix/5289/apps_outside_webroot
...
[stable12] CSSResourceLocator: handle SCSS in apps outside root
2017-11-27 10:08:27 +01:00
Nextcloud bot
298b0d67d8
[tx-robot] updated from transifex
2017-11-27 01:10:03 +00:00
Nextcloud bot
a6b3fcae8f
[tx-robot] updated from transifex
2017-11-25 01:10:10 +00:00
Lukas Reschke
62b7378331
Merge pull request #7277 from nextcloud/12-7268
...
[stable12] Update CRL due to files_frommail
2017-11-24 14:40:36 +01:00
Morris Jobke
a1c76cc8bf
Update CRL due to files_frommail
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-11-24 14:11:09 +01:00
Nextcloud bot
e94ba32255
[tx-robot] updated from transifex
2017-11-24 01:10:06 +00:00
Morris Jobke
b901f8b0c8
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
2017-11-23 13:54:46 +01:00
Morris Jobke
59657542ca
Merge pull request #7245 from nextcloud/feature/noid/allow-migration-from-comingup-oc-release
...
Allow migration from upcoming 10.0.4 ownCloud release
2017-11-23 13:46:08 +01:00
Joas Schilling
6978128b48
Fix accesslist when a user has an ID only containting 0-9
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-11-23 13:19:55 +01:00
Morris Jobke
8019afb9d5
Prepare 12.0.4 RC2
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-11-23 13:02:20 +01:00
Morris Jobke
4a4cf2613c
Merge pull request #7259 from nextcloud/7211-stable12
...
[stable12] only replace permission popupmenu
2017-11-23 13:00:37 +01:00
Arthur Schiwon
9383889314
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 >
2017-11-23 12:08:29 +01:00
Kyle Fazzari
7f8f3dc21b
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 >
2017-11-22 21:41:40 -08:00
Nextcloud bot
fd46475f6e
[tx-robot] updated from transifex
2017-11-23 01:09:59 +00:00
Joas Schilling
2c11d62adf
Allow migration from upcoming 10.0.4 ownCloud release
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-11-22 14:06:07 +01:00
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
Morris Jobke
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
Robin Appelman
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
Nextcloud bot
e873b1a3d1
[tx-robot] updated from transifex
2017-11-06 01:09:19 +00:00
Nextcloud bot
0b25217ba6
[tx-robot] updated from transifex
2017-11-05 01:09:07 +00:00
Nextcloud bot
270b16a4a2
[tx-robot] updated from transifex
2017-11-04 01:09:10 +00:00
Nextcloud bot
43341833fd
[tx-robot] updated from transifex
2017-11-03 01:09:18 +00:00
Nextcloud bot
8b1417a269
[tx-robot] updated from transifex
2017-11-02 01:11:03 +00:00
Joas Schilling
c04576ab1b
Merge pull request #7040 from nextcloud/7039_12
...
[stable12] Translate Grant Access
2017-11-01 21:30:55 +01:00
Roeland Jago Douma
1ff6f67474
Translate Grant Access
...
Fixes #7038
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-11-01 20:48:49 +01:00
Nextcloud bot
52b31a09ef
[tx-robot] updated from transifex
2017-11-01 01:08:55 +00:00
Jan-Christoph Borchardt
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
Joas Schilling
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
Jan-Christoph Borchardt
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
Nextcloud bot
00ffed5a19
[tx-robot] updated from transifex
2017-10-31 01:08:41 +00:00
Morris Jobke
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
Nextcloud bot
76ede89b6b
[tx-robot] updated from transifex
2017-10-30 01:08:44 +00:00
Nextcloud bot
e20c4c6a71
[tx-robot] updated from transifex
2017-10-29 00:08:41 +00:00
Nextcloud bot
09a0048f77
[tx-robot] updated from transifex
2017-10-28 00:08:41 +00:00
Bernd Stellwag
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
Bernd Stellwag
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
Nextcloud bot
85f612c819
[tx-robot] updated from transifex
2017-10-27 00:08:39 +00:00
Nextcloud bot
f7ac152a6c
[tx-robot] updated from transifex
2017-10-26 00:08:49 +00:00
Morris Jobke
7ec5689d0e
Merge pull request #6935 from nextcloud/12-5780
...
Backport of translation string fixes
2017-10-25 14:42:46 +02:00
Morris Jobke
5097e698e1
Merge vendor/core.js
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-10-25 14:42:20 +02:00
Morris Jobke
9c3f6a7ca0
Merge pull request #6944 from nextcloud/12-6433
...
[stable12] Fix uninitialized variable $this->params
2017-10-25 14:33:49 +02:00
Morris Jobke
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
Joas Schilling
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
blizzz
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
27e8352ef1
Merge pull request #6945 from nextcloud/12-6633
...
[stable12] Don't add a LIKE condition when it's not needed
2017-10-25 08:53:37 +02:00
Nextcloud bot
5bd0bde89d
[tx-robot] updated from transifex
2017-10-25 00:08:56 +00:00
Robin Appelman
f301b12c7b
Fix undefined offset warning when using '/' as external storage root
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-25 01:45:25 +02:00
Thomas Citharel
8c56f93124
Don't add a LIKE condition when it's not needed
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr >
2017-10-25 01:42:51 +02:00
William Pain
cfbc0c8141
Fix uninitialized variable $this->params
...
Signed-off-by: William Pain <pain.william@gmail.com >
2017-10-25 01:32:59 +02:00
Joas Schilling
968a1bf9ae
Allow quota of 0 again
...
Regression from f1fccaca06
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-10-25 01:30:26 +02:00
Joas Schilling
89d4e1f2ab
Use ::class to avoid errors
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-10-25 01:23:59 +02:00
Joas Schilling
572f246b78
Fix class name, regression from 44cf67accd
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-10-25 01:23:55 +02:00
Morris Jobke
d3916b2170
Add space between ellipsis and word
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-10-25 00:11:05 +02:00
rakekniven
59fc88650c
Update file-upload.js
...
Fixed tiny translation issues. Removed space before ellipsis.
2017-10-24 17:34:49 +02:00
Morris Jobke
293a3d578f
Replace ... with …
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-10-24 17:34:31 +02:00
Nextcloud bot
895336a3f3
[tx-robot] updated from transifex
2017-10-24 00:08:57 +00:00
Morris Jobke
ad66244bdf
Merge pull request #6910 from nextcloud/backport-6677-s12
...
[stable12] don't reset quota
2017-10-23 07:46:49 -07:00
Morris Jobke
aaad2ab6b0
Merge pull request #6896 from nextcloud/12-timespan-check
...
[12] timespan check
2017-10-23 07:45:53 -07:00
Morris Jobke
9b41236d4a
Provide tests for future timestamp formatting
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-10-23 15:42:14 +02:00
Morris Jobke
35c1540984
Merge pull request #6908 from nextcloud/6132-12
...
[stable12] Do not log WebDAV maintenance mode exception
2017-10-23 03:41:11 -07:00
Arthur Schiwon
791fa6905f
and add missing whitespaces to log outout
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-10-23 12:28:32 +02:00
Juan Pablo Villafáñez
b8afb84b18
Adjust unittest
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-10-23 12:28:27 +02:00
Juan Pablo Villafáñez
18c35a7ab0
Keep the current quota if no suitable quota is found
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-10-23 12:28:19 +02:00
Morris Jobke
5c53b162ed
Do not log WebDAV maintenance mode exception
...
Log the maintenance mode exception only in debug level. Fixes #6124
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-10-23 11:24:07 +02:00
Nextcloud bot
e70135bcbf
[tx-robot] updated from transifex
2017-10-23 00:08:49 +00:00
dartcafe
58f900f380
Correction
...
Signed-off-by: dartcafe <github@dartcafe.de >
2017-10-22 07:46:18 +02:00
dartcafe
917e996dda
Fix future time spans
...
Signed-off-by: dartcafe <github@dartcafe.de >
2017-10-22 07:26:52 +02:00
Nextcloud bot
bc19a8b193
[tx-robot] updated from transifex
2017-10-22 00:08:45 +00:00
Nextcloud bot
1c488aae8a
[tx-robot] updated from transifex
2017-10-21 00:08:36 +00:00
Nextcloud bot
5d2c6233a9
[tx-robot] updated from transifex
2017-10-20 00:08:44 +00:00
Joas Schilling
2d1929cb1e
Allow to migrate from 10.0.3.3
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-10-19 16:59:54 +02:00
Nextcloud bot
e8c217ed4f
[tx-robot] updated from transifex
2017-10-19 00:08:38 +00:00
Nextcloud bot
8b0842f020
[tx-robot] updated from transifex
2017-10-18 00:08:33 +00:00
Roeland Jago Douma
4419aee908
Merge pull request #6855 from nextcloud/s3-multipart-propagate-exception-12
...
[12] propagate multipart upload exception when aborting upload
2017-10-17 20:42:30 +02:00
Robin Appelman
74b43f1d7d
propagate multipart upload exception when aborting upload
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-17 15:19:40 +02:00
Bjoern Schiessle
7aaf12b37d
fix url
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-10-17 11:27:06 +02:00
Nextcloud bot
ea269db6d6
[tx-robot] updated from transifex
2017-10-17 00:08:33 +00:00
Nextcloud bot
e6000abdd6
[tx-robot] updated from transifex
2017-10-16 00:08:36 +00:00
Roeland Jago Douma
51ed66fb26
Merge pull request #6814 from nextcloud/upload-cache-path-12
...
[12] also use configured 'cache_path' for new chunking
2017-10-15 21:43:03 +02:00
Roeland Jago Douma
d57557774e
Merge pull request #6815 from nextcloud/s3-multipart-upload-part-size-12
...
[12] set s3 part size to 500mb
2017-10-15 21:41:15 +02:00
Roeland Jago Douma
6e3ec7d911
Merge pull request #6774 from nextcloud/backport-6645-only-colons-for-ipv6
...
[stable12] Only allow colons in db host for IPv6 addresses
2017-10-15 21:40:04 +02:00
Nextcloud bot
95bd9d4c64
[tx-robot] updated from transifex
2017-10-14 02:29:15 +00:00
Roeland Jago Douma
21f5f0267f
Merge pull request #6823 from nextcloud/stable12-fix/contactsmenu-ie11
...
[stable12] Fix contacts menu for IE11
2017-10-13 19:54:05 +02:00
Nextcloud bot
7762130869
[tx-robot] updated from transifex
2017-10-13 00:08:37 +00:00
Christoph Wurst
0c7d745074
Fix contacts menu for IE11
...
IE11 triggers an 'input' event whenever an input is focussed
or loses focus. Thus this causes an endless loading loop as soon
as the view is re-rendered. To prevent this, this remembers the
previous search term and ignores events where the term has not
changed.
Fixes https://github.com/nextcloud/server/issues/5281
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at >
2017-10-12 16:26:01 +02:00
Nextcloud bot
513432f966
[tx-robot] updated from transifex
2017-10-12 00:08:38 +00:00
Robin Appelman
e2a25d5caf
set s3 part size to 500mb
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-11 16:01:04 +02:00
Robin Appelman
1c315a2a8a
also use configured 'cache_path' for new chunking
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-11 14:27:02 +02:00
Nextcloud bot
980ba0e904
[tx-robot] updated from transifex
2017-10-11 00:08:40 +00:00
Nextcloud bot
c14beb8ee5
[tx-robot] updated from transifex
2017-10-10 00:08:41 +00:00
Robin Appelman
8f88755f57
update 3rdparty
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-09 18:11:30 +02:00
Robin Appelman
df2fa2fce2
Merge pull request #6737 from nextcloud/aws-sdk-12
...
[12] Update aws sdk + s3 improvements
2017-10-09 18:05:16 +02:00
Robin Appelman
239f561ab2
Add tests for multipart upload
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-09 15:29:44 +02:00
Robin Appelman
6fee4232ee
only do multipart upload for large files
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-09 15:29:40 +02:00
Robin Appelman
d3a57a7568
multipart upload for s3 object storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-09 15:29:34 +02:00
Joas Schilling
0577336105
Merge pull request #6792 from nextcloud/6790-bp-s12
...
[stable12] fix postgresql tests
2017-10-09 14:11:57 +02:00
blizzz
be97297c96
fix postgresql tests
...
we don't support pgsql 10 yet. because Doctrine does not either.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-10-09 13:20:29 +02:00
Nextcloud bot
35641b54a0
[tx-robot] updated from transifex
2017-10-09 00:08:42 +00:00
Nextcloud bot
7a583c400e
[tx-robot] updated from transifex
2017-10-08 00:08:32 +00:00
Nextcloud bot
adea68e218
[tx-robot] updated from transifex
2017-10-07 00:08:40 +00:00
Joas Schilling
8f41e8ee60
Only allow colons in db host for IPv6 addresses
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-10-06 09:43:35 +02:00
Nextcloud bot
037376b4ce
[tx-robot] updated from transifex
2017-10-06 00:08:40 +00:00
Joas Schilling
76faefd980
Merge pull request #6751 from nextcloud/backport-6750-fix-language-when-setting-password
...
[stable12] Fix language when trying to change password
2017-10-05 09:36:09 +02:00
Nextcloud bot
ceec594cc0
[tx-robot] updated from transifex
2017-10-05 00:08:34 +00:00
Robin Appelman
6aa25b9f1e
Merge pull request #6743 from nextcloud/invalid-path-repair-from11-12
...
[12] dont run invalid path repair step when upgrading from 11.0.5.2 and later
2017-10-04 15:08:34 +02:00
Joas Schilling
0782072bde
Fix language when trying to change password
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-10-04 09:49:26 +02:00
Nextcloud bot
1c30c72909
[tx-robot] updated from transifex
2017-10-04 00:08:37 +00:00
Robin Appelman
95dc9a89b3
dont run invalid path repair step when upgrading from 11.0.5.2 and later
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 16:28:54 +02:00
Robin Appelman
d2b8bfc915
show diff in autoload checker
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:11:37 +02:00
Robin Appelman
5b82e2e4d5
update autoloader
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:11:31 +02:00
Robin Appelman
82a3a8be06
fix undefined constants
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:11:28 +02:00
Robin Appelman
869e06fe69
merge vendor js
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:11:25 +02:00
Robin Appelman
d26951beb4
fix path style
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:11:21 +02:00
Robin Appelman
d97f66454c
disable part files for s3 external storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:11:16 +02:00
Robin Appelman
83ef030ea6
add stat cache for s3 external storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:11:12 +02:00
Robin Appelman
e42b950521
more efficient is_dir
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:11:09 +02:00
Robin Appelman
a0848ba202
more efficient permissions for s3 external storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:11:05 +02:00
Robin Appelman
f45a7a43df
more efficient write only fopen
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:11:01 +02:00
Robin Appelman
474c8aff29
reuse object read/write/delete logic in s3 implementations
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:10:57 +02:00
Robin Appelman
f62e0a33f3
update aws sdk and move it to 3rdparty
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:09:59 +02:00
Robin Appelman
14d94abf06
remove non composer aws sdk
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-10-03 14:04:20 +02:00
Nextcloud bot
4a21eb1c7d
[tx-robot] updated from transifex
2017-10-03 00:08:30 +00:00
Nextcloud bot
77931505d3
[tx-robot] updated from transifex
2017-10-02 00:08:33 +00:00
Nextcloud bot
05fe73ef5d
[tx-robot] updated from transifex
2017-10-01 00:08:35 +00:00
Nextcloud bot
489fc55e1d
[tx-robot] updated from transifex
2017-09-30 00:08:35 +00:00
Arthur Schiwon
38f84b369c
Backport of #6522
...
fix LDAP User deletion (cleanup)
discovered a bug in the integration test which lead to following a
different code path and giving a false-positive success feedback.
Also listens now to the evendispatcher instead of old hook system
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
fix test
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-09-29 14:36:48 +02:00
Nextcloud bot
cae4a1956b
[tx-robot] updated from transifex
2017-09-29 00:08:31 +00:00
Morris Jobke
edade19263
Merge pull request #6689 from nextcloud/filelist-show-navigate-12
...
[12] navigate to the root directory when showing the main filelist
2017-09-28 18:07:20 +02:00
Robin Appelman
ac31b67f42
navigate to the root directory when showing the main filelist
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-09-28 16:37:47 +02:00
Nextcloud bot
df00dc89d1
[tx-robot] updated from transifex
2017-09-28 00:08:46 +00:00
blizzz
b1d5acd15f
Merge pull request #6674 from nextcloud/backport-6549-stable12
...
[stable12] don't pass User object when uid string is expected
2017-09-28 01:39:46 +02:00
Arthur Schiwon
499da044b6
don't pass User object when uid string is expected
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-09-27 17:51:22 +02:00
Morris Jobke
f6ccc1e0a1
Merge pull request #6554 from nextcloud/stable12-contacts_menu_privacy
...
[Stable12] contacts menu privacy
2017-09-27 15:32:29 +02:00
John Molakvoæ
898fb1663a
Merge pull request #6661 from nextcloud/no-take-only-throw
...
Do not stop on scss compilation failure
2017-09-27 10:43:31 +02:00
John Molakvoæ (skjnldsv)
892a427807
Do not stop on scss compilation failure
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com >
2017-09-27 08:35:02 +02:00
Nextcloud bot
af923601b9
[tx-robot] updated from transifex
2017-09-27 00:08:33 +00:00
Morris Jobke
98da7848b5
Merge pull request #6649 from nextcloud/color-border-variable
...
Add color-border variable
2017-09-26 19:53:45 +02:00
John Molakvoæ (skjnldsv)
e9c3c4f310
Add color-border variable
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com >
2017-09-26 15:38:45 +02:00
Nextcloud bot
0f39ea5830
[tx-robot] updated from transifex
2017-09-26 00:08:36 +00:00
Nextcloud bot
06ca365ccd
[tx-robot] updated from transifex
2017-09-25 00:08:12 +00:00
Nextcloud bot
29e4c10517
[tx-robot] updated from transifex
2017-09-23 00:08:06 +00:00
Nextcloud bot
c1aa80afe8
[tx-robot] updated from transifex
2017-09-22 00:08:32 +00:00
Nextcloud bot
cb212712f6
[tx-robot] updated from transifex
2017-09-21 00:08:36 +00:00
Roeland Jago Douma
9945d2f039
Merge pull request #6509 from nextcloud/backport-5689
...
[stable12] LDAP: simplify returning the homePath and fixing #4117
2017-09-20 20:11:30 +02:00
Morris Jobke
ac0cd59a20
Merge pull request #6502 from nextcloud/backport-6453-stable12
...
[stable12] Fix initializing paged search under some circumstances
2017-09-20 16:07:28 +02:00
Morris Jobke
7d4fda5c85
Merge pull request #6524 from nextcloud/12-6506
...
[stable12] Fix sharer name overlap with filename
2017-09-20 16:06:09 +02:00
Morris Jobke
aa586331ea
Merge pull request #6525 from nextcloud/12-6499
...
[stable12] Allow to close sidebar for text files
2017-09-20 16:05:59 +02:00
Morris Jobke
2062c2ada6
Merge pull request #6528 from nextcloud/fix_4654_3375-12
...
[stable12] Pass new value to triggerChange
2017-09-20 16:05:49 +02:00
Morris Jobke
6a52cda551
Merge pull request #6547 from nextcloud/backport-6545-stable12
...
[stable12] throw 101 when an empty group string is provided
2017-09-20 16:05:41 +02:00
Joas Schilling
3c449c88be
Merge pull request #6527 from nextcloud/fix_quota_new_endpoint_12
...
[stable12] Fix quota new endpoint 12
2017-09-20 09:19:06 +02:00
Nextcloud bot
2bac01daad
[tx-robot] updated from transifex
2017-09-20 00:08:36 +00:00
Roeland Jago Douma
343a69569d
Merge pull request #6572 from nextcloud/bump-version-another-time
...
[stable12] Bump version to 12.0.3.3
2017-09-19 20:18:36 +02:00
Lukas Reschke
f438ad5d1e
Bump version to 12.0.3.3
...
For a build with https://github.com/nextcloud/server/pull/6570
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-09-19 16:48:11 +02:00
Lukas Reschke
5e47b07b21
Merge pull request #6570 from nextcloud/fix-comments-activity-error-12
...
[stable12] Use the wrapper to get the parameters which was added in #6369
2017-09-19 16:07:44 +02:00
Joas Schilling
4ca0223f37
Use the wrapper to get the parameters which was added in #6369
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-19 15:06:22 +02:00
Nextcloud bot
db56ea3e70
[tx-robot] updated from transifex
2017-09-19 00:08:39 +00:00
Roeland Jago Douma
3488a2099f
Merge pull request #6556 from nextcloud/stable12-bump-version-to-final
...
[stable12] Bump version to 12.0.3
2017-09-18 20:01:51 +02:00
Lukas Reschke
7dc2ffaf00
Bump version to 12.0.3
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-09-18 18:22:09 +02:00
Lukas Reschke
44ae66e7d2
Add filter for shareapi_allow_share_dialog_user_enumeration
...
This adjusts the contacts menu to also support searching by email address which is relevant in scenarios where no UID is known such as LDAP, etc.
Furthermore, if `shareapi_allow_share_dialog_user_enumeration` is disabled only results are shown that match the full user ID or email address.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-09-18 17:28:07 +02:00
Lukas Reschke
96e3e0788a
Revert "Do not list system users in contacts menu if sharing autocompletion is disabled"
...
This reverts commit 56a9084dd2 .
2017-09-18 17:27:57 +02:00
Tobia De Koninck
005cd8ae42
Fix issue when disabling the shareapi_only_share_with_group_members option + fix findOne
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be >
2017-09-18 17:27:51 +02:00
Tobia De Koninck
21e903cb31
Improve code style
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be >
2017-09-18 17:27:47 +02:00
Tobia De Koninck
3409c364fe
Some code improvements
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be >
2017-09-18 17:27:41 +02:00
Tobia De Koninck
d2d6ed5c97
Add tests
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be >
2017-09-18 17:27:33 +02:00
Tobia De Koninck
88ccbef546
Fix tests
...
Signed-off-by: Tobia De Koninck <tobia@ledfan.be >
2017-09-18 17:27:28 +02:00
Tobia De Koninck
6f4976fd4d
Privacy enhancements for contacts menu
...
- Groups, which are excluded from sharing should not see local users at all
- If sharing is restricted to users own groups, he should only see contacts from his groups:
Signed-off-by: Tobia De Koninck <tobia@ledfan.be >
2017-09-18 17:27:24 +02:00
Arthur Schiwon
713ce42fdf
throw 101 when an empty group string is provided
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-09-18 13:10:23 +02:00
Nextcloud bot
c854665b0c
[tx-robot] updated from transifex
2017-09-18 00:08:41 +00:00
Nextcloud bot
bc88484e7f
[tx-robot] updated from transifex
2017-09-17 00:08:34 +00:00
Nextcloud bot
18a258c531
[tx-robot] updated from transifex
2017-09-16 00:08:34 +00:00
Roeland Jago Douma
71fdc43125
Pass new value to triggerChange
...
it is not used. but pass in the empty string (on delete) and the new
file (on create)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-09-15 20:23:45 +02:00
Roeland Jago Douma
76cd70aed7
Fix quota calculation on new dav upload endpoint
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-09-15 20:21:37 +02:00
Morris Jobke
efec52ebeb
Allow to close sidebar for text files
...
* the close button was overlapped by the text preview and you could not close the sidebar then
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-09-15 17:00:14 +02:00
Jan-Christoph Borchardt
f987347b83
Correctly ellipsize file names, fix #6498
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net >
2017-09-15 16:53:01 +02:00
Jan-Christoph Borchardt
64dd1f6833
Ellipsize sharer name, ref #6498
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net >
2017-09-15 16:52:52 +02:00
Nextcloud bot
99916a9bda
[tx-robot] updated from transifex
2017-09-15 00:08:17 +00:00
Arthur Schiwon
90ebeae512
listen to deletion hooks for proper handling, adjust and add tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-09-14 17:04:12 +02:00
Arthur Schiwon
5933c0c55f
simplify returning the homePath and fixing #4117
...
homesToKill was not set in runtime since some changes some place else. It
required deleteUser() to be called first. The method acts independent of it
now.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-09-14 17:04:01 +02:00
Arthur Schiwon
9d5fd7cd92
adapted integration tests
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-09-14 14:14:23 +02:00
Arthur Schiwon
9fb8f1fcd3
fix counting found results in search op
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-09-14 14:14:16 +02:00
Arthur Schiwon
51e4b49ee9
improve and extend paging integration test
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-09-14 14:14:10 +02:00
Arthur Schiwon
30bf1c158d
replace hard-coded attribute with the corresponding settings option
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-09-14 14:14:04 +02:00
Arthur Schiwon
de8626694f
fix limit-flaw in search on paged results
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-09-14 14:13:49 +02:00
Nextcloud bot
a7f3fadd37
[tx-robot] updated from transifex
2017-09-14 00:08:21 +00:00
Nextcloud bot
51c110dd66
[tx-robot] updated from transifex
2017-09-13 00:08:21 +00:00
Roeland Jago Douma
c3924068aa
Merge pull request #6472 from nextcloud/rc2
...
v12.0.3RC2
2017-09-12 23:24:47 +02:00
Roeland Jago Douma
2e30eab8c7
Merge pull request #6474 from nextcloud/2fa_apppasword_auth_12
...
[stable12] Fix AppPassword 2FA auth
2017-09-12 23:23:46 +02:00
Roeland Jago Douma
ab50f0b1de
Fix AppPassword 2FA auth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-09-12 22:35:16 +02:00
Lukas Reschke
48372f9108
v12.0.3RC2
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-09-12 22:11:17 +02:00
Morris Jobke
499699f37b
Merge pull request #6466 from nextcloud/12-0-3-rc1
...
12.0.3 RC1
2017-09-12 16:12:06 +02:00
Lukas Reschke
9dbb77b5e6
12.0.3 RC1
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-09-12 14:46:18 +02:00
Leon Klingele
33ae6a4e9e
Improve text: 'you have now' -> 'you now have'
...
Signed-off-by: Leon Klingele <leon@struktur.de >
2017-09-12 14:11:52 +02:00
Morris Jobke
cb6178b828
Merge pull request #6443 from nextcloud/backport-6064-absolute-path-must-be-relative-to-files-on-theming-update
...
[stable12] Still throw a locked exception when the path is not relative to $user/files/
2017-09-12 10:03:29 +02:00
Morris Jobke
c1690da20b
Merge pull request #6444 from nextcloud/backport-6351-sql-syntax-on-caldav
...
[stable12] not to backquote LIMIT on CalDavBackend.php
2017-09-12 09:43:24 +02:00
Morris Jobke
5981027f82
Merge pull request #6359 from nextcloud/12-6082
...
[stable12] Use separate element color in theming
2017-09-12 09:41:10 +02:00
Morris Jobke
3aae3a54e5
Merge pull request #6446 from nextcloud/backport-6414-share-notification-wrong-language
...
[stable12] Use the language of the recipient for the share notification
2017-09-12 09:40:19 +02:00
Nextcloud bot
c58fdad3de
[tx-robot] updated from transifex
2017-09-12 00:08:34 +00:00
Morris Jobke
0c43183ac9
Merge pull request #6442 from nextcloud/backport-6416-make-sure-sqlite-works-without-content
...
[stable12] Ask the schema whether the table and column exist
2017-09-11 23:20:58 +02:00
Morris Jobke
c81829fd74
Merge pull request #6427 from nextcloud/backport-to-fix-popover-hovering
...
[stable12] Fix hovering on all popover types
2017-09-11 23:11:40 +02:00
Morris Jobke
0c3c145b90
Merge pull request #6441 from nextcloud/backport-6369-missing-translations-of-comment-activity-in-email
...
[stable12] Allow translations of the comments activity in the emails too
2017-09-11 23:09:56 +02:00
Morris Jobke
9d7b21efb8
Merge pull request #6440 from nextcloud/stable12-session-timeout-refresh-csrf-token
...
[stable12] Fix failing csp/nonce check due to timed out session
2017-09-11 22:34:37 +02:00
Joas Schilling
2a6855a76d
Use the language of the recipient for the share notification
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-11 11:28:20 +02:00
nhirokinet
2eaee586c7
not to backquote LIMIT on CalDavBackend.php
2017-09-11 11:21:43 +02:00
Joas Schilling
d25ea6ae1c
Don't lock in the appdata_ directory
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-11 11:18:56 +02:00
Joas Schilling
9cae892974
Still throw a locked exception when the path is not relative to $user/files/
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-11 11:18:47 +02:00
Joas Schilling
e88a4a0b3d
Fix Nextcloud 12 compatibility
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-11 11:14:33 +02:00
Joas Schilling
6fd01c3993
Ask the schema whether the table and column exist
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-11 11:08:58 +02:00
Joas Schilling
206c4da149
Allow translations of the comments activity in the emails too
...
Message and object data is not available on emails atm,
so we can not use them either...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-11 11:05:06 +02:00
Christoph Wurst
55c7aa674c
Fix failing csp/nonce check due to timed out session
...
The CSP nonce is based on the CSRF token. This token does not change,
unless you log in (or out). In case of the session data being lost,
e.g. because php gets rid of old sessions, a new CSRF token is gen-
erated. While this is fine in theory, it actually caused some annoying
problems where the browser restored a tab and Nextcloud js was blocked
due to an outdated nonce.
The main problem here is that, while processing the request, we write
out security headers relatively early. At that point the CSRF token
is known/generated and transformed into a CSP nonce. During this request,
however, we also log the user in because the session information was
lost. At that point we also refresh the CSRF token, which eventually
causes the browser to block any scripts as the nonce in the header
does not match the one which is used to include scripts.
This patch adds a flag to indicate whether the CSRF token should be
refreshed or not. It is assumed that refreshing is only necessary
if we want to re-generate the session id too. To my knowledge, this
case only happens on fresh logins, not when we recover from a deleted
session file.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at >
2017-09-11 10:08:06 +02:00
Nextcloud bot
b7768ac11d
[tx-robot] updated from transifex
2017-09-11 00:08:28 +00:00
Nextcloud bot
985cbc6b33
[tx-robot] updated from transifex
2017-09-10 00:08:33 +00:00
John Molakvoæ (skjnldsv)
4baae80d98
Fix hovering on all popover types
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com >
2017-09-09 14:05:51 +02:00
Nextcloud bot
79c0d69844
[tx-robot] updated from transifex
2017-09-09 00:08:30 +00:00
Morris Jobke
85633784d3
Merge pull request #6421 from nextcloud/12-6419
...
[stable12] Use tmpfs for mysql CI containers
2017-09-08 16:58:49 +02:00
Morris Jobke
ff94640c4f
Use tmpfs for mysql CI containers
...
Should improve performance
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-09-08 15:57:15 +02:00
Nextcloud bot
ac96dc80de
[tx-robot] updated from transifex
2017-09-08 00:08:25 +00:00
Joas Schilling
27ea0bd9e1
Merge pull request #6396 from nextcloud/12-6329
...
[stable12] Don't log LDAP password when server is not available
2017-09-07 12:48:13 +02:00
Morris Jobke
7c3148f1aa
Merge pull request #6386 from nextcloud/12-6247
...
[stable12] Fix undefined index oauthState
2017-09-07 09:32:45 +02:00
Joas Schilling
287ebb52d5
Don't log LDAP password when server is not available
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-07 09:26:40 +02:00
Nextcloud bot
9071f60605
[tx-robot] updated from transifex
2017-09-07 00:08:32 +00:00
Roeland Jago Douma
ef1c81188b
Merge pull request #6319 from nextcloud/improve_2fa-12
...
[stable12] Improve 2FA
2017-09-06 20:07:46 +02:00
Morris Jobke
04583a7587
Fix tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-09-06 19:48:12 +02:00
Morris Jobke
6375d7ef7f
Fix undefined index oauthState
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-09-06 19:48:08 +02:00
Lukas Reschke
ad96c58e8b
Merge pull request #6368 from nextcloud/backport-5436-fix-group-check
...
[stable12] Fix group check on share provider
2017-09-06 17:19:15 +02:00
Lukas Reschke
e1e248aeb8
Merge pull request #6357 from nextcloud/swift-tmpfiles-12
...
[12] Remove tmpFiles Array in Swift.php
2017-09-06 17:17:36 +02:00
Roeland Jago Douma
dbcd549e35
Fix login with basic auth
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-09-06 17:07:11 +02:00
Nextcloud bot
ba71df12cc
[tx-robot] updated from transifex
2017-09-06 00:08:30 +00:00
Morris Jobke
f1bbef392f
Merge pull request #6366 from nextcloud/backport-6358-email-update
...
Backport email update
2017-09-05 20:57:06 +02:00
Jan-Philipp Litza
b35c039b77
Fix 500 Internal Server Error on writing
...
In some not yet completely determined configurations, the following error could occur while writing a file:
Error: Call to a member function getUsers() on null
/var/www/nextcloud/lib/private/Share20/Manager.php - line 1277: OC\Share20\DefaultShareProvider->getAccessList(Array, true)
/var/www/nextcloud/lib/private/Share20/ShareHelper.php - line 51: OC\Share20\Manager->getAccessList(Object(OC\Files\Node\Folder), true, true)
/var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 616: OC\Share20\ShareHelper->getPathsForAccessList(Object(OC\Files\Node\File))
/var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 196: OCA\Activity\FilesHooks->getUserPathsFromPath('/path/to/file', 'user')
/var/www/nextcloud/apps/activity/lib/FilesHooks.php - line 157: OCA\Activity\FilesHooks->addNotificationsForFileAction('/path/to/file', 'file_changed', 'changed_self', 'changed_by')
/var/www/nextcloud/apps/activity/lib/FilesHooksStatic.php - line 55: OCA\Activity\FilesHooks->fileUpdate('/path/to/file')
/var/www/nextcloud/lib/private/legacy/hook.php - line 106: OCA\Activity\FilesHooksStatic fileUpdate(Array)
/var/www/nextcloud/lib/private/Files/View.php - line 1245: OC_Hook emit('OC_Filesystem', 'post_update', Array)
/var/www/nextcloud/lib/private/Files/View.php - line 1173: OC\Files\View->runHooks(Array, '/path/to/file', true)
/var/www/nextcloud/lib/private/Files/View.php - line 679: OC\Files\View->basicOperation('file_put_conten...', '/path/to/file', Array, '<?xml version="...')
/var/www/nextcloud/lib/private/Files/Node/File.php - line 64: OC\Files\View->file_put_contents('/path/to/file', '<?xml version="...')
[...]
Signed-off-by: Jan-Philipp Litza <janphilipp@litza.de >
2017-09-05 17:31:39 +02:00
Morris Jobke
c0692abee7
Fix tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-09-05 16:04:29 +02:00
Joas Schilling
6428359820
Fix unit tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-05 16:04:17 +02:00
Joas Schilling
6e7c37cbd3
Merge setMetaData into constructor
...
This ensures that the meta data is set in the beginning
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-05 16:04:09 +02:00
Joas Schilling
54faa09b4d
Set the meta data before everything
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-05 16:03:57 +02:00
Joas Schilling
6aa707de42
Fix naming of user id in email meta data
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-09-05 16:03:50 +02:00
Morris Jobke
ec00e4b001
Implement metadata for email templates of remaining emails
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-09-05 16:03:40 +02:00
Nextcloud bot
42b46ead67
[tx-robot] updated from transifex
2017-09-05 00:08:33 +00:00
Julius Härtl
9bcf90adc8
Cleanup theming styles to fit the new login page
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-09-04 15:59:46 +02:00
Julius Härtl
ed11c0d6e2
Fix tests for primary element color
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-09-04 15:59:40 +02:00
Julius Härtl
0f2f19c65f
Use separate element color in theming
...
This way we can use a grey color when the primary color is to bright
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-09-04 15:50:33 +02:00
Christopher Bartz
222ec97f5f
Remove tmpFiles Array in Swift.php
...
tmpFiles Array is unnecessary and there has been
a reference without an assignment which lead to a bug making swift external
storage unuseable.
2017-09-04 14:54:13 +02:00
blizzz
ebadf2f21d
Merge pull request #6355 from nextcloud/6221-12
...
[stable12] Correctly format OCS response with favorites
2017-09-04 12:52:44 +02:00
Morris Jobke
274b72f223
Merge pull request #6333 from nextcloud/new-dav-event-stable12
...
[stable12] add a new dav event to allow apps to register their own sabredav plugins
2017-09-04 11:57:22 +02:00
Roeland Jago Douma
38548a7006
Correctly format OCS response with favorites
...
The helper funtion did not handle the response correctly and basically
only returned the last share with tags.
This is a simple rewrite. That is still understandable. Loops maybe more
than strictly required. But preformance is not the issue here.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-09-04 11:49:19 +02:00
Nextcloud bot
c5950bd8f8
[tx-robot] updated from transifex
2017-09-03 00:08:24 +00:00
Nextcloud bot
fe2f9ac7ce
[tx-robot] updated from transifex
2017-09-02 00:08:39 +00:00
Bjoern Schiessle
38a60e44db
also allow to register additional plugins if the old endpoint is used
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-09-01 12:07:05 +02:00
Bjoern Schiessle
8e1d33369b
add a new dav event to allow apps to register their own sabredav plugins
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-09-01 12:06:55 +02:00
Nextcloud bot
a8f4b1ee52
[tx-robot] updated from transifex
2017-09-01 00:08:36 +00:00
Roeland Jago Douma
faffebc718
Improve 2FA
...
* Store the auth state in the session so we don't have to query it every
time.
* Added some tests
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-31 10:54:10 +02:00
Nextcloud bot
0ba7914d0c
[tx-robot] updated from transifex
2017-08-31 00:08:40 +00:00
Morris Jobke
8bc95d3449
Merge pull request #6285 from nextcloud/generate-system-wide-key-pair-12
...
Generate system wide key pair
2017-08-30 21:31:31 +02:00
Morris Jobke
6704e89c5a
Merge pull request #5841 from nextcloud/bugfix-stable12/2855/dont_send_invitations_for_past_events
...
[stable12] dont send invitations for past events
2017-08-30 21:01:32 +02:00
Bjoern Schiessle
b53587cf8d
update autoloader
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-08-30 20:36:48 +02:00
Bjoern Schiessle
181c77ca87
move repair step to stable12
...
because we decided to backport it the repair step needs to be executed
already on stable12
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-08-30 20:36:47 +02:00
Roeland Jago Douma
52833704d5
Bump version
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-30 20:36:47 +02:00
Bjoern Schiessle
3e6833f5a6
add prefix to user and system keys to avoid name collisions
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-08-30 20:36:10 +02:00
Bjoern Schiessle
5f49398e13
extend the identity proof manager to allow system wide key pairs
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-08-30 20:36:10 +02:00
Morris Jobke
bf720056c2
Merge pull request #6311 from nextcloud/stable12-specify-slo-url
...
[Stable12] specify slo url
2017-08-30 20:29:16 +02:00
Lukas Reschke
5755897712
Inject \OCP\IURLGenerator to make tests work
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-08-30 14:42:50 +02:00
Lukas Reschke
245080e647
Properly allow \OCP\Authentication\IApacheBackend to specify logout URL
...
Any `\OCP\Authentication\IApacheBackend` previously had to implement `getLogoutAttribute` which returns a string.
This string is directly injected into the logout `<a>` tag, so returning something like `href="foo"` would result
in `<a href="foo">`.
This is rather error prone and also in Nextcloud 12 broken as the logout entry has been moved with
054e161eb5 inside the navigation manager where one cannot simply inject attributes.
Thus this feature is broken in Nextcloud 12 which effectively leads to the bug described at nextcloud/user_saml#112 ,
people cannot logout anymore when using SAML using SLO. Basically in case of SAML you have a SLO url which redirects
you to the IdP and properly logs you out there as well.
Instead of monkey patching the Navigation manager I decided to instead change `\OCP\Authentication\IApacheBackend` to
use `\OCP\Authentication\IApacheBackend::getLogoutUrl` instead where it can return a string with the appropriate logout
URL. Since this functionality is only prominently used in the SAML plugin. Any custom app would need a small change but
I'm not aware of any and there's simply no way to fix this properly otherwise.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-08-30 14:42:46 +02:00
Nextcloud bot
c13a06b7a5
[tx-robot] updated from transifex
2017-08-30 00:08:36 +00:00
Morris Jobke
0433b31d74
Merge pull request #6300 from nextcloud/add-share-with
...
[stable12] Add shareWith to email template metadata
2017-08-29 17:56:42 +02:00
Morris Jobke
7fd3068184
Add shareWith to email template metadata
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-29 16:05:12 +02:00
Morris Jobke
eb1a8a1934
Merge pull request #6278 from nextcloud/stable12-6182-fixes-in-files-drop-js
...
[stable12] Fixes in files_drop.js
2017-08-29 14:49:05 +02:00
Björn Schießle
1f7ea1f295
Merge pull request #6284 from nextcloud/add-new-propfind-stable12
...
add propfind to detect encryption status
2017-08-29 10:48:30 +02:00
Nextcloud bot
a6ea872b1f
[tx-robot] updated from transifex
2017-08-29 00:08:37 +00:00
Morris Jobke
1af39e8734
Merge pull request #6287 from nextcloud/12-6255
...
[stable12] Add meta information to emails for better customisation
2017-08-28 18:34:30 +02:00
Morris Jobke
6f9c3ab8a6
Allow the expiration date to be set to null
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-28 17:47:51 +02:00
Morris Jobke
d0bb5c298d
Allow the expiration date to be set to null
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-28 17:33:43 +02:00
Joas Schilling
485dbc8d6c
Also for reset password
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-28 17:33:38 +02:00
Joas Schilling
7df1ddcf2c
Add meta information to emails for better customisation
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-28 17:33:35 +02:00
Bjoern Schiessle
9128786d09
add propfind to detect encryption status
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-08-28 14:03:21 +02:00
Nextcloud bot
eb71c1288d
[tx-robot] updated from transifex
2017-08-28 00:08:33 +00:00
Daniel Calviño Sánchez
575f0c8421
Do not iterate over the files
...
As "singleFileUpload" is used the "add" callback (which in turn calls
"addFileToUpload") will always be called with a single file. Therefore
there is no need to iterate over the files (and it is not done in the
other callbacks either, so this aligns the code with the rest of the
callbacks).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-27 18:37:44 +02:00
Daniel Calviño Sánchez
03c6c5bd93
Replace fileName variable with data.files[0].name
...
There is no need to store the file name, as the "data" parameter given to
all the callbacks provides a "files" attribute with all the files that
the callback refers to; moreover, it will always be a single file due to
the use of "singleFileUploads" in the jQuery File Upload plugin.
This also fixes the loading icon not disappearing when several files were
uploaded at once. "singleFileUploads" causes the "add" callback to be
called once for each file to be uploaded, so "fileName" was overwritten
with the name of each new file in the upload set; when "fileName" was
later used in the "done" callback to find the file in the list whose
loading icon replace with the MIME type icon "fileName" always had the
name of the last file, and thus its icon was the only one replaced.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-27 18:37:43 +02:00
Daniel Calviño Sánchez
b68bad45dc
Update the whole file item instead of only its contents
...
The "done" and "fail" callbacks both update the item for the uploaded
file using "setFileIcon". "setFileIcon" updates the contents of the
"<li>" element for the file, but the "fail" callback was giving
"setFileIcon" an element generated by the template, so the resulting
HTML contained a "<li>" element nested in another "<li>" element.
However, generating the HTML is better done through a template, so the
template now receives the icon to show in order to be used by a
successful upload and a failed one, and "setFileIcon" was changed to
"updateFileItem".
Note that the mimeTypeUrl does no longer need to be escaped, as
Handlebars templates escape the needed characters automatically.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-27 18:37:43 +02:00
Daniel Calviño Sánchez
8a1850f6b1
Remove "errorThrown" parameter
...
When the "fail" callback is called, "errorThrown" is a property of the
data object instead of a parameter.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-27 18:37:43 +02:00
Roeland Jago Douma
ad283e40b4
Merge pull request #6270 from nextcloud/6252-12
...
[stable12] Don't try the actual file upload if the checks already error out
2017-08-26 18:32:03 +02:00
Roeland Jago Douma
0ec858f7e9
Merge pull request #6269 from nextcloud/6251-12
...
[stable12] Don't fetch the translation from core but from files
2017-08-26 16:26:40 +02:00
Roeland Jago Douma
0228dd7d50
Merge pull request #6268 from nextcloud/smb-2.0.2-12
...
[12] update icewind/smb to 2.0.2
2017-08-26 13:50:53 +02:00
Roeland Jago Douma
f29384a057
Merge pull request #6243 from nextcloud/stable12-circles-token
...
using CircleProvider on token
2017-08-26 13:49:25 +02:00
Roeland Jago Douma
99b102e15d
Don't try the actual file upload if the checks already error out
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-26 13:34:29 +02:00
Roeland Jago Douma
7338f7aa21
Don't fetch the translation from core but from files
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-26 13:33:34 +02:00
Robin Appelman
6f06426bd4
update icewind/smb to 2.0.2
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-08-26 12:14:43 +02:00
Nextcloud bot
2c6bc236cb
[tx-robot] updated from transifex
2017-08-26 00:08:36 +00:00
Roeland Jago Douma
8c0042c30c
Merge pull request #6258 from nextcloud/stable12_6244
...
[stable12] [drone] Give redis a change to fireup
2017-08-25 11:29:21 +02:00
Roeland Jago Douma
a9ee70b688
[drone] Give redis a change to fireup
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-25 10:40:02 +02:00
Nextcloud bot
992c91e288
[tx-robot] updated from transifex
2017-08-25 00:09:08 +00:00
Morris Jobke
4c2f194589
Merge pull request #6114 from nextcloud/stable12_5852
...
[stable12] Delete trash using node API to trigger preview deletion
2017-08-24 02:59:44 +02:00
Morris Jobke
5fab554bd2
Merge pull request #6108 from nextcloud/backport-6080-12
...
[stable12] Add buttom border for header
2017-08-24 02:58:03 +02:00
Morris Jobke
1928863ee7
Merge pull request #6233 from nextcloud/stable12_6218
...
[stable12] [3rdparty] Fix sabre/xml empty prop parsing
2017-08-24 02:56:28 +02:00
Nextcloud bot
9baf03d28c
[tx-robot] updated from transifex
2017-08-24 00:09:00 +00:00
Roeland Jago Douma
81acf70bca
Merge pull request #6240 from nextcloud/12-6239
...
[stable12] Show "Uploading..." in web UI for long uploads
2017-08-23 19:16:50 +02:00
Maxence Lange
0d4803e6dc
using CircleProvider on token
...
Signed-off-by: Maxence Lange <maxence@artificial-owl.com >
2017-08-23 16:58:32 +02:00
Morris Jobke
4cf7c351ea
Merge pull request #6237 from nextcloud/12-drone-ci-images
...
[stable12] Use docker images without XDebug and with Opcache
2017-08-23 16:48:26 +02:00
Morris Jobke
618014130e
Merge pull request #6166 from nextcloud/stable12-bump-dompurify
...
[Stable12] Bump dompurify
2017-08-23 16:43:33 +02:00
Roeland Jago Douma
9b3e70f554
Merge pull request #6151 from nextcloud/backport-6099-no-exception-on-sharee-error
...
[stable12] Catch exceptions on error of cloud id resolution
2017-08-23 15:59:33 +02:00
Roeland Jago Douma
a62620feeb
Merge pull request #6148 from nextcloud/backport-6047-select-indexed-columns
...
[stable12] Use indexed column path_hash to find the parent
2017-08-23 15:58:59 +02:00
Morris Jobke
47f87bbf8c
Show "Uploading..." in web UI for long uploads
...
If the estimated upload time is bigger than 4 hours it shows the text
"Uploading..." because the time then doesn't give any good hint to the
user anyways.
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-23 15:53:48 +02:00
Morris Jobke
b1e268e2c1
Use docker images without XDebug and with Opcache
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-23 15:28:25 +02:00
Roeland Jago Douma
96509ae621
[3rdparty] Fix sabre/xml empty prop parsing
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-23 14:33:14 +02:00
Nextcloud bot
8f20b4566a
[tx-robot] updated from transifex
2017-08-23 00:09:04 +00:00
Roeland Jago Douma
efdf1a4bb5
Merge pull request #6197 from nextcloud/stable12-check-encoding-log
...
[Stable12] check encoding log
2017-08-22 09:09:35 +02:00
Nextcloud bot
8e8af07e79
[tx-robot] updated from transifex
2017-08-22 00:08:29 +00:00
Morris Jobke
4617f5f656
Merge pull request #6207 from nextcloud/12-6201
...
[stable12] Increase contrast of dropdown menu text, fix accessibility & visibility issues
2017-08-21 22:10:14 +02:00
Jan-Christoph Borchardt
599398e4a0
Increase contrast of dropdown menu text, fix accessibility & visibility issues
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net >
2017-08-21 16:34:53 +02:00
Morris Jobke
a90d6090a7
Merge pull request #6195 from nextcloud/12-6194
...
[stable12] Use correct l10n for app password menu
2017-08-21 12:24:31 +02:00
Lukas Reschke
179b850e4d
Ensure log message is UTF-8 encoded
...
PHP's json_encode only accept proper UTF-8 strings, loop over all
elements to ensure that they are properly UTF-8 compliant or convert
them manually.
Without this somebody passing an invalid User Agent may make json_encode
return false which will get logged as empty newline.
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-08-21 10:21:54 +02:00
Morris Jobke
296f71dd9a
Use correct l10n for app password menu
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-21 09:22:52 +02:00
Nextcloud bot
de8fe9cbd9
[tx-robot] updated from transifex
2017-08-21 00:08:22 +00:00
Nextcloud bot
6ea56593a7
[tx-robot] updated from transifex
2017-08-20 00:08:24 +00:00
Nextcloud bot
366c73a185
[tx-robot] updated from transifex
2017-08-19 00:08:36 +00:00
Morris Jobke
ddf7e0629c
Merge pull request #6173 from nextcloud/12-6161
...
[stable12] Enable object storage tests again
2017-08-18 23:02:10 +02:00
Nextcloud bot
7e0c00b576
[tx-robot] updated from transifex
2017-08-18 00:08:25 +00:00
Morris Jobke
37bc43c19c
Enable object storage tests again
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-17 19:35:26 +02:00
Lukas Reschke
b88072d336
Build merged JS
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-08-17 12:36:32 +02:00
Lukas Reschke
8cb3624aab
Bump DOMPurify to 1.0.0
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-08-17 12:36:16 +02:00
Roeland Jago Douma
73e7560655
Merge pull request #6127 from nextcloud/12-6126
...
[stable12] Trigger search after re-focus
2017-08-17 09:16:28 +02:00
Nextcloud bot
948d6742ce
[tx-robot] updated from transifex
2017-08-17 00:08:23 +00:00
Morris Jobke
3326118bdc
Merge pull request #6150 from nextcloud/backport-6128-primary-font-color-in-capabilities
...
[stable12] Add the primary font color to the capabilities as well
2017-08-16 21:51:57 +02:00
Joas Schilling
8f68e0a153
Document that it throws
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-16 13:57:45 +02:00
Joas Schilling
bd80121fc6
Catch exceptions on error of cloud id resolution
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-16 13:57:30 +02:00
Joas Schilling
5474e298a1
Add the primary font color to the capabilities as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-16 11:51:15 +02:00
Morris Jobke
669c82afea
Merge pull request #6111 from nextcloud/backport-6098-12
...
[stable12] Fix federation scope dropdown
2017-08-16 11:25:11 +02:00
Joas Schilling
fa8e202e65
Merge pull request #6112 from nextcloud/backport-5920-12
...
[stable12] Top bar buttons in share view are wrong positioned
2017-08-16 11:12:53 +02:00
Joas Schilling
ccb758ade3
Use indexed column path_hash to find the parent
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-16 10:49:30 +02:00
Nextcloud bot
7913d33de9
[tx-robot] updated from transifex
2017-08-16 00:08:42 +00:00
Morris Jobke
faa83c3250
Trigger search after re-focus
...
If the share input field is unfocused, the autocomplete list is closed. Once
the field was focused again it was not properly opened again. This adds a
trigger to redo the search and show the results again.
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-15 13:40:35 +02:00
Roeland Jago Douma
32b69cd40b
Delete trash using node API to trigger preview deletion
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-15 08:52:13 +02:00
Nextcloud bot
cd2d5b0b27
[tx-robot] updated from transifex
2017-08-15 00:08:25 +00:00
Marin Treselj
83616aea4f
Make sure this still works in other apps.
...
Signed-off-by: Marin Treselj <marin@pixelipo.com >
2017-08-14 22:24:09 +02:00
Marin Treselj
eaa00ea2c8
Change id to class in the main share template
...
Signed-off-by: Marin Treselj <marin@pixelipo.com >
2017-08-14 22:24:00 +02:00
Marin Treselj
84b0790b99
Fixes nextcloud/gallery#269
...
Signed-off-by: Marin Treselj <marin@pixelipo.com >
2017-08-14 22:21:42 +02:00
Morris Jobke
b31dfec9b8
Fix federation scope dropdown
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-14 22:15:49 +02:00
Morris Jobke
cafce87a78
Add buttom border for header
...
* allows to distinct the header from the rest of the UI for bright colors
* ref #5654
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-14 18:00:36 +02:00
Robin Appelman
5d2b6b8240
Merge pull request #6103 from nextcloud/swift-filter-dot-12
...
[12] Filter magic dot object when swift directory
2017-08-14 17:30:24 +02:00
Robin Appelman
e3166a601d
Filter magic dot object when swift directory
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-08-14 15:40:25 +02:00
Nextcloud bot
99cef14c31
[tx-robot] updated from transifex
2017-08-14 00:08:31 +00:00
Nextcloud bot
4a140398a9
[tx-robot] updated from transifex
2017-08-13 00:08:23 +00:00
Nextcloud bot
ee73ddd8a9
[tx-robot] updated from transifex
2017-08-12 00:08:28 +00:00
Nextcloud bot
aa51202d98
[tx-robot] updated from transifex
2017-08-11 00:08:30 +00:00
Morris Jobke
27f44b4600
Merge pull request #6067 from nextcloud/stable12-5981-fix-preview-of-theming
...
[stable12] Fix preview of theming
2017-08-10 21:01:01 +02:00
Morris Jobke
36d6a24402
Merge pull request #6061 from nextcloud/stable12_6052
...
[stable12] Fix copy from jailed storage
2017-08-10 13:57:18 +02:00
Daniel Calviño Sánchez
0b1dab14ca
Fix preview of theming
...
Pull request #5584 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist; as the
file can not be loaded the "Loading preview" message is never removed
and the "Saved" message is never shown.
As it now depends on the hash of the base URL the file to be reloaded
can no longer be hardcoded, so the full URL to the "server.css" file
that has to be reloaded (if any) is now got from the DataResponse
provided by the controller.
Fixes #5975
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-10 13:45:31 +02:00
Daniel Calviño Sánchez
364b1b4a20
Refactor reloadStylesheets to receive absolute URLs
...
This is a preparatory step for a following change in which
reloadStylesheets will have to be able to receive absolute URLs.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-10 13:45:31 +02:00
Daniel Calviño Sánchez
5b0d7056e8
Provide "server.css" URL in ThemingController response
...
Pull request #5584 made cached SCSS files depend on a hash of the base
URL, so the "/css/core/server.css" file does no longer exist. The
"server.css" URL must be known by the Theming app in order to update the
stylesheets when previewing the changes to the theme, so the
DataResponse from the controller now provides the full URL to the
"server.css" file that has to be reloaded (if any).
The "server.css" URL provided by the response will be taken into account
by the JavaScript front-end in a following commit.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-10 13:44:49 +02:00
Daniel Calviño Sánchez
e883061f58
Split updateStylesheet tests for success and error
...
This is a preparatory step for a following commit in which the
properties present in the response will change depending on whether the
request was successful or not.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-10 13:42:42 +02:00
Daniel Calviño Sánchez
8d93a0db8a
Unify DataResponse format with its uses in the rest of the file
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-10 13:42:42 +02:00
Daniel Calviño Sánchez
0b00d770fe
Add acceptance tests for setting the color in the Theming app
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-10 13:42:29 +02:00
Daniel Calviño Sánchez
340a774fe2
Add getter for the timeout multiplier
...
In some cases the acceptance tests have to explicitly wait for something
to happen without using the "find" method from the actor; in those cases
the timeout multiplier needs to be taken into account too, so the test
cases must be able to retrieve it from the actor.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-10 13:34:38 +02:00
Roeland Jago Douma
745ad2f323
Fix copy from jailed storage
...
If we have a jailed storage we must also fix the internal path on copy.
Else we pass in the wrong path.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-10 08:07:00 +02:00
Nextcloud bot
79f4b8566b
[tx-robot] updated from transifex
2017-08-10 00:08:24 +00:00
Morris Jobke
d9301a5b07
Fix redis-cluster support on drone
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-09 23:04:29 +02:00
Morris Jobke
2e115921a0
Update syntax to drone 0.8
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-09 12:30:25 +02:00
Nextcloud bot
72029627fc
[tx-robot] updated from transifex
2017-08-09 00:08:30 +00:00
Morris Jobke
cd095bb0b8
Merge pull request #5978 from nextcloud/12-5908
...
[stable12] Add css class for toogle preview icon
2017-08-08 19:23:35 +02:00
Morris Jobke
c78a209e72
Merge pull request #5979 from nextcloud/12-5738
...
[stable12] Improve spelling in LDAP
2017-08-08 19:23:12 +02:00
Morris Jobke
39d1428ab3
Merge pull request #6008 from nextcloud/stable12-5969-fix-vertical-alignment-of-loading-icon-and-status-message-in-theming-app
...
[stable12] Fix vertical alignment of loading icon and status message in Theming app
2017-08-08 18:42:31 +02:00
Morris Jobke
3f8e3fbb6b
Merge pull request #5946 from nextcloud/12-5897
...
[stable12] Send an email once a file/folder is shared with a user
2017-08-08 16:36:46 +02:00
Morris Jobke
e11dcfcf9e
Merge pull request #5966 from nextcloud/backport-oracle
...
[stable12] Fix oracle db
2017-08-08 16:34:25 +02:00
Morris Jobke
c119f66e75
Merge pull request #5937 from nextcloud/backend-can-be-wrong---sometimes
...
display error icon on non-success
2017-08-08 16:18:56 +02:00
Morris Jobke
2abc49968e
Merge pull request #5914 from nextcloud/12-5913
...
[stable12] Fix anchor name for federated sharing settings
2017-08-08 10:41:47 +02:00
Morris Jobke
bf4283bce8
Merge pull request #5945 from nextcloud/stable12_5836
...
[stable12] Empty search no longer works
2017-08-08 10:41:05 +02:00
Morris Jobke
bcea6a041f
Merge pull request #5984 from nextcloud/stable12-reopen-stable12-theming-lightness-correction
...
[stable12] Use same lightness calculation as the SCSS compiler for theming
2017-08-08 10:40:37 +02:00
Morris Jobke
3313c682bf
Merge pull request #5925 from derkostka/patch-1
...
[stable12] Removed cast to integer in getSize
2017-08-08 10:40:09 +02:00
Joas Schilling
cb4c37498d
Merge pull request #6001 from nextcloud/backport-5695-dont-throw-when-table-is-missing
...
[stable12] Don't throw an error when the table doesn't exist
2017-08-08 10:30:45 +02:00
Nextcloud bot
75d5989a8b
[tx-robot] updated from transifex
2017-08-08 00:08:19 +00:00
Daniel Calviño Sánchez
c91e39a4ca
Fix code style
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-07 15:01:06 +02:00
Daniel Calviño Sánchez
bb96c79bc7
Remove superfluous selector part
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-07 15:01:05 +02:00
Daniel Calviño Sánchez
6fe6c0545e
Align vertically loading icon and status message
...
As both elements are inline/inline-block and belong to the same line
they can be aligned vertically using "vertical-align: middle".
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-07 15:01:05 +02:00
Daniel Calviño Sánchez
21ad25465d
Do not use the same rules for loading icon than for upload icon
...
When an image is being uploaded the upload icon is replaced by a loading
icon, so the loading icon and the upload icon have to share their CSS
rules, but only in that specific case; in general the loading icon is
used in a totally different way than the upload icon and thus it should
not share its CSS rules.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-07 14:58:05 +02:00
Daniel Calviño Sánchez
4dd8c4b538
Remove ignored rules
...
The removed rules were either always overriden by other rules or never
used due to not matching any element.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-08-07 14:43:57 +02:00
Joas Schilling
0476de0674
Don't throw an error when the table doesn't exist
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-07 09:43:45 +02:00
Lukas Reschke
bfca9fbf11
Merge pull request #5989 from nextcloud/final-version-bump-stable12
...
Bump version to 12.0.1.5
2017-08-06 20:25:21 +02:00
Nextcloud bot
06a9357a49
[tx-robot] updated from transifex
2017-08-06 00:08:33 +00:00
Lukas Reschke
3640898e80
Bump version to 12.0.5
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-08-05 12:59:53 +02:00
Nextcloud bot
b521ef1bf0
[tx-robot] updated from transifex
2017-08-05 00:08:19 +00:00
Julius Härtl
e0ce8a7640
Use same lightness calculation as the SCSS compiler for theming
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-08-04 15:39:56 +02:00
Lukas Reschke
b500f8fbe9
Merge pull request #5983 from nextcloud/revert-5977-stable12-theming-lightness-correction
...
Revert "[stable12] theming lightness correction"
2017-08-04 15:39:15 +02:00
Lukas Reschke
3474d73cae
Revert "[stable12] theming lightness correction"
2017-08-04 15:38:56 +02:00
Lukas Reschke
9b57d33631
Merge pull request #5977 from nextcloud/stable12-theming-lightness-correction
...
[stable12] theming lightness correction
2017-08-04 15:38:08 +02:00
Lukas Reschke
0fabfaba69
Merge pull request #5976 from nextcloud/12.0.1rc5
...
v12.0.1RC5
2017-08-04 15:35:57 +02:00
Allan Nordhøy
ac977dd3a1
Improve spelling in LDAP
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-04 12:17:04 +02:00
Morris Jobke
1f189d6769
Add css class for toogle preview icon
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-04 12:15:51 +02:00
Julius Härtl
796f0f9333
Use same lightness calculation as the SCSS compiler for theming
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-08-04 12:13:33 +02:00
Lukas Reschke
4805ea24ad
v12.0.1RC5
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-08-04 11:11:10 +02:00
Nextcloud bot
91b6d903f7
[tx-robot] updated from transifex
2017-08-04 00:08:27 +00:00
Joas Schilling
3a111adc33
Add a method to compare empty strings with an expression
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:41:03 +02:00
Joas Schilling
4f31860fd6
Fix repair step for oracle...
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:40:54 +02:00
Joas Schilling
d6e902fd03
Fix last failures with oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:40:46 +02:00
Joas Schilling
ae55fefcf6
Fix querybuilder and functionbuilder tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:40:35 +02:00
Joas Schilling
bb30b876ae
Fix ILIKE regex for oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:40:26 +02:00
Joas Schilling
c9430fbb77
Fix auth provider
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:40:17 +02:00
Joas Schilling
54a4aa9315
Use selectAlias()
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:40:10 +02:00
Joas Schilling
d6b888461d
Can not insert auto increment on oracle
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:40:00 +02:00
Joas Schilling
18ba973c13
Fix missing escape on column and table name
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:39:51 +02:00
Joas Schilling
5d7cab245f
Fix clob comparison
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:39:41 +02:00
Joas Schilling
ee51c49bd7
Allow to specify the table space on occ
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:39:33 +02:00
Joas Schilling
5eef54c636
Quote aliases as well
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:39:21 +02:00
Joas Schilling
daa3cfcb70
Oracle does not support PDO::FETCH_KEY_PAIR
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-08-03 16:37:06 +02:00
Nextcloud bot
690ef25928
[tx-robot] updated from transifex
2017-08-03 00:08:15 +00:00
Morris Jobke
cf16087585
Disable default activity email for incoming shares
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-02 20:57:12 +02:00
Nextcloud bot
ecc82fc1e6
[tx-robot] updated from transifex
2017-08-02 00:08:21 +00:00
Morris Jobke
1ef19bb0ec
Send an email once a file/folder is shared with a user
...
* only if user has set an email address
* only for user shares (no group shares for now)
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-08-01 15:17:32 +02:00
Roeland Jago Douma
e73f46e344
Empty search no longer works
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-08-01 13:29:17 +02:00
Maxence Lange
e34114072e
now, with less CSS
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com >
2017-08-01 03:23:58 +02:00
Nextcloud bot
9f346fecf1
[tx-robot] updated from transifex
2017-08-01 00:08:35 +00:00
Maxence Lange
e62363275d
display error icon on non-success
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com >
2017-07-31 15:22:25 +02:00
Nextcloud bot
b3e2f57f98
[tx-robot] updated from transifex
2017-07-31 00:08:12 +00:00
Lukas Reschke
0a369747a0
Merge pull request #5924 from nextcloud/12.0.1rc4
...
12.0.1RC4
2017-07-30 15:39:19 +02:00
Nextcloud bot
a6499afb5b
[tx-robot] updated from transifex
2017-07-30 00:08:13 +00:00
Sebastian Kostka
09b120c6da
[Stable 12] Removed cast to integer in getSize
...
Fixes - Wrong or no sizes of files/folders #5031 for 32-bit systems a direct cast to integer causes problems.
Backport from #5744
Signed-off-by: Sebastian Kostka <sebastian.kostka@gmail.com >
2017-07-29 07:40:13 +02:00
Nextcloud bot
820a74e71b
[tx-robot] updated from transifex
2017-07-29 00:08:40 +00:00
Lukas Reschke
4b325da037
12.0.1RC4
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-07-28 16:03:36 +02:00
Lukas Reschke
7425316b29
Merge pull request #5919 from nextcloud/add-brackets-on-concat-method
...
Add brackets around concat statements so comparing the result works a…
2017-07-28 15:35:49 +02:00
Joas Schilling
b8bd5808e8
Add brackets around concat statements so comparing the result works as intended
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-28 11:34:35 +02:00
Morris Jobke
635dc7e08c
Fix anchor name for federated sharing settings
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-28 08:23:06 +02:00
Nextcloud bot
ee4804b1da
[tx-robot] updated from transifex
2017-07-28 00:08:14 +00:00
Morris Jobke
2476a5f0e3
Merge pull request #5902 from nextcloud/oc-migration
...
Add a repair step to drop the account_terms table on oc migration
2017-07-27 17:25:21 +02:00
Morris Jobke
2f153fe4e6
Merge pull request #5896 from nextcloud/12-5895
...
[stable12] Fix show password button for password change
2017-07-27 13:26:17 +02:00
Joas Schilling
690efbd4eb
Use the existing array of OC versions
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-27 12:30:24 +02:00
Lukas Reschke
4b58eccf61
This is RC3
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-07-27 11:49:16 +02:00
Joas Schilling
d06d86a719
Add a repair step to drop the account_terms table on oc migration
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-27 11:38:55 +02:00
Nextcloud bot
569892d3c0
[tx-robot] updated from transifex
2017-07-27 00:08:13 +00:00
Morris Jobke
1f82223883
Fix show password button for password change
...
* fix the show password button on the personal page
* before: if the password change failed the show password icon was not shown again
* after: show password icon is visible
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-26 22:57:56 +02:00
Morris Jobke
2290255bb2
Merge pull request #5883 from nextcloud/12-5871
...
[stable12] Enable postgres on drone again
2017-07-26 22:31:20 +02:00
Lukas Reschke
7c0e1c4860
Merge pull request #5889 from nextcloud/stable12-overlay-on-show-password
...
fix overlay on show password
2017-07-26 16:55:34 +02:00
Morris Jobke
c929e3ad26
Merge pull request #5875 from nextcloud/stable12-edu-edition
...
[stable12] Add new bundle
2017-07-26 16:47:32 +02:00
Maxence Lange
c87002105d
fix overlay on show password
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com >
2017-07-26 16:18:57 +02:00
Morris Jobke
6b79d77dd2
Enable postgres on drone again
...
* use proper password
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-26 14:17:53 +02:00
Lukas Reschke
7568b04705
Add new bundle
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-26 11:47:15 +02:00
Nextcloud bot
2902677ccf
[tx-robot] updated from transifex
2017-07-26 00:08:14 +00:00
Lukas Reschke
f386fbfe1e
Merge pull request #5851 from nextcloud/make-it-rc2
...
v12.0.1 RC2
2017-07-25 10:28:17 +02:00
Nextcloud bot
79522f4078
[tx-robot] updated from transifex
2017-07-25 00:08:13 +00:00
Lukas Reschke
886a8d12c3
v12.0.1 RC2
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-07-24 16:16:57 +02:00
Morris Jobke
aea95e48f8
Merge pull request #5858 from nextcloud/12-5850
...
[stable12] proper logo height in emails for Outlook
2017-07-24 16:16:16 +02:00
Morris Jobke
f45e4471f0
Remove unneeded styles
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-24 13:46:17 +02:00
Lukas Reschke
3353dbfab4
Adjust to height=120
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-07-24 13:46:09 +02:00
Nextcloud bot
65dba8a558
[tx-robot] updated from transifex
2017-07-24 00:08:13 +00:00
Roeland Jago Douma
4ec8cac3ec
Merge pull request #5830 from nextcloud/12-5812
...
[stable12] Fix for mb strlen
2017-07-23 14:05:17 +02:00
Georg Ehrke
7b113bb18a
Sabre/VObject returns DateTimeImmutable, not a simple DateTime
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com >
2017-07-23 09:36:35 +02:00
Georg Ehrke
702d13cc79
don't send invitation emails for past events
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com >
2017-07-23 09:36:24 +02:00
Nextcloud bot
12590bf3d8
[tx-robot] updated from transifex
2017-07-23 00:08:07 +00:00
Robin Appelman
13831085c3
add tests for renaming paths with multibyte utf8 characters
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-22 11:10:37 +02:00
Artem Kochnev
3d54cef078
Fix for mb strlen
...
Error with moving files with long names in UTF-8
2017-07-22 11:10:25 +02:00
Nextcloud bot
f91d6624cd
[tx-robot] updated from transifex
2017-07-22 00:08:16 +00:00
Morris Jobke
2663aa253e
Merge pull request #5826 from nextcloud/12-backport-5821
...
[stable12] Fix error message on untrusted domain error page
2017-07-21 23:35:46 +02:00
Morris Jobke
816f1e63e9
Merge pull request #5757 from nextcloud/mount-rename-12
...
[12] Fix renaming of non-renamble mounts
2017-07-21 23:30:42 +02:00
Morris Jobke
111844e7b1
Fix error message on untrusted domain error page
...
Fixes #5347
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-21 16:16:48 +02:00
Morris Jobke
c6e3368af7
Merge pull request #5786 from nextcloud/path-repair-steps-storage-12
...
[12] Also repair storage id's when repairing invalid entries
2017-07-21 14:03:38 +02:00
Roeland Jago Douma
73b293fa6a
Merge pull request #5754 from nextcloud/fed-unshare-fail-remote-12
...
[12] still remove the federated share even if we cant notify the remote
2017-07-21 12:46:31 +02:00
Roeland Jago Douma
4165d5bca6
Merge pull request #5792 from nextcloud/stable12-prevent-php7.2-usage
...
[stable12] Show warning if PHP 7.2 is used
2017-07-21 12:38:34 +02:00
Roeland Jago Douma
d338869257
Merge pull request #5805 from nextcloud/fix-public-links-stable12
...
[stable12] fix preview for public links
2017-07-21 11:02:02 +02:00
Lukas Reschke
091cba8374
Show warning if PHP 7.2 is used
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-07-21 09:40:47 +02:00
Nextcloud bot
9fe53e2649
[tx-robot] updated from transifex
2017-07-21 00:08:16 +00:00
Morris Jobke
fd25265849
Merge pull request #5807 from nextcloud/12-backport-5790
...
[stable12] Fix config.sample.php documentation
2017-07-20 22:38:15 +02:00
Björn Schießle
c9624d2695
Merge pull request #5630 from nextcloud/add-recovery-key-on-public-upload-stable12
...
[stable12] Add recovery key on public upload
2017-07-20 14:27:57 +02:00
Roeland Jago Douma
07ebc7b1c3
Merge pull request #5759 from nextcloud/backport-translations-stuff-12
...
[stable12] Backport translation fixes
2017-07-20 14:25:11 +02:00
Morris Jobke
ad1c6a0fc2
Merge pull request #5804 from nextcloud/12-backport-5800
...
[stable12] Enable acceptance tests again on Drone 0.7
2017-07-20 13:07:59 +02:00
Morris Jobke
bf79293e13
Fix config.sample.php documentation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-20 12:32:46 +02:00
Bjoern Schiessle
fff804c39e
make sure that we always have a owner
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-07-20 11:43:39 +02:00
Bjoern Schiessle
f7a2b96507
Add recovery key on public upload
...
In order to decide if a recovery key needs to be added we always
need to check the files owner settings and not the settings of
the currently logged in user.
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-07-20 11:43:39 +02:00
Daniel Calviño Sánchez
6602455efc
Enable acceptance tests again on Drone 0.7
...
Running the acceptance tests on Drone relied on the pod-style networking
used by services (service containers were available at 127.0.0.1 from
the build containers). However, in Drone 0.7 service and build
containers must be accessed from each other using their domain name
instead. Thus, acceptance tests had to be disabled on Drone.
Now that the acceptance test system supports setting a different domain
for the Selenium server and for the Nextcloud test server the acceptance
tests can be enabled again on Drone.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-07-20 11:33:03 +02:00
Daniel Calviño Sánchez
fcc1570789
Add option to acceptance test runner to set the Selenium server
...
By default "127.0.0.1:4444" is used, so nothing needs to be set when the
acceptance tests and the Selenium server share the same network (like
when called by "run.sh").
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-07-20 11:32:58 +02:00
Daniel Calviño Sánchez
140b23f85f
Add option to acceptance test runner to set the Nextcloud server domain
...
By default "127.0.0.1" is used, so nothing needs to be set when the
Selenium server and the Nextcloud test server share the same network
(like when called by "run.sh").
Besides passing the domain to the acceptance tests the Nextcloud test
server configuration must be modified to see the given domain as a
trusted domain; otherwise the access would be forbidden.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-07-20 11:32:54 +02:00
Daniel Calviño Sánchez
9722291454
Make possible to configure the domain for the Nextcloud test server
...
The NextcloudTestServerLocalHelper started the PHP built-in web server
for the Nextcloud test server at 127.0.0.1; as the Selenium server has
to access the Nextcloud test server they were forced to share the same
network. Now, the domain at which the PHP built-in web server is started
can be specified when the NextcloudTestServerLocalHelper is created,
which removes the need of sharing the same network, as the Selenium
server now can access the Nextcloud test server at an arbitrary domain.
However, by default "127.0.0.1" is still used if no domain is given.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-07-20 11:32:50 +02:00
Bjoern Schiessle
2634f77741
fix preview for public links
...
in case a user is already logged in on the same server from
which the public link comes from, we need to setup the owners
file system in order to show the preview
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-07-20 11:31:31 +02:00
Lukas Reschke
cd6afb6957
Merge pull request #5796 from nextcloud/backport-allow-to-theme-emails
...
[stable12] Backport allow to theme emails
2017-07-20 10:20:30 +02:00
Nextcloud bot
9cbdca60d2
[tx-robot] updated from transifex
2017-07-20 00:08:13 +00:00
Joas Schilling
c6f57fe22d
Allow to overwrite the email template again
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-19 17:59:12 +02:00
Joas Schilling
336ce139ae
Merge pull request #5777 from nextcloud/app-menu-ellipsis-stable12
...
[stable 12] Add ellipsis for app titles in the app menu popover
2017-07-19 16:21:30 +02:00
Joas Schilling
fef3c61378
Merge pull request #5784 from nextcloud/backport-5745-12
...
[stable12] Fix emitting of legacy hook post_unshare
2017-07-19 15:06:16 +02:00
Morris Jobke
3e4685b851
Merge pull request #5782 from nextcloud/backport-5781-stable12
...
[stable12] Allow overwriting of IOS theming values
2017-07-19 12:37:29 +02:00
Robin Appelman
9c2dce34e9
Also repair storage id's when repairing invalid entries
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-19 12:34:00 +02:00
Pauli Järvinen
22b29943ed
Fix emitting of legacy hook post_unshare
...
- When a file was unshared, the legacy hook pre_unshare fired twice and the hook post_unshare did not fire at all. This was obviously a copy-paste error.
Signed-off-by: Pauli Järvinen <pauli.jarvinen@gmail.com >
2017-07-19 11:42:23 +02:00
Morris Jobke
ff9c5072f0
Add Android and iOS URLs to theming app
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-19 10:57:38 +02:00
Roeland Jago Douma
235f4d614a
Allow overwriting of IOS theming values
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-07-19 10:57:25 +02:00
Nextcloud bot
fad8b275f1
[tx-robot] updated from transifex
2017-07-19 00:08:32 +00:00
Morris Jobke
e00d5ab0be
Merge pull request #5765 from nextcloud/update-3rdparty-12
...
Update 3rdparty for "Fix infinite propfinds reporting files as direct…
2017-07-18 23:13:32 +02:00
Roeland Jago Douma
3a9bc85976
Merge pull request #5771 from nextcloud/path-repair-steps-loop-12
...
[12] Fix invalid path repair step not getting all invalid entries
2017-07-18 22:23:22 +02:00
Morris Jobke
bcff249f2a
Merge pull request #5762 from nextcloud/files-checker-12
...
[stable12] Add test to check if new files are added to the root of the repository
2017-07-18 21:12:53 +02:00
Marin Treselj
33637c89f7
Add ellipsis for app titles in the app menu popover
...
Backport of #5733
Signed-off-by: Marin Treselj <marin@pixelipo.com >
2017-07-18 20:57:20 +02:00
Morris Jobke
01500f34b9
Add test to check if new files are added to the root of the repository
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-18 20:32:26 +02:00
Robin Appelman
c17b07667e
Fix invalid path repair step not getting all invalid entries
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-18 14:03:41 +02:00
Joas Schilling
6506508f2a
Update 3rdparty for "Fix infinite propfinds reporting files as directories"
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-18 10:07:50 +02:00
Allan Nordhøy
a91ce85fed
: Bigversal
2017-07-18 09:12:37 +02:00
Allan Nordhøy
f29d8bda3e
- your
...
This avoids it being «"access to your "the cloud"» or similar. Italicizing %s might be a middleground here.
2017-07-18 09:12:31 +02:00
Allan Nordhøy
8bc18a1b4d
sent, an invitation, - successful
2017-07-18 09:12:24 +02:00
Allan Nordhøy
ee3c7fc8cb
log out, : Bigversal
2017-07-18 09:12:07 +02:00
Allan Nordhøy
9eb5eebfad
: Bigversal and LDAP
2017-07-18 09:11:56 +02:00
Allan Nordhøy
79e9f0a15b
command-line, Consider narrowing
2017-07-18 09:11:45 +02:00
Allan Nordhøy
40eeaf4bb8
Spelling: Shortening and binding
2017-07-18 09:11:30 +02:00
Nextcloud bot
041e327a6c
[tx-robot] updated from transifex
2017-07-18 00:08:12 +00:00
Robin Appelman
8bfa3922a3
fix parsing of dav permissions
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-17 15:40:49 +02:00
Robin Appelman
d7620e3970
non movable mounts can not be moved
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-17 15:40:45 +02:00
Robin Appelman
e49b8959c4
still remove the federated share even if we cant notify the remote
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-17 14:21:22 +02:00
Lukas Reschke
515d83236b
Merge pull request #5728 from nextcloud/bump-stable12-version
...
12.0.1RC1
2017-07-17 08:16:22 +02:00
Nextcloud bot
3fefa01709
[tx-robot] updated from transifex
2017-07-17 00:08:12 +00:00
Lukas Reschke
d928468524
12.0.1RC1
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-07-16 11:13:42 +02:00
Nextcloud bot
0463ef7e3b
[tx-robot] updated from transifex
2017-07-15 00:09:06 +00:00
Morris Jobke
81d785b680
Merge pull request #5730 from nextcloud/stable12-fix-drone
...
[stable12] fix drone for 0.7
2017-07-14 23:34:12 +02:00
Morris Jobke
d61fc0531f
Temporarily disable acceptance and object storage tests
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-14 21:49:20 +02:00
Morris Jobke
239ff34f3d
Fix drone
...
Fix service container host name
check current folder
fix redis for integration test
Fix more hostnames
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-14 13:02:16 +02:00
blizzz
b9d7c48acf
Merge pull request #5711 from nextcloud/null-user-exist-12
...
[12] null users dont exist
2017-07-14 12:38:27 +02:00
Nextcloud bot
281e5eb8bc
[tx-robot] updated from transifex
2017-07-14 00:08:47 +00:00
Morris Jobke
9a07f78480
Merge pull request #5710 from nextcloud/nested-permissions-mask-12
...
[12] Fix scan permissions with nested permissions masks
2017-07-13 23:42:15 +02:00
Morris Jobke
90972044b1
Merge pull request #5655 from nextcloud/moveFromCache-from-shared-12
...
[12] fix moving folders out of a cache jail
2017-07-13 16:35:57 +02:00
Robin Appelman
ce45f87699
null users dont exist
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-13 15:54:16 +02:00
Morris Jobke
61bac5637f
Merge pull request #5697 from nextcloud/stable12-4984
...
Write cert bundle to tmp file first
2017-07-13 15:08:37 +02:00
Robin Appelman
5804dfc078
Fix scan permissions with nested permissions masks
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-13 14:37:09 +02:00
Robin Appelman
069df4c8cb
chunk getting invalid paths and reuse queries
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-13 13:08:24 +02:00
Robin Appelman
95e17a8245
use a generator instead of fetching all rows at once
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-13 13:08:24 +02:00
Robin Appelman
64d0a0ffc9
adjust to moved repair step
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-13 13:08:23 +02:00
Morris Jobke
d422875ae4
Run repair step only once
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-13 13:08:23 +02:00
Robin Appelman
92b14fa8c0
Add repair step for invalid paths
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-13 13:08:23 +02:00
Robin Appelman
996269cfdd
fix moving folders out of a cache jail
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-13 13:08:23 +02:00
Morris Jobke
701a865db7
Merge pull request #5692 from nextcloud/upload-hidden-filelist-12
...
[12] properly block file upload to non-active filelist
2017-07-13 11:47:46 +02:00
Morris Jobke
7da78af4d4
Fix autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-13 11:47:35 +02:00
Nextcloud bot
a9b38c025f
[tx-robot] updated from transifex
2017-07-13 00:08:42 +00:00
Roeland Jago Douma
fe7c907e8c
Write cert bundle to tmp file first
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-07-12 20:21:27 +02:00
Robin Appelman
9e675dd8b1
fix test
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-12 12:20:14 +02:00
Robin Appelman
d05f67b2f3
properly block file upload to non-active filelist
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-12 12:20:10 +02:00
Roeland Jago Douma
38ee24d56b
Merge pull request #5687 from nextcloud/jail-propagator-12
...
[12] Fix propagating changes within jail wrapper
2017-07-12 11:50:10 +02:00
Roeland Jago Douma
405d3ccbd7
Merge pull request #5463 from nextcloud/shared-cache-during-init-12
...
[12] dont die if we try to access the shared cache while setting up the shared storage
2017-07-12 11:18:49 +02:00
Morris Jobke
ac7997901b
Merge pull request #5686 from nextcloud/backport-5520
...
hint should not be clickable
2017-07-12 10:44:31 +02:00
Nextcloud bot
05b03c173e
[tx-robot] updated from transifex
2017-07-12 00:08:54 +00:00
Morris Jobke
48351b4778
Merge pull request #5484 from nextcloud/fix-if-circles-is-deleted
...
Check if Circles is still here
2017-07-11 23:42:30 +02:00
Maxence Lange
02baa45898
wrong call
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com >
2017-07-11 20:21:06 +02:00
Maxence Lange
7464996c56
verify that circles is installed
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com >
2017-07-11 20:21:06 +02:00
Robin Appelman
2f7d0bbb18
Fix propagating changes within jail wrapper
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-11 19:20:51 +02:00
Maxence Lange
51107da4f4
hint should not be clickable
...
Signed-off-by: Maxence Lange <maxence@nextcloud.com >
2017-07-11 18:14:29 +02:00
Lukas Reschke
ce59546344
Merge pull request #5435 from nextcloud/backport-5124-allow-dirlisting-with-unreadable-items
...
[stable12] Allow dir-listing also when one child is blocked by access control
2017-07-11 16:08:43 +02:00
Morris Jobke
e768426b11
Merge pull request #5679 from nextcloud/stable12-5656-fix-unselecting-items-on-multi-select-dropdowns
...
[stable12] Fix unselecting items on multi select dropdowns
2017-07-11 15:34:30 +02:00
Daniel Calviño Sánchez
3a660a1b89
Enable the toggleSelect extension in multi-select dropdowns
...
The toggleSelect extension for Select2 makes possible to unselect items
in a multi-select dropdown by clicking on them; this behaviour should be
enabled in all the multi-select dropdowns used in the server.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-07-11 13:02:09 +02:00
Daniel Calviño Sánchez
bf4913acb9
Add select2-toggleselect to the JavaScript files to load
...
"select2-toggleselect.js" provides an extension to Select2 that makes
possible to unselect items in a multi-select dropdown by clicking on
them. It seems that its load slipped through when moving things around
in commit 6a470e59356b8c52115fe2790666027f38977604; this commit adds it
to the JavaScript files to be loaded in the same position that it should
have had in that commit (based on how the other declarations were
moved).
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-07-11 13:02:09 +02:00
Daniel Calviño Sánchez
00e0535aec
Add acceptance tests for unselecting items in dropdown for tags
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-07-11 13:02:09 +02:00
Morris Jobke
ad7e6cfc9c
Merge pull request #5670 from nextcloud/backport-5669-fix-remote-share-activity-emails
...
[stable12] Fix remote share activity emails
2017-07-11 12:21:30 +02:00
Daniel Calviño Sánchez
6cf19cc81a
Extract app navigation elements to its own context
...
The app navigation is not exclusive to the Files app but a generic
component used by other apps too, so its locators and steps should be in
its own context.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-07-11 11:54:57 +02:00
Daniel Calviño Sánchez
b72aa998d6
Fix typo
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-07-11 11:48:19 +02:00
Morris Jobke
8fdd9dbb04
Merge pull request #5667 from nextcloud/5649-stable12
...
[stable12] fix alignment of radio button and its label in encryption settings
2017-07-11 11:31:41 +02:00
Morris Jobke
5fcf2d2bad
Merge pull request #5665 from GitHubUser4234/ldap_password_renew_nc12fix_backport
...
[stable12] Ldap password renewal fixes for NC12
2017-07-10 15:03:31 +02:00
Roger Szabo
ff286cd131
Rectify variable $uid->$user
...
Signed-off-by: Roger Szabo <roger.szabo@web.de >
2017-07-10 18:38:30 +08:00
Joas Schilling
1ed251c6a9
Fix owner cloud id in unshare activity
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-10 12:28:45 +02:00
Joas Schilling
509bc4f1eb
Fix activity emails for accept/decline of remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-10 12:28:32 +02:00
Arthur Schiwon
0a71c1ccd3
fix alignment of radio button and its label in encryption settings
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-07-10 11:02:16 +02:00
Roger Szabo
500d2a0e2e
pass missing function parameter
...
Signed-off-by: Roger Szabo <roger.szabo@web.de >
2017-07-10 15:17:05 +08:00
Roger Szabo
b725738870
css for button adjustment for nc12
...
Signed-off-by: Roger Szabo <roger.szabo@web.de >
2017-07-10 15:16:55 +08:00
Roger Szabo
3e7a49e009
set needsPasswordReset flag correctly
...
Signed-off-by: Roger Szabo <roger.szabo@web.de >
2017-07-10 15:16:42 +08:00
Roger Szabo
28933322a2
suppress superflous php error on rejected password change
...
Signed-off-by: Roger Szabo <roger.szabo@web.de >
2017-07-10 15:16:12 +08:00
Nextcloud bot
28a37f04dc
[tx-robot] updated from transifex
2017-07-10 00:08:51 +00:00
Nextcloud bot
0324993342
[tx-robot] updated from transifex
2017-07-09 00:08:41 +00:00
Nextcloud bot
f80159f52a
[tx-robot] updated from transifex
2017-07-08 00:08:37 +00:00
Morris Jobke
a5182ab7c1
Merge pull request #5648 from nextcloud/backport-5483-png-files-for-activity-emails
...
[stable12] Use PNG icons for activity emails and ios client
2017-07-07 14:04:01 +02:00
Björn Schießle
8ad1123d5d
Merge pull request #5458 from nextcloud/backport-5375-shared-folder-for-remote-shares
...
[stable12] Use the share_folder config for remote shares
2017-07-07 11:54:11 +02:00
Joas Schilling
a6bae8ac44
Fix tests
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-07 11:16:54 +02:00
Joas Schilling
87e69b5510
Use PNG version of the icons for shipped activities
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-07 11:16:44 +02:00
Joas Schilling
43964d99ee
Add a flag to allow checking if SVGs are okay
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-07 11:16:37 +02:00
Morris Jobke
36e3f3cc2a
Merge pull request #5617 from nextcloud/backport-5615-fix-navigation-entries-for-group-restricted-apps
...
[stable12] Don't load navigation entries of restricted apps
2017-07-07 10:46:11 +02:00
Nextcloud bot
a1f3f1783e
[tx-robot] updated from transifex
2017-07-07 00:08:35 +00:00
Joas Schilling
33252cda9e
Adjust tests to the old settings menu
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-06 09:30:42 +02:00
Joas Schilling
596380a62f
Merge pull request #5433 from nextcloud/backport-5185-admin-audit-chunking-spam
...
[stable12] Don't try to generate logs for chunking paths
2017-07-06 08:43:39 +02:00
Nextcloud bot
f2ac9c6582
[tx-robot] updated from transifex
2017-07-06 00:08:53 +00:00
blizzz
40e454021b
Merge pull request #5619 from nextcloud/backport-5557-dont-log-passwords-on-dav-exceptions-either
...
[stable12] Don't log passwords on dav exceptions
2017-07-05 22:15:04 +02:00
Morris Jobke
2122cfce4b
Merge pull request #5434 from nextcloud/backport-5404-translated-hint-password-policy
...
Use translated Hint instead of english error on password policy
2017-07-05 16:21:30 +02:00
Joas Schilling
79f6773ef9
Don't log passwords on dav exceptions
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-05 15:10:38 +02:00
Joas Schilling
20091a21c9
Don't load navigation entries of restricted apps
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-07-05 15:07:56 +02:00
Morris Jobke
5f0932a5a7
Merge pull request #5613 from nextcloud/stable12-5549
...
[stable12] Add info text about updates
2017-07-05 12:52:25 +02:00
Jos Poortvliet
68b6c3fca8
Update admin.php
...
add a note on our staged roll-out.
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-05 11:40:26 +02:00
Joas Schilling
8b2d9251fd
Merge pull request #5584 from nextcloud/stable12-5429
...
[stable12] Use base url for cache prefix and SCSS caching
2017-07-05 11:30:08 +02:00
Nextcloud bot
3db7bd196d
[tx-robot] updated from transifex
2017-07-05 00:08:36 +00:00
Morris Jobke
29fdffb1af
Merge pull request #5525 from nextcloud/stable12-5517
...
[stable12] Enhance the logging if the part file can not be renamed
2017-07-04 19:36:08 +02:00
Morris Jobke
e0b01f9cb5
Merge pull request #5601 from nextcloud/stable12-5460-5526
...
[stable12] Improved logging for object storage and trashbin
2017-07-04 17:37:45 +02:00
Morris Jobke
2459eb80a7
Improve logging of trash bin inconsistencies
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-07-04 11:14:59 +02:00
Robin Appelman
a277101133
improved logging of objectore errors
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-07-04 11:14:41 +02:00
Morris Jobke
0d7d00d681
Merge pull request #5583 from nextcloud/stable12-5450
...
[stable12] Fix more icon in apps menu on bright backgrounds
2017-07-04 11:01:12 +02:00
Nextcloud bot
b1e230a7b6
[tx-robot] updated from transifex
2017-07-04 00:08:34 +00:00
Nextcloud bot
2711dbb445
[tx-robot] updated from transifex
2017-07-03 00:08:31 +00:00
Julius Härtl
9fbae1a174
Fix tests
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-07-02 14:03:36 +02:00
Julius Härtl
0c6e4edc19
Fix theming app to also use the prefix
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-07-02 14:03:35 +02:00
Julius Härtl
d9f83bac0f
Add tests and inject IRequest
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-07-02 14:03:35 +02:00
Julius Härtl
4c3b27da5c
Do not open version file again
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-07-02 14:03:35 +02:00
Julius Härtl
3801c3aa3f
Make cache and scss caching depend on the baseUrl
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-07-02 14:03:35 +02:00
Julius Härtl
9c1cfbe154
Fix more icon in apps menu on bright backgrounds
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-07-02 14:02:51 +02:00
Nextcloud bot
f02575db94
[tx-robot] updated from transifex
2017-07-02 00:08:23 +00:00
Nextcloud bot
4b6e5efd7e
[tx-robot] updated from transifex
2017-07-01 00:08:38 +00:00
Nextcloud bot
c892043dc9
[tx-robot] updated from transifex
2017-06-30 00:08:35 +00:00
Nextcloud bot
af6e02976a
[tx-robot] updated from transifex
2017-06-29 00:08:35 +00:00
Nextcloud bot
2767165d7f
[tx-robot] updated from transifex
2017-06-28 00:08:28 +00:00
Nextcloud bot
d13010ed2b
[tx-robot] updated from transifex
2017-06-27 00:08:26 +00:00
Nextcloud bot
31422c9c6e
[tx-robot] updated from transifex
2017-06-26 00:08:40 +00:00
Nextcloud bot
5e22b33096
[tx-robot] updated from transifex
2017-06-25 00:08:27 +00:00
Nextcloud bot
33bc17564c
[tx-robot] updated from transifex
2017-06-24 00:08:39 +00:00
Morris Jobke
8a0a09eb90
Enhance the logging if the part file can not be renamed
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-06-23 16:07:21 -05:00
Morris Jobke
8550fdf757
Merge pull request #5507 from derkostka/stable12
...
[stable12] Use realpath to obtain the webroot
2017-06-23 15:43:15 -05:00
Morris Jobke
cb9a6a81a4
Merge pull request #5521 from nextcloud/backport-5508-no-acitivity-before-login
...
[stable12] Don't create activities for email and password change before login
2017-06-23 11:23:50 -05:00
blizzz
0f7cb1fd65
Merge pull request #5509 from nextcloud/backport-5498-allow-to-force-a-language
...
[stable12] Allow to force a language and set it via the ocs api
2017-06-23 14:24:05 +02:00
Joas Schilling
7e714ae971
Don't create activities for email and password change before login
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-23 12:27:21 +02:00
Nextcloud bot
70afe8d03b
[tx-robot] updated from transifex
2017-06-23 00:09:22 +00:00
Joas Schilling
11cb6991f2
Merge pull request #5511 from nextcloud/5491-stable12
...
[stable12] Create users in non default backends first
2017-06-22 14:11:43 +02:00
Joas Schilling
7257206bcf
Create users in non default backends first
...
Most of the time, when people have multiple backends or add a
custom backend, they want to create the users there and not in
the default backend. But since that is registered first, users
were always created there.
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-22 13:02:53 +02:00
Morris Jobke
b0b39368b2
Update autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-06-22 09:56:07 +02:00
Joas Schilling
aafb45456f
Add unit tests for the new code
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-22 09:55:57 +02:00
Joas Schilling
4d18757a85
Allow to force a language and set it via the ocs api
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-22 09:54:39 +02:00
Sebastian Kostka
f0753cb56d
[stable12] Use realpath to obtain the webroot
...
Use realpath to obtain the webroot - backport
Signed-off-by: Sebastian Kostka sebastian.kostka@gmail.com
2017-06-22 08:37:11 +02:00
Nextcloud bot
00256ee18e
[tx-robot] updated from transifex
2017-06-22 00:08:46 +00:00
Morris Jobke
b150221fd0
Merge pull request #5489 from nextcloud/stable12-5061
...
[stable12] Fix example theme
2017-06-21 16:28:57 -05:00
Nextcloud bot
99d04b1917
[tx-robot] updated from transifex
2017-06-21 00:08:24 +00:00
Julius Härtl
1552924427
Move styles.css to server.css
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-06-20 19:29:10 +02:00
Morris Jobke
6f252aa04a
Merge pull request #5480 from nextcloud/backport-5459-group-admins-change-settings
...
[stable12] Don't try to save the setting when its not an admin
2017-06-20 10:54:09 -05:00
Joas Schilling
8600ba725a
Also allow group admins to toogle the storage location
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-20 10:54:05 +02:00
Joas Schilling
9ae715de75
Don't try to save the setting when its not an admin
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-20 10:53:26 +02:00
Nextcloud bot
0277400618
[tx-robot] updated from transifex
2017-06-20 00:08:51 +00:00
Robin Appelman
cbabc568db
dont die if we try to access the shared cache while setting up the shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-06-19 14:00:52 +02:00
Robin Appelman
e76081e858
Revert "dont die if we try to access the shared cache while setting up the shared storage"
...
Revent accidental push
This reverts commit ed89034047 .
2017-06-19 14:00:27 +02:00
Robin Appelman
64864bf654
dont die if we try to access the shared cache while setting up the shared storage
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-06-19 13:58:30 +02:00
Joas Schilling
b94a7a0ba3
Use the share_folder config for remote shares
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-19 10:21:56 +02:00
Nextcloud bot
deaa8b6885
[tx-robot] updated from transifex
2017-06-19 00:08:29 +00:00
Morris Jobke
c3b58918f1
Merge pull request #5442 from Bekcpear/stable12
...
Fix upload remaining time and uploadrate value
2017-06-17 18:32:47 -05:00
Morris Jobke
ab837da40b
Merge pull request #5420 from nextcloud/stable12-appmenu-fixes
...
[stable12] App menu fixes
2017-06-17 18:28:59 -05:00
Nextcloud bot
0e608188d2
[tx-robot] updated from transifex
2017-06-17 00:08:36 +00:00
Yaojin Qian
d41d48bd43
Fix upload remaining time and uploadrate value
...
1. The upload remaining time is always 'a few second' whatever a big or a
small file uploading.
This commit fixes it. The `new Date().getMilliseconds()` only return a
three digits number. When time arrived the next second, the millisecond
start from ZERO again. So `new Date().getTime()` is the righe choice.
And remaining time variables shoule be initialized when the file starts
uploading, otherwise the remaining time of a new upload will always be
'Infinity years' until you refresh the page.
2. The unit of `data.bitrate` is bit, but the argument unit of
`humanFileSize` function is byte, so it should be divided by 8.
Signed-off-by: Yaojin Qian <i@ume.ink >
2017-06-16 22:03:28 +08:00
Joas Schilling
0c522aa040
Fix unit test
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-16 10:47:56 +02:00
Joas Schilling
295a0c982c
Allow dir-listing also when one child is blocked by access control
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-16 10:47:46 +02:00
Joas Schilling
e667b31df5
Use translated Hint instead of english error on password policy
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-16 10:44:46 +02:00
Joas Schilling
9c2c42c7cc
Don't try to generate logs for chunking paths
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-16 10:42:07 +02:00
Nextcloud bot
3cb59ac602
[tx-robot] updated from transifex
2017-06-16 00:08:53 +00:00
Morris Jobke
3040eaefc7
Merge pull request #5428 from nextcloud/5384-stable12
...
[stable12] Allow to find local users by their email address
2017-06-15 12:53:34 -05:00
Joas Schilling
cdd4a75c17
Backport of #5384 to stable12
...
Allow to find local users by their email address
Signed-off-by: Joas Schilling <coding@schilljs.com >
Make sure to only add system users once
Signed-off-by: Joas Schilling <coding@schilljs.com >
Add unit test
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-15 19:23:31 +02:00
Morris Jobke
20d994f21d
Merge pull request #5422 from nextcloud/5190-stable12
...
[stable12] Treat PHP Errors on User session regenerate
2017-06-15 10:20:12 -05:00
Lukas Reschke
c93cad74f9
Merge pull request #5210 from nextcloud/ldap-attempt-reconnect-stable12
...
[stable12] Ldap attempt reconnect stable12
2017-06-15 13:29:42 +02:00
Arthur Schiwon
2ffdfeec28
Forward port of #5190 to stable12
...
Treat PHP Errors on User session regenerate
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
remove unnecessary lines…
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
change PHP errors to ErrorException in the session (PHP >=7)
Otherwise it might be that authentication apps are being disabled on
during operation while in fact the session handler has hiccup.
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-06-15 11:18:22 +02:00
Julius Härtl
02a63e9428
Show at least 8 icons, don't use percentage on mobile
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-06-15 10:55:17 +02:00
Patrik Kernstock
073d5dbc85
Decimal percentage, dynamic appIcon width
...
Signed-off-by: Patrik Kernstock <info@pkern.at >
2017-06-15 10:55:11 +02:00
Patrik Kernstock
6acabd64ca
Now using dynamic percentual appmenu limit
...
Signed-off-by: Patrik Kernstock <info@pkern.at >
2017-06-15 10:55:04 +02:00
Patrik Kernstock
d44786e9b7
Closed #5121 , remove appmenu limit
...
Signed-off-by: Patrik Kernstock <info@pkern.at >
2017-06-15 10:54:51 +02:00
Morris Jobke
aeb80e0f57
Merge pull request #5301 from nextcloud/bugfix-stable12/noid/fix_proppatch_requests_to_groupshares
...
[stable12] allow users to send PropPatch request when calendar is group-shared with them
2017-06-14 23:11:18 -05:00
Morris Jobke
c20faa1c98
Merge pull request #5299 from nextcloud/bugfix-stable12/4885/calendar_shares_url_special_char_issue
...
[stable12] urldecode group principals in Cal- and CardDAV backend
2017-06-14 23:10:19 -05:00
Nextcloud bot
1965889fc8
[tx-robot] updated from transifex
2017-06-15 00:08:52 +00:00
Morris Jobke
ec89aaa67a
Merge pull request #5416 from nextcloud/stable12-5392
...
[stable12] Use the guest.css for the maintenance page as well
2017-06-14 18:04:06 -05:00
Morris Jobke
11d9722474
Merge pull request #5397 from nextcloud/stable12-5072
...
[stable12] Fixed a crash caused by Local::copyFromStorage() not conforming to Co…
2017-06-14 11:30:38 -05:00
Morris Jobke
b911033e7a
Merge pull request #5026 from nextcloud/filename-input-tooltip-stable12
...
[stable12] Make file name input tooltip error text change
2017-06-14 11:29:03 -05:00
Morris Jobke
385317a344
Merge pull request #5401 from nextcloud/translate-oauth2
...
Translate OAuth2 in stable12
2017-06-14 11:22:56 -05:00
Morris Jobke
c603f54a1b
Use the guest.css for the maintenance page as well
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-06-14 11:10:20 -05:00
Joas Schilling
ac8d9afcfe
Merge pull request #5402 from nextcloud/stable12-fix/contactsmenu-l10n-search-placeholder
...
[stable12] Localize contacts menu search input placeholder
2017-06-14 14:45:15 +02:00
Joas Schilling
d07a661c94
Merge pull request #5386 from nextcloud/stable12-allow-to-share-to-local-users-via-email
...
[stable12] Prevent sending second WWW-Authenticate header
2017-06-14 14:24:01 +02:00
Christoph Wurst
aab5dd7d7e
Localize contacts menu search input placeholder
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at >
2017-06-14 11:52:52 +02:00
Joas Schilling
50ee4fba11
Translate OAuth2 in stable12
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-14 11:50:58 +02:00
Lukas Reschke
fbeb6659f8
Merge pull request #5362 from nextcloud/exclude-files-external-dir-from-encryption-stable12
...
[stable12] don't try to encrypt/decrypt the certificate bundle
2017-06-14 09:50:28 +02:00
Nextcloud bot
426a4c11d6
[tx-robot] updated from transifex
2017-06-14 00:08:49 +00:00
Morris Jobke
1d2c1cf579
Merge pull request #5296 from nextcloud/bugfix-stable12/5077/allow_proppatches_to_birthday_calendar
...
[stable12] allow PropPatch requests to contact_birthdays
2017-06-13 18:11:54 -05:00
Michael Munger
513401bdb6
Fixed a crash caused by Local::copyFromStorage() not conforming to Common::copyFromStorage. Issue# 5071
2017-06-13 18:05:16 -05:00
Morris Jobke
d4eb5cfecb
Merge pull request #5063 from nextcloud/backport-4969-activity-external-user-avatars
...
[stable12] Fix username and avatar for external users
2017-06-13 17:56:39 -05:00
Morris Jobke
4fec6dbf87
Merge pull request #5379 from nextcloud/stable12-5310-fix-tag-label-removed-when-share-view-is-opened
...
[stable12] Fix tag label removed when share view is opened
2017-06-13 17:32:55 -05:00
Morris Jobke
9f265007fe
Merge pull request #5387 from nextcloud/backport-5367
...
[stable12] Fix unknown share token error message
2017-06-13 17:23:29 -05:00
Morris Jobke
9e402df41d
Merge pull request #5388 from nextcloud/stable12-5378
...
[stable12] no themed icon when dragging folder
2017-06-13 17:23:02 -05:00
Morris Jobke
db83fb7e76
Merge pull request #5389 from nextcloud/stable12-5305
...
[stable12] Add quota to the files view
2017-06-13 17:22:39 -05:00
Morris Jobke
b2cd3107b8
Merge pull request #5382 from nextcloud/global-scale-settings-stable12
...
[stable12] fix "add to your nextcloud" input field
2017-06-13 14:43:02 -05:00
Morris Jobke
cd9fb8cdf0
Merge pull request #5385 from nextcloud/stable12-revert-5259
...
[stable12] Revert "allow admin to disable groups on personal page"
2017-06-13 14:38:38 -05:00
Morris Jobke
28f6104bc8
Do not show icon for quota bar
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-06-13 12:28:23 -05:00
Joas Schilling
f6d0b92c59
Remove unused element
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-13 12:28:20 -05:00
Morris Jobke
ef184c0b21
Put the quota bar to the bottom
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-06-13 12:28:16 -05:00
Joas Schilling
3ca3edd994
Adjust the unit test
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-13 12:28:13 -05:00
Joas Schilling
41f107fd37
Remove the colored corners
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-13 12:28:09 -05:00
Joas Schilling
c691b6d299
Add an event so apps can add hidden fields to the files page
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-13 12:28:03 -05:00
Joas Schilling
901eca84b0
Only set the active item when there is one (not the case for quota)
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-13 12:27:59 -05:00
Joas Schilling
b1ddc57e08
Content will come from the external app
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-13 12:27:55 -05:00
Joas Schilling
27b2102d6c
Remove useless translation and make it better on unlimited
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-13 12:27:51 -05:00
Jan-Christoph Borchardt
fe8450fcc9
Style quota entry in files view
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net >
2017-06-13 12:27:47 -05:00
Joas Schilling
f1da30cc1e
Add quota to the files view
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-13 12:27:43 -05:00
Patrik Kernstock
a292a4b778
Fix #5349 , no themed icon when dragging folder
...
Signed-off-by: Patrik Kernstock <info@pkern.at >
2017-06-13 12:22:57 -05:00
Joas Schilling
49c71bdbcb
Fix unknown share token
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-13 18:53:52 +02:00
Lukas Reschke
913758dc28
Prevent sending second WWW-Authenticate header
...
Overrides \Sabre\DAV\Auth\Backend\AbstractBearer::challenge to prevent sending a second WWW-Authenticate header which is standard-compliant but most DAV clients simply fail hard.
Fixes https://github.com/nextcloud/server/issues/5088
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-06-13 18:52:30 +02:00
Morris Jobke
c4b65ab5e2
Revert "allow admin to disable groups on personal page"
...
This reverts commit 28e1a9da6c .
See #5259
2017-06-13 11:17:48 -05:00
Bjoern Schiessle
751bc180cc
fix 'add to your nextcloud' input field, this is not an email address
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-06-13 17:46:00 +02:00
Daniel Calviño Sánchez
c9bc521532
Extract toggle visibility of a SystemTagsInfoView to its own view
...
The SystemTagsInfoViewToggleView is a basic view that renders a label
that, when clicked, toggles the visibility of an associated
SystemTagsInfoView.
In order to keep the view parent agnostic its attachment and detachment
to/from the MainfFileInfoView is done in the FilesPlugin.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-06-13 16:41:21 +02:00
Daniel Calviño Sánchez
5985ecb66d
Add visibility related methods
...
SystemTagsInfoView now provides public methods related to its visibility
in preparation to be used by external objects.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-06-13 16:41:21 +02:00
Daniel Calviño Sánchez
365d7918b2
Fix toggle element being removed when MainFileInfoView is rendered again
...
The toggle element was added to the MainFileInfoView element when
SystemTagsInfoView was rendered. However, if the MainFileInfoView was
rendered again after that the toggle element was removed. Therefore,
instead of adding it when SystemTagsInfoView is rendered, the toggle
element has to be added when MainFileInfoView triggers its "post-render"
event.
Note, however, that when MainFileInfoView is rendered all the events are
removed from its child elements. As the toggle uses a "click" event
either the event has to be added back or the element has to be detached
before the MainFileInfoView is rendered.
Fixes #4944
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-06-13 16:41:21 +02:00
Daniel Calviño Sánchez
2384703cf6
Trigger pre and post render events in MainFileInfoDetailsView
...
The post-render event makes possible to modify the
MainFileInfoDetailsView element once it has been rendered, which is
needed by OCA.SystemTags.FilesPlugin to add the "Tags" label to the file
details, while the pre-render event makes possible to detach added
elements if needed before the MainFileInfoDetailsView is rendered again,
as that removes the events from the child DOM elements even if they
belong to other views.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-06-13 16:41:20 +02:00
Daniel Calviño Sánchez
706106408c
Make possible to know the registered detail views in a details view
...
In some cases, an app may need to act on a detail view registered by
another app or the core, for example, to add extra elements to the
element of the detail view.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-06-13 16:41:20 +02:00
Daniel Calviño Sánchez
bd626a9faa
Extract duplicated code to a method
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-06-13 16:41:20 +02:00
Daniel Calviño Sánchez
f822e3af4d
Add acceptance tests for showing the input field for tags
...
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-06-13 16:41:20 +02:00
Morris Jobke
4c56414cab
Merge pull request #5365 from nextcloud/backport-5343
...
[stable12] filter missing groups in share provider
2017-06-13 08:04:59 -05:00
Joas Schilling
f6264ad6c4
Merge pull request #5303 from nextcloud/fix_5047-nc12
...
[stable12] use the email address configured in Nextcloud as sender instead of the users email address
2017-06-13 12:19:56 +02:00
Robin Appelman
86c749349e
filter missing groups in share provider
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-06-13 10:54:02 +02:00
Joas Schilling
bd444c4951
Merge pull request #5354 from nextcloud/backport-5315-stable12
...
[stable12] execute eval in global scope, addresses #5314
2017-06-13 10:41:36 +02:00
Joas Schilling
eb22d392d8
Merge pull request #5355 from nextcloud/stable12-5167
...
[stable12] l10n improvements from transifex
2017-06-13 10:20:26 +02:00
Bjoern Schiessle
4d84249ab7
don't try to encrypt/decrypt the certificate bundle
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-06-13 10:07:55 +02:00
Morris Jobke
7db495a246
Merge pull request #5120 from nextcloud/backport-5118-use-language-of-recipient-not-admin
...
[stable12] Use the language of the recipient not the actor
2017-06-12 22:31:08 -05:00
Nextcloud bot
e0d8b17b20
[tx-robot] updated from transifex
2017-06-13 00:08:32 +00:00
Morris Jobke
a4cba7df69
Merge pull request #5272 from nextcloud/stable12-5271
...
[stable12] Also use IMailer interface to generate the email template
2017-06-12 17:51:07 -05:00
Morris Jobke
17bde8a79e
Merge pull request #5353 from nextcloud/stable12-5344
...
[stable12] Remove the char because it breaks the export from transifex
2017-06-12 17:50:41 -05:00
rakekniven
e7e0d1b8a1
Update setupchecks.js
...
Fixed typo and removed doclink symbol.
Reported at transifex
Update util.php
Another l10n improvement from transifex.
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-06-12 17:18:20 -05:00
Arthur Schiwon
d02bcfda86
execute eval in global scope, addresses #5314
...
unsure whether this is properly supported everywhere, injection is not an
option for us
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-06-12 23:37:20 +02:00
Lukas Reschke
86b4ebc457
Merge pull request #5352 from nextcloud/fix_running_only_dav_tests_stable12
...
[stable12] add missing parent::setUp that broke any other dav app test
2017-06-12 23:09:35 +02:00
Joas Schilling
9d98e5c49b
Remove the char because it breaks the export from transifex
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-12 15:40:41 -05:00
Morris Jobke
0b5efcfaca
Merge pull request #5324 from nextcloud/stable12-use-touch-icon-for-favicon-fb.png
...
[stable12] Theme image for favicon-fb.png
2017-06-12 15:28:42 -05:00
Lukas Reschke
d501b84c5a
Fix tests
...
return is not defined
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-06-12 22:21:37 +02:00
Lukas Reschke
e475229204
Merge pull request #5320 from nextcloud/5122-stable12
...
[stable12] Fix ldap integration tests
2017-06-12 22:10:08 +02:00
Georg Ehrke
dba4935f24
urldecode group principals in Cal- and CardDAV backend
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com >
2017-06-12 21:02:21 +02:00
Georg Ehrke
2cf8da830c
add missing parent::setUp that broke any other dav app test
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com >
2017-06-12 20:34:18 +02:00
Nextcloud bot
acda3a2403
[tx-robot] updated from transifex
2017-06-12 00:08:21 +00:00
Nextcloud bot
ea39d4feec
[tx-robot] updated from transifex
2017-06-11 00:08:31 +00:00
Nextcloud bot
b11d197d52
[tx-robot] updated from transifex
2017-06-10 00:08:47 +00:00
Lukas Reschke
26fe83aad8
Theme image for favicon-fb.png
...
Fixes https://github.com/nextcloud/server/issues/5322
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-06-09 21:13:56 +02:00
Arthur Schiwon
b1820fa170
Backport of #5122 to stable12
...
add missing INotificationManager when creating User backend, LDAP
UserManager
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
Make IDE happy
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
add convenience script to run all tests at once
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-06-09 16:30:56 +02:00
Morris Jobke
5722afc1d7
Merge pull request #5123 from patschi/patch-2
...
[stable12] Backported Fix #5059
2017-06-08 20:07:25 -05:00
Nextcloud bot
6434305333
[tx-robot] updated from transifex
2017-06-09 00:08:34 +00:00
Robin Appelman
11ff813c8c
Merge pull request #5285 from nextcloud/personal-sessions-renamwe-12
...
[12] reword sessions to security in personal settings
2017-06-08 12:09:14 +02:00
Bjoern Schiessle
86646a24d5
use the email address configured in Nextcloud as sender instead of the users email address
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-06-08 11:49:10 +02:00
Georg Ehrke
32674afd95
allow users to send PropPatch request when calendar is group-shared with them
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com >
2017-06-08 09:29:07 +02:00
Georg Ehrke
01b6a3da86
allow PropPatch requests to contact_birthdays
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com >
2017-06-08 08:05:46 +02:00
Nextcloud bot
d00c5886aa
[tx-robot] updated from transifex
2017-06-08 00:08:37 +00:00
Morris Jobke
e7b5ba8cef
Merge pull request #5291 from nextcloud/stable12-5287
...
[stable12] show input fields if they are not empty but disable them in global scale mode
2017-06-07 16:27:50 -05:00
Bjoern Schiessle
6e765ccf39
unify look of disabled display name / email address and the other input fields
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-06-07 11:43:31 -05:00
Bjoern Schiessle
ee53a2ed42
show input fields if they are not empty but disable them in global scale mode
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-06-07 11:43:27 -05:00
Morris Jobke
3ba2d6179a
Merge pull request #5278 from nextcloud/stable12-5277
...
[stable12] Allow to change avatar when groups are disables
2017-06-07 11:42:21 -05:00
Morris Jobke
d866547805
Allow to change avatar when groups are disables
...
* password form overlaps upload button and doesn't allow to click it
* regression from #5259
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
make sure that we always clear all floating rules after the user settings parts
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-06-07 11:30:56 -05:00
Morris Jobke
d08a6c74ab
Merge pull request #5186 from nextcloud/backport-5126-email-change-spam
...
[stable12] Don't trigger activity when the email didn't change
2017-06-07 11:14:00 -05:00
Robin Appelman
4972f9409a
reword sessions to security in personal settings
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-06-07 14:36:47 +02:00
Nextcloud bot
85418640b3
[tx-robot] updated from transifex
2017-06-07 00:09:14 +00:00
Morris Jobke
952caf8f85
Also use IMailer interface to generate the email template
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-06-06 10:48:53 -05:00
Björn Schießle
f29d53f509
Merge pull request #5270 from nextcloud/stable12-5223
...
[stable12] Don't allow the user to set fields they can't see
2017-06-06 16:58:16 +02:00
Morris Jobke
3cacc05217
Merge pull request #5261 from nextcloud/disable-groups-on-personal-page-nc12
...
[stable12] allow admin to disable groups on personal page
2017-06-06 08:53:55 -05:00
Joas Schilling
b39dfe8eda
adjust the test
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-06 08:11:35 -05:00
Joas Schilling
a62b292dc5
Also cover the settings endpoint
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-06 08:11:31 -05:00
Joas Schilling
ce34db22d7
Don't allow the user to set fields they can't see
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-06 08:11:28 -05:00
Morris Jobke
477f4965ca
Merge pull request #5266 from nextcloud/backport-5166-combine-apptokens-and-sessions
...
[stable12] combine apptokens and sessions
2017-06-06 08:03:04 -05:00
Morris Jobke
3cae858852
Update autoloader
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-06-06 08:01:52 -05:00
Joas Schilling
91de490b9e
Bring back the description for app passwords
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-06 13:48:11 +02:00
Christoph Wurst
c3cd07ec15
Combine sessions and app passwords view into one single view
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at >
2017-06-06 13:47:59 +02:00
Bjoern Schiessle
de809b4ac7
allow admin to disable groups on personal page
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-06-06 10:12:26 +02:00
Nextcloud bot
7ff205cf94
[tx-robot] updated from transifex
2017-06-06 00:08:55 +00:00
Nextcloud bot
413221bfe1
[tx-robot] updated from transifex
2017-06-05 00:08:38 +00:00
Nextcloud bot
cf3988e248
[tx-robot] updated from transifex
2017-06-04 00:08:39 +00:00
Nextcloud bot
5d6345ea4b
[tx-robot] updated from transifex
2017-06-03 00:09:12 +00:00
Björn Schießle
52f6c22954
Merge pull request #5224 from nextcloud/useful-gs-settings-stable12
...
[stable12] add new config switched for the global scale architecture
2017-06-02 20:18:45 +02:00
Björn Schießle
a61aabea83
Merge pull request #5225 from nextcloud/no-client-info-without-firstrunwizard
...
Don't show client info, when the app is disabled
2017-06-02 18:09:54 +02:00
blizzz
2d15803a82
Merge pull request #5216 from nextcloud/5213-stable12
...
[stable12] Trigger changeUser hook only on real changes
2017-06-02 13:16:16 +02:00
blizzz
d2734c6dbe
Merge pull request #5217 from nextcloud/5209-stable12
...
[stable12] fix install on mb4 enabled mariadb/mysql
2017-06-02 13:11:33 +02:00
Joas Schilling
777e7bbf53
Don't show client info, when the app is disabled
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-06-02 11:25:20 +02:00
Bjoern Schiessle
6e7ff24474
add new config switched for the global scale architecture
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-06-02 11:00:08 +02:00
Nextcloud bot
577ea59968
[tx-robot] updated from transifex
2017-06-02 00:08:40 +00:00
Arthur Schiwon
0d893f09c4
fix install on mb4 enabled mariadb/mysql
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-06-01 13:12:30 +02:00
Arthur Schiwon
c1f4191a77
emit changeUser only if there really was a change (quota, displayname)
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-06-01 13:08:23 +02:00
Nextcloud bot
db22c42e78
[tx-robot] updated from transifex
2017-06-01 00:08:48 +00:00
Joas Schilling
bb583580d7
Merge pull request #5127 from nextcloud/backport-5090-fixing-missing-background-jobs-on-app-update
...
[stable12] Register the autoloading earlier so we can load the background jobs
2017-05-31 11:19:21 +02:00
Joas Schilling
ea9613efa0
Don't trigger activity when the email didn't change
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-05-31 11:17:11 +02:00
Nextcloud bot
99117349df
[tx-robot] updated from transifex
2017-05-31 00:08:57 +00:00
Nextcloud bot
6ae58b6dcb
[tx-robot] updated from transifex
2017-05-30 00:08:54 +00:00
Arthur Schiwon
2567a350f4
fix paging
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-05-30 00:53:32 +02:00
Arthur Schiwon
d017e3602b
make sure used ldap connection resource is always up to date
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-05-30 00:53:27 +02:00
bline
41a2686fc6
moved to something a little less invasive. back to passing CR around.
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-05-30 00:53:23 +02:00
bline
76ab41732a
special case for controlPagedResultResponse. It would be nice if there was a generic way to pass by reference with call_user_func_array..
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de >
2017-05-30 00:53:07 +02:00
Nextcloud bot
2d8ec64ee5
[tx-robot] updated from transifex
2017-05-29 00:08:44 +00:00
Nextcloud bot
df3efa4984
[tx-robot] updated from transifex
2017-05-28 00:08:24 +00:00
Nextcloud bot
2e223cd1dc
[tx-robot] updated from transifex
2017-05-27 00:08:42 +00:00
Joas Schilling
628a98ed62
Register the autoloading earlier so we can load the background jobs
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-05-26 12:53:33 +02:00
Patrik Kernstock
fd0c102f24
Backported Fix #5059 to stable12 by adding sanity checks before using var
...
Signed-off-by: Patrik Kernstock <info@pkern.at >
2017-05-26 12:16:46 +02:00
Joas Schilling
d8abc4c16c
Use the language of the recipient not the actor
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-05-26 11:08:37 +02:00
Nextcloud bot
0ed02da5dd
[tx-robot] updated from transifex
2017-05-26 00:08:26 +00:00
Nextcloud bot
13d1c95db1
[tx-robot] updated from transifex
2017-05-25 00:08:13 +00:00
Nextcloud bot
9055109243
[tx-robot] updated from transifex
2017-05-24 00:08:31 +00:00
Roeland Jago Douma
d00d96c902
Merge pull request #5073 from nextcloud/external-get-for-group-sql-type-12
...
[12] use the correct param type when getting external storages for groups
2017-05-23 22:39:34 +02:00
Robin Appelman
1e06e92bb0
use the correct param type when getting external storages for groups
...
Signed-off-by: Robin Appelman <robin@icewind.nl >
2017-05-23 16:49:59 +02:00
Roeland Jago Douma
7593fa3464
Merge pull request #5005 from nextcloud/bugfix-stable12/fix_replacing_4mbunicode_for_calendar_properties_table
...
[stable12] fix replacing of 4MB Unicode Chars in cal props table
2017-05-23 13:43:56 +02:00
Joas Schilling
ebf6c628ed
Fix username and avatar for external users
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-05-23 12:04:18 +02:00
Roeland Jago Douma
446559979c
Merge pull request #5017 from nextcloud/stable12-5016
...
[stable12] Reset opcache if update is detected
2017-05-23 11:36:57 +02:00
Nextcloud bot
6e005e0ffa
[tx-robot] updated from transifex
2017-05-23 00:08:39 +00:00
Lukas Reschke
98e26f8b5c
Merge pull request #5015 from nextcloud/stable12-5014
...
[stable12] Update Opcache recommendation
2017-05-22 10:18:41 +02:00
Lukas Reschke
93eeb40136
v12.0.0.29
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-05-22 10:11:27 +02:00
Lukas Reschke
aee501a3bc
Merge pull request #5025 from nextcloud/add-missing-version-requirement-to-oauth
...
Add missing version requirement to OAuth2 app
2017-05-22 10:10:22 +02:00
Phil Davis
ed61c437cd
Make new file file tooltip error text change
...
Signed-off-by: Phil Davis <phil@jankaritech.com >
2017-05-22 13:03:32 +05:45
Phil Davis
db0b3bf42a
Make rename file tooltip error text change
...
Signed-off-by: Phil Davis <phil@jankaritech.com >
2017-05-22 13:02:51 +05:45
Joas Schilling
21b6af3e1e
Add missing version requirement to OAuth2 app
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-05-22 09:01:34 +02:00
Morris Jobke
e0e814dfae
Merge pull request #5020 from nextcloud/stable12-5009
...
[stable12] Update acceptance tests for issue #4921
2017-05-22 01:49:05 -05:00
Daniel Calviño Sánchez
424979c32e
Update acceptance tests for issue #4921
...
Acceptance tests opened the details view by clicking on the middle of
the file row, but due to the changes made in issue #4921 that now opens
the file instead; this commit updates the acceptance tests to open the
details view through the "Details" item in the file actions menu.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com >
2017-05-21 22:50:15 -05:00
Nextcloud bot
9325003a72
[tx-robot] updated from transifex
2017-05-22 00:08:32 +00:00
Morris Jobke
3c832f201f
Reset opcache if update is detected
...
This even works if opcache_reset is in the disabled_functions php.ini setting.
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-05-21 18:40:53 -05:00
Morris Jobke
9acc590a27
Update Opcache recommendation
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-05-21 18:24:06 -05:00
Lukas Reschke
6d9a6f03fb
Merge pull request #5008 from nextcloud/fix_scss_cache_12
...
Fix scss cache 12
2017-05-21 22:52:20 +02:00
Roeland Jago Douma
32ee610f45
Increase version
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-05-21 22:12:52 +02:00
Roeland Jago Douma
cf1f77537d
Set SCSS dependencies to memcache on compile
...
Else when an upgrade happens we will recompile all the SCSS files all
the time (until the cache expires).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl >
2017-05-21 22:12:47 +02:00
Lukas Reschke
b6f5e623bb
v12.0.0
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-05-21 17:11:40 +02:00
Georg Ehrke
f75b56fc5d
fix replacing of 4MB Unicode Chars in cal props table
...
Signed-off-by: Georg Ehrke <developer@georgehrke.com >
2017-05-21 13:27:16 +02:00
Morris Jobke
482805d16f
Merge pull request #4982 from nextcloud/stable12-oauth-not-disable
...
[stable12] Mark OAuth app as always enabled
2017-05-20 19:12:24 -05:00
Nextcloud bot
fa47ed7979
[tx-robot] updated from transifex
2017-05-21 00:08:35 +00:00
Lukas Reschke
551a189ae8
Fix tests
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-05-20 17:15:19 -05:00
Morris Jobke
394023949e
Merge pull request #4998 from nextcloud/fix-for-sharing-stable-12
...
fix for sharing stable12
2017-05-20 17:03:52 -05:00
Lukas Reschke
e23569ed68
Merge pull request #4996 from nextcloud/stable12-version
...
12.0.0RC3
2017-05-20 20:31:24 +02:00
Daniel Hansson
8817c65120
fix for sharing stable12
...
Signed-off-by: Daniel Hansson <daniel@techandme.se >
2017-05-20 17:15:14 +02:00
Lukas Reschke
e6683f4007
12.0.0RC3
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-05-20 14:21:47 +02:00
Nextcloud bot
df61c9e283
[tx-robot] updated from transifex
2017-05-20 00:08:37 +00:00
Lukas Reschke
4bf9df9cf1
[stable12] Mark OAuth app as always enabled
...
At the moment we don't support disabling the OAuth app
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-05-19 17:28:10 -05:00
Morris Jobke
697e14bf74
Merge pull request #4977 from nextcloud/rename-secure-drop-stable12
...
rename secure drop back to files drop
2017-05-19 17:06:07 -05:00
Morris Jobke
d37ac1862f
Merge pull request #4980 from nextcloud/fix-missing-argument-2-getAppContainer
...
Fix missing argument 2 for Settings classes
2017-05-19 17:05:18 -05:00
Joas Schilling
fa95fb6862
Fix missing argument 2 for Settings classes
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-05-19 22:30:55 +02:00
Bjoern Schiessle
c4dd1d970f
rename secure drop back to files drop because of name collision with securedrop.org
...
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org >
2017-05-19 21:58:01 +02:00
Lukas Reschke
ebd15f50d9
Merge pull request #4976 from nextcloud/stable12-4910
...
[stable12] Fix logo being too big on log in page
2017-05-19 21:56:11 +02:00
Lukas Reschke
6e2139f60e
Merge pull request #4975 from nextcloud/stable12-4974
...
Fixes visible sidebar even if hidden is applied
2017-05-19 21:47:56 +02:00
Lukas Reschke
e0277fa9b7
Merge pull request #4973 from nextcloud/stable12-4972
...
Fix group restriction regression
2017-05-19 21:46:14 +02:00
Lukas Reschke
9e667d81bb
12.0.0RC2
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-05-19 21:19:07 +02:00
Julius Härtl
c190dfbe53
Scale logo only for custom ones
...
Signed-off-by: Julius Härtl <jus@bitgrid.net >
2017-05-19 21:01:41 +02:00
Jan-Christoph Borchardt
053dffb169
Fix logo being too big on log in page, fix #4585
...
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net >
2017-05-19 21:01:34 +02:00
Morris Jobke
5a6af19076
Fixes visible sidebar even if hidden is applied
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-05-19 13:05:57 -05:00
Morris Jobke
5fbfebac35
Fix group restriction regression
...
Signed-off-by: Morris Jobke <hey@morrisjobke.de >
2017-05-19 12:09:49 -05:00
Lukas Reschke
cc2d06606d
Merge pull request #4957 from nextcloud/backport-4956-resource-loading-for-ever
...
[stable12] Stop infinit loop on invalid settings css/js file
2017-05-19 16:59:55 +02:00
Lukas Reschke
32558991a6
Merge pull request #4962 from nextcloud/backport-4905
...
Allow automatic DI for apps that don't register the container in app.php
2017-05-19 16:18:31 +02:00
Joas Schilling
aa83127686
Allow automatic DI for apps that don't register the container in app.php
...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-05-19 13:49:36 +02:00
Lukas Reschke
90837b9175
Merge pull request #4949 from nextcloud/workaround-4948
...
Lowercase the scriptname again
2017-05-19 12:37:53 +02:00
Joas Schilling
8a570aebf6
Stop infinit loop on invalid settings css/js file
...
Don't try to find dirname of false...
Signed-off-by: Joas Schilling <coding@schilljs.com >
2017-05-19 11:40:10 +02:00
Nextcloud bot
e14bd212f7
[tx-robot] updated from transifex
2017-05-19 00:08:36 +00:00
Lukas Reschke
54b2286420
Lowercase the scriptname again
...
Ref https://github.com/nextcloud/server/issues/4948
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-05-19 01:57:26 +02:00
Lukas Reschke
94b9335936
12.0.0RC1
...
Signed-off-by: Lukas Reschke <lukas@statuscode.ch >
2017-05-19 00:59:46 +02:00