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

44619 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
3036b1d03d
Merge pull request #9895 from nextcloud/fed-group-shares 
implement federated group sharing
 2018-07-11 21:44:48 +02:00
Morris Jobke
a89f9a238f
Merge pull request #10143 from nextcloud/3rdparty/noid/aws-sdk-3.62.9 
[3rdparty] Bump AWS-SDK to 3.62.9
 2018-07-11 21:40:12 +02:00
Roeland Jago Douma
e2d31088ea
[3rdparty] Bump AWS-SDK to 3.62.9 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-11 19:54:12 +02:00
Roeland Jago Douma
d9aa5ed96d
Merge pull request #9942 from nextcloud/feature/2338/invitation_response_in_email 
Include accept / decline links in CalDAV invitation emails
 2018-07-11 19:53:22 +02:00
Roeland Jago Douma
5262d60e94
Merge pull request #10197 from nextcloud/feature/9410/improve-opcache-feedback 
Improve opcache feedback
 2018-07-11 19:27:09 +02:00
Morris Jobke
3ece7b66b8
Merge pull request #10199 from nextcloud/bugfix/noid/improve-url-detection-in-comments 
Improve url detection in comments
 2018-07-11 17:25:50 +02:00
Morris Jobke
cc9073c251
Merge pull request #10179 from nextcloud/mount-filter 
Add the option to filter mounts for a user
 2018-07-11 16:29:09 +02:00
Morris Jobke
e35451fd4e
Merge pull request #10025 from nextcloud/smb-rename-invalidargument-retry 
also retry rename operation on InvalidArgumentException
 2018-07-11 16:25:22 +02:00
Joas Schilling
72d17ff02c
Improve url detection in comments 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-11 16:23:56 +02:00
Morris Jobke
882aab9d70
Fix detection if opcache extension is loaded 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-11 16:08:41 +02:00
Morris Jobke
7c6c3d0d76
Fix tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-11 16:08:41 +02:00
Cthulhux
f6f49c77f7
opcache module check 
Improved the speed of isOpcacheProperlySetup() (instant return instead of continuing when we're already failed), added a check for the opcache extension itself. Potentially fixes #9410

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-11 16:08:40 +02:00
Morris Jobke
e8bd72ebdc
Merge pull request #10193 from nextcloud/bugfix/10175/sanitize-parameter 
Sanitize parameters in createSessionToken() while logging
 2018-07-11 14:55:08 +02:00
Morris Jobke
a11d198a06
Sanitize parameters in createSessionToken() while logging 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-11 14:26:57 +02:00
Morris Jobke
229289d206
Merge pull request #10122 from nextcloud/feature/noid/appdata-fopen-stream 
Add fopen method to ISimpleFile
 2018-07-11 13:40:09 +02:00
Morris Jobke
8ccb99f416
Merge pull request #10098 from nextcloud/feature/noid/ldap-image-attribute 
allow admin to disable fetching of avatars as well as a specific attribute
 2018-07-11 12:19:58 +02:00
Julius Härtl
6da2b7c4f6
Separate fopen into read and write methods 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-11 12:08:37 +02:00
Julius Härtl
f1469e34aa
Add fopen method to ISimpleFile 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-11 10:29:03 +02:00
Bjoern Schiessle
412f6a6ecc
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:21:00 +02:00
Bjoern Schiessle
0c09f566c2
add some integration tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:49 +02:00
Bjoern Schiessle
f0aaf62b24
fix js tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:49 +02:00
Bjoern Schiessle
3942d731d2
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:48 +02:00
Bjoern Schiessle
5b06a7d773
update autoloader 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:48 +02:00
Bjoern Schiessle
2abc705632
start to get fed group shares into the share dialog 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:47 +02:00
Bjoern Schiessle
1d5a9c3f97
handle unshare request from owner 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:47 +02:00
Bjoern Schiessle
7d2add622e
unshare from self 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:46 +02:00
Bjoern Schiessle
f5a816262c
accept/decline group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:46 +02:00
Bjoern Schiessle
7a48a85dca
fix notification when a group share is received 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:45 +02:00
Bjoern Schiessle
4c00c80a83
translate nextcloud share types to OCM share types 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:45 +02:00
Bjoern Schiessle
8bc0de3469
log error messgage 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:44 +02:00
Bjoern Schiessle
b23032e4c5
implement federated group shares 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:44 +02:00
Bjoern Schiessle
c8631d607e
add setting to enable/disable federated group sharing 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-07-11 10:11:41 +02:00
Morris Jobke
af20f1dd4b
Merge pull request #10125 from nextcloud/feature/9496/comic_mimetypes 
Add comicbook mimetypes
 2018-07-11 09:21:29 +02:00
Morris Jobke
029219a9e7
Merge pull request #10177 from nextcloud/bugfix/noid/theming-load-with-custom-theme 
Load theming app css as well if legacy theme is enabled
 2018-07-11 09:09:09 +02:00
Nextcloud bot
0e0dd2a90b
[tx-robot] updated from transifex 2018-07-11 00:12:15 +00:00
Roeland Jago Douma
0fe115a536
Add repair step 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-07-10 21:27:35 +02:00
John Oyler
489103eede
Give the various comic book file formats distinct mime types so that they can be handled correctly by the preview functionality without file type checking at that point. 2018-07-10 21:23:35 +02:00
Robin Appelman
3ad6084891
Add the option to filter mounts for a user 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-10 16:49:26 +02:00
Julius Härtl
805f503814
Load theming app css as well if legacy theme is enabled 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-07-10 14:59:15 +02:00
Nextcloud bot
a22bc0e787
[tx-robot] updated from transifex 2018-07-10 08:21:14 +00:00
Morris Jobke
ed6352af0e
Merge pull request #10010 from nextcloud/bugfix/9992/fix-blocking-cron-job 
Unlock failed cron jobs and set a high "last_checked" value to avoid continous re-check
 2018-07-09 15:49:41 +02:00
Morris Jobke
5244501f0f
Merge pull request #10162 from nextcloud/sabre-put-log-exception 
always log exceptions on dav write
 2018-07-09 15:48:58 +02:00
Morris Jobke
6afb8af4d1
Merge pull request #10161 from nextcloud/bugfix/10158/correctly-handle-users-with-numeric-user-ids 
Correctly handle users with numeric user ids
 2018-07-09 15:38:16 +02:00
Morris Jobke
79801ad263
Suppress potential SQL injection warning as they are false positives 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:55:47 +02:00
Morris Jobke
8a64433ec9
Add repair job for pending cron jobs 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:53:37 +02:00
Morris Jobke
8b1084adfe
Only wait for cron if fix for endless wait is included 
* see https://github.com/nextcloud/server/issues/9992

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:53:37 +02:00
Morris Jobke
a1a29d14c8
Unlock failed cron jobs and set a high "last_checked" value to avoid continous re-check 
* fixes issue where cronjobs of a not-loaded app are marked as "still running" because there is a "reserved_at" value stored
* fixed #9992

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-07-09 14:51:02 +02:00
Robin Appelman
8399d6070e
always log exceptions on dav write 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-07-09 14:25:54 +02:00
Joas Schilling
1ca075a113
Correctly handle users with numeric user ids 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-07-09 14:22:10 +02:00
Morris Jobke
ecbc1b10ae
Merge pull request #10139 from chiyi4488/patch-1 
Small text error
 2018-07-09 13:58:43 +02:00