wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
47961 commits 157 branches 562 tags 714 MiB
Commit graph

9178 commits

Author SHA1 Message Date
Bjoern Schiessle
a94358062d
handle mail send error gracefully 
log the error in case a notification mail of a new share couldn't
be send to the recipient and finish the share operation successfully

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2019-01-30 15:25:07 +01:00
Roeland Jago Douma
ecc8cccc42
Merge pull request #13237 from rcdailey/nfs-write-checks 
Improve data directory write checking for NFS mounts
 2019-01-30 09:36:50 +01:00
Roeland Jago Douma
f30877ea7c
Provide initial state 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-29 22:21:54 +01:00
Roeland Jago Douma
139055c1dd
Merge pull request #13880 from nextcloud/enh/expose_subadmin_to_ocp 
Expose subadmin to OCP
 2019-01-29 22:13:41 +01:00
Roeland Jago Douma
15abcff2a1
Expose subadmin to OCP 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-29 20:47:35 +01:00
Roeland Jago Douma
deb7d2364f
Merge pull request #13869 from nextcloud/enh/clean_pending_2fa_session_on_password_change 
Clean pending 2FA authentication on password reset
 2019-01-29 19:50:15 +01:00
Roeland Jago Douma
ac8a6e2244
Clean pending 2FA authentication on password reset 
When a password is reste we should make sure that all users are properly
logged in. Pending states should be cleared. For example a session where
the 2FA code is not entered yet should be cleared.

The token is now removed so the session will be killed the next time
this is checked (within 5 minutes).

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-29 13:08:56 +01:00
Roeland Jago Douma
0fd208a83b
Merge pull request #13866 from nextcloud/s3-multipart-uploader 
always use multipart uploader for s3 uploads
 2019-01-29 11:14:05 +01:00
Robin Appelman
1d322d3b37
always use multipart uploader for s3 uploads 
the multipart uploader handles non seekable streams while `upload` does not

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-28 14:51:19 +01:00
Robert Dailey
a170bf80ec
Improve data directory write checking for NFS mounts 
If `is_writable()` fails, fall back to logic that attempts to create a file
and then checks if it exists. If this check fails, an error occurs as it
did before.

Discussion on this solution was found here:
https://help.nextcloud.com/t/write-errors-for-nfs-mount/23328

Fixes #7124

Signed-off-by: Robert Dailey <rcdailey@gmail.com>
 2019-01-24 20:39:52 -06:00
Joas Schilling
abd305eff5
Remove legacy activity stuff 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-24 16:52:38 +01:00
Roeland Jago Douma
6b48e13371
Merge pull request #13772 from nextcloud/bugfix/noid/show-default-locale 
Show proper default locale
 2019-01-24 08:31:46 +01:00
Morris Jobke
c57f886b43
Show proper default locale 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2019-01-23 23:21:05 +01:00
Roeland Jago Douma
425edf88d7
Merge pull request #13770 from nextcloud/enhancement/post-login-hook-is-token 
Add isTokenLogin argument to post login hook/event
 2019-01-23 22:12:51 +01:00
Christoph Wurst
ad5a658e0c
Add isTokenLogin argument to post login hook/event 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-23 19:47:47 +01:00
Morris Jobke
d549954024
Merge pull request #13766 from nextcloud/fix/13757/urlencode_requesttoken 
Urlencode the requesttoken
 2019-01-23 18:29:18 +01:00
Roeland Jago Douma
e3de4edc51
Urlencode the requesttoken 
Followup of #13757

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-23 16:16:31 +01:00
Jan-Christoph Borchardt
9147a12ee1
Reduce text size of text file preview, fix #13720 
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
 2019-01-23 15:37:08 +01:00
Roeland Jago Douma
ebd9f30d85
Request plain logout url 
By requesting the plain logout url we allow it to be properly cached by
the caching router. We just add the requesttoken manually.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-23 14:06:03 +01:00
Morris Jobke
90e985fe4f
Merge pull request #13739 from nextcloud/cache-cleanup-change 
cleanup shared lock if changing to exclusive lock failed
 2019-01-22 16:11:46 +01:00
Robin Appelman
f69c2d1e84
cleanup shared lock if changing to exclusive lock failed 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-22 15:32:48 +01:00
Joas Schilling
92edd40e51
Make RouteConfig strict 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-22 14:18:58 +01:00
Joas Schilling
f8b74cf0a5
Allow resources via OCS as well 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-22 14:18:58 +01:00
John Molakvoæ
b1d4c3f50b
Merge pull request #13642 from nextcloud/contacts-menu-url-fix 
Allow access to addressbook unique uri
 2019-01-22 13:00:07 +01:00
John Molakvoæ (skjnldsv)
22112bf71d
Allow access to addressbook unique uri 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Co-Authored-By: Joas Schilling <coding@schilljs.com>
 2019-01-22 10:03:56 +01:00
Joas Schilling
adbeb42c2c
Fix colorizeSvg with transformations that contain a comma (,) 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-17 14:24:07 +01:00
Roeland Jago Douma
c77d7d6e79
Move merged-share-backend to webpack 
For #13608

Since we have webpack anyway it make sense to let webpack do the
bundling instead of ourselfs. This leads to minified code (so less
transfer). And the webserver can just handle the request.

As a bonus we get a map file so debugging is easier than with our
JSCombiner stuff.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-16 10:03:21 +01:00
Christoph Wurst
d5927e4d01
Fix integer background job id type error 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-15 14:36:03 +01:00
Morris Jobke
c3b22f05bb
Merge pull request #13468 from rummatee/issue13276 
don't close input stream when writing in encrypted file
 2019-01-14 16:21:08 +01:00
Morris Jobke
5a27e54f4b
Merge pull request #13032 from nextcloud/objectstore-write-exists 
upload new files in objectstore to a .part path first
 2019-01-14 11:26:29 +01:00
Robin Appelman
615fb8cd77
Cache tokens when using swift's v2 authentication 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-01-13 19:59:48 +01:00
Joas Schilling
d8e041a5a2
Don't log parameters on user creation in case of error/exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-01-10 10:46:58 +01:00
Florian Schunk
c2f8df0573 don't close input stream when writing in encrypted file 
Signed-off-by: Florian Schunk <florian.schunk@rwth-aachen.de>
 2019-01-10 00:25:07 +01:00
Christoph Wurst
83068c39e5
Update select2, include css 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:02:01 +01:00
Christoph Wurst
1e80259051
Remove core.js 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:02:00 +01:00
Christoph Wurst
208788173d
Npmize (vendor) scripts 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-01-09 15:01:59 +01:00
Roeland Jago Douma
08970aaee2
HttpClient getHeader can return empty string 
Fixes #11999

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-08 14:14:59 +01:00
Roeland Jago Douma
8e914c01c5
Use the real logger in the settings 
Fixes #13285
The wrapper logger should not be used here. But we need the real logger.
Since this in internal we can just pass that on directly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-07 12:32:07 +01:00
Roeland Jago Douma
8b0f5e02c7
Merge pull request #12621 from nextcloud/td/12224/cleanup_middleware_registering 
Cleanup middleware registering
 2019-01-07 10:48:41 +01:00
Roeland Jago Douma
6980ecf7ab
Throttle with correct metadata 
Fixes #13202

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-04 21:45:44 +01:00
blizzz
aad32771f8
Merge pull request #13161 from nextcloud/perf/fix_comments_in_folder_function 
Rewrite getNumberOfUnreadCommentsForFolder query
 2019-01-03 17:08:52 +01:00
blizzz
68952306aa
Merge pull request #10555 from nextcloud/bugfix/10518/only-check-added-items 
Only enforce schema limits for supported apps
 2019-01-03 14:18:13 +01:00
Roeland Jago Douma
54ff913de6
Cleanup middleware registering 
Fixes #12224

Since we only use the middleware at 1 location it makes no sense to
register them in each and every container.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-03 11:50:01 +01:00
Morris Jobke
273849a7e7
Merge pull request #13074 from nextcloud/improve-decrypt-all 
improve decrypt all process: list files which could not be decrypted
 2019-01-02 16:35:48 +01:00
Julius Härtl
0f911e2d13
Add default values when parsing account data 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-12-23 16:33:02 +01:00
Roeland Jago Douma
d0956c9a42
Followup 12833, gracefully handle the getting of / 
Else this breaks the app page

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-21 11:08:19 +01:00
Roeland Jago Douma
f394bf356e
Rewrite getNumberOfUnreadCommentsForFolder query 
Before the joining and filtering removed unkown files. Resulting in
manual queries for all the files with no (unread) comments (the 99%).

Long story short. This will return a list of all the files in the parent
folder with their unread comment count (can be 0). But this makes sure
that the result is properly cached. In the dav handling.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 20:43:10 +01:00
Roeland Jago Douma
216ad29f05
SCSS cache buster is a combination of apps/theming/scc_vars 
Else on scss files we'd get <file>?v=<hash>?v=<hash2>
This is of course not valid. Now it becomes <file>?v=<hash>-<hash2>

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 20:33:21 +01:00
Roeland Jago Douma
03fe2b3b81
Use a case insensitive search for email 
Fixes #7084
Now entering wrongly cased email (roeland@ instead of Roeland@) for
password reset etc. Will also work.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-20 14:19:35 +01:00
Maxence Lange
5557485aba using the createIndex from FullTextSearchManager 
Signed-off-by: Maxence Lange <maxence@artificial-owl.com>
 2018-12-20 08:34:17 +00:00