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

7887 commits

Author SHA1 Message Date
Joas Schilling
ba6e5bcc05
Add the return which is being used 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-31 14:06:21 +01:00
Rello
c5f76785ba
Mapping of m3u, m3u8, pls to audio streams 
Signed-Off-By: Rello <Rello@users.noreply.github.com>
 2017-10-31 14:05:24 +01:00
Joas Schilling
a0dab90fd5
Merge pull request #7021 from nextcloud/fix-oracle-indexes 
Fix oracle indexes
 2017-10-31 13:55:14 +01:00
Arthur Schiwon
bcfac75b06
simplify registration of manager in server container 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-31 13:55:03 +01:00
Johannes S
936486413d
Merge branch 'master' into master 2017-10-31 01:34:46 +01:00
Johannes Schlichenmaier
84cc13f57b Extended list of sensitive configuration values 
In accordance with the issuetemplate app issue:
https://github.com/nextcloud/issuetemplate/issues/27

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2017-10-31 01:30:50 +01:00
Roeland Jago Douma
5672f14fd1
Merge pull request #7004 from Fiech/master 
Extended list of sensitive configuration values
 2017-10-30 20:01:42 +01:00
Victor Dubiniuk
9f16468789
Die NoCheckMigrator 2017-10-30 18:59:24 +01:00
Piotr Mrowczynski
6a51c1bc4f
Add foreign key support to OC 2017-10-30 18:57:19 +01:00
Jörn Friedrich Dreyer
d081a1a5ad
quote index columns on oracle, handle all index changes, minor phpdoc cleanup 2017-10-30 18:54:31 +01:00
Georg Ehrke
c8323f822d
Merge pull request #6867 from nextcloud/imessage-attachments 
Add attachment support to emails
 2017-10-30 18:33:50 +01:00
Arthur Schiwon
d5f1cef642
fix comment sorter 
background: we have a flat hierarchy of comments, not a tree. therefore we
can also remove again the unnecessary additions.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-30 15:59:43 +01:00
Johannes Schlichenmaier
bde78decc2 Extended list of sensitive configuration values 
In accordance with the issuetemplate app issue:
https://github.com/nextcloud/issuetemplate/issues/27

Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2017-10-29 23:46:59 +01:00
Joas Schilling
94f3fc63bc
Use ::class and fix missing doc 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-28 11:49:36 +02:00
Robin Appelman
3f0cb13042
Allow getting the filepath when getting cached mounts by fileid 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 14:35:34 +02:00
Robin Appelman
f9a7294807
use fopen directly when reading objects from s3 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-27 12:58:19 +02:00
Morris Jobke
de912385e0
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-10-27 12:16:28 +02:00
Joas Schilling
7a4c0c668b Merge pull request #6977 from Fiech/master 
Added additional methods for removal of sensitive info
 2017-10-27 11:46:31 +02:00
Johannes Schlichenmaier
4ae7275aeb Added additional methods for removal of sensitive info 
Signed-off-by: Johannes Schlichenmaier <johannes@schlichenmaier.info>
 2017-10-27 10:36:58 +02:00
Morris Jobke
405bbc1c61
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-10-26 16:31:59 +02:00
Arthur Schiwon
7f58c41015
fix sorting 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-26 16:23:41 +02:00
Roeland Jago Douma
88cba6d882
Use local cache for the CachingRouter 
There is no need to cache routes distributed. It even has the downside
that the router might return different routes then the ones in the local
routes.php files.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-25 19:23:46 +02:00
Joas Schilling
43b92b8e06
Add unit tests for SearchResult 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-25 11:21:05 +02:00
Joas Schilling
42c84b6309
Correctly search for existing collaboration results 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-25 10:38:26 +02:00
Joas Schilling
6a035bd0a0
Move attachment creators to mailer class 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-25 09:26:57 +02:00
Roeland Jago Douma
a82b56b1c7 Merge pull request #6918 from nextcloud/rotate_job_by_default 
Add logrote as a default background job
 2017-10-24 20:38:40 +02:00
Roeland Jago Douma
b88db3a389 Merge pull request #6921 from nextcloud/appmanager-securitymiddleware 
Use proper DI for security middleware for app enabled check
 2017-10-24 19:58:24 +02:00
Morris Jobke
f368481c23 Merge pull request #6928 from nextcloud/remove-unneeded-method 
Remove unused method of OC_App
 2017-10-24 17:50:43 +02:00
Morris Jobke
ce0c45a4ea
Use proper DI for security middleware for app enabled check 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 15:36:28 +02:00
Morris Jobke
7b7bf73670
Deprecate OC_App:isEnabled 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 14:05:46 +02:00
Morris Jobke
df85b13296
Remove unused method of OC_App 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-24 14:04:09 +02:00
Morris Jobke
3eaf23f29f Merge pull request #6920 from nextcloud/appmanager-usage 
Use appmanager instead of OC_App for check for enabled app
 2017-10-24 13:53:17 +02:00
Roeland Jago Douma
e2139d4b56
Add logrote as a default background job 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-24 08:28:06 +02:00
Morris Jobke
f884e762bc
Use appmanager instead of OC_App for check for enabled app 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-10-23 23:31:17 +02:00
Julius Härtl
b3c025fd08
Revert copyright changes 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-23 23:23:56 +02:00
Julius Härtl
4cfa1c66b8
Doc: Fix phpDoc issues 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-23 23:23:56 +02:00
Arthur Schiwon
8f0a9ae51f
split walking the tree from operating on it 
so walking it is reusable

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:37 +02:00
Arthur Schiwon
fd6daf8d19
AutoCompletion backend 
* introduce a Controller for requests
* introduce result sorting mechanism
* extend Comments to retrieve commentors (actors) in a tree
* add commenters sorter
* add share recipients sorter

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-10-22 14:13:32 +02:00
Markus Staab
db34b59238 Prevent XSS in links which open a new browser window 2017-10-19 12:16:04 +02:00
Joas Schilling
65e938c4fd
Fix docs 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-19 11:18:21 +02:00
Joas Schilling
dcb322a6b3
Extend the API with teh parameters from Swift 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-19 11:05:47 +02:00
Lukas Reschke
f6f7b50cf0 Merge pull request #6853 from nextcloud/apps_autoloader 
Allow apps to have their own autoloader
 2017-10-19 11:05:23 +02:00
Joas Schilling
ce27e8cf34
Add attachment support to emails 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:44:19 +02:00
Joas Schilling
3119fd41ce
Set the data from the template 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Joas Schilling
c9af36a9ab
Introduce a public interface for Message 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Joas Schilling
8b37fe7f65
Set the subject with the email template to allow theming 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:03 +02:00
Joas Schilling
f109c1a10c
Allow templating of email subjects 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-18 15:12:00 +02:00
Roeland Jago Douma
3a9c24c04f
Allow apps to have their own autoloader 
This will allow apps to also have a proper classmap and authorative
autoloader.

Currently if a file: <appdir>/composer/autoload.php exists we will use
it. Else we keep the current behavior.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-10-17 21:35:49 +02:00
Robin Appelman
91b3536f45
propagate multipart upload exception when aborting upload 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-17 15:10:58 +02:00
blizzz
c25be8d83c Merge pull request #6837 from nextcloud/timespan-check-3 
Fix future time spans
 2017-10-16 13:35:53 +02:00
Roeland Jago Douma
a5912cbe33 Merge pull request #6812 from nextcloud/upload-cache-path 
also use configured 'cache_path' for new chunking
 2017-10-15 21:42:41 +02:00
dartcafe
ac2a6e0f2f
Fix future time spans 
Signed-off-by: dartcafe <github@dartcafe.de>
 2017-10-15 08:31:11 +02:00
Robin Appelman
1a99e0dab4 Merge pull request #6602 from nextcloud/s3-multipart-upload 
Add multipart upload for s3
 2017-10-11 16:10:58 +02:00
Robin Appelman
e393b3553e
set s3 part size to 500mb 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-11 15:59:53 +02:00
Robin Appelman
d27b0b07bc
also use configured 'cache_path' for new chunking 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-10-11 14:18:45 +02:00
Julius Härtl
ec0091d499
Do not return app names multiple times 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-10-10 12:34:38 +02:00
Joas Schilling
6292f665d7
Allow multiple settings and sections per app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-10-05 11:34:03 +02:00
blizzz
2d62f97f1b Merge pull request #6328 from nextcloud/split-sharees-api-logic 
Splits off the logic from sharees endpoint thus making it available from within Nc/via PHP.
 2017-10-04 15:43:44 +02:00
Robin Appelman
7525c387ce
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:27:26 +02:00
Morris Jobke
870d71689a Merge pull request #6563 from nextcloud/bigint-ids 
Migrate ID columns to bigint
 2017-09-29 12:23:41 +02:00
Joas Schilling
a3bdb318e9
Fix bigint handling on postgres 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-29 11:10:57 +02:00
Morris Jobke
e9aa11a1b0
Use full percentages in quota bar percentages 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-28 17:58:49 +02:00
Morris Jobke
5f25dd7095 Merge pull request #6599 from nextcloud/fix_2523 
Add direct preview link
 2017-09-27 23:27:54 +02:00
Arthur Schiwon
a579f8aa37
adapt attribute name (changed letter case style) 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-27 13:22:59 +02:00
Roeland Jago Douma
90d7e8f6f4 Merge pull request #6586 from nextcloud/fix/app-install-extract-check 
Check whether an app archive can be extracted
 2017-09-27 10:41:21 +02:00
Morris Jobke
b87914be9c Merge pull request #6645 from nextcloud/fix-6642-only-colons-for-ipv6 
Only allow colons in db host for IPv6 addresses
 2017-09-27 10:17:36 +02:00
Arthur Schiwon
937a80c941
reduce nesting of the required app XML 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-27 01:22:17 +02:00
Arthur Schiwon
3db3e65121
add tests for Lookup Plugin 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:25 +02:00
Arthur Schiwon
a28b1d91f9
split off former searchSharee unit test 
also moves registering default plugins to Server for proper unit testing

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
3d1d03a511
split off getEmail tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
c92f7ee767
split off getRemote unit tests 
adds two small fixes → they actually work \o/

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:24 +02:00
Arthur Schiwon
dd9e191d37
split off getUsers unit tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
f446ec83dd
minor fixes 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
9db3b04f1b
finetune the appinfo parser 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
c55583d1b4
allow more than one plugin per share type 
however it does not dedupe (appears too complex/expensive while we don't
havve the issue currently)

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
f7713e5f3f
make it possible to register plugins and kick out the circle one 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
4a96e22258
don't keep result types hard coded 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:23 +02:00
Arthur Schiwon
ea3ac4e656
Splits off the logic from sharees endpoint thus making it available from 
within Nc/via PHP.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2017-09-26 23:10:17 +02:00
John Molakvoæ
fc46e98fc6 Merge pull request #6647 from nextcloud/scss-no-take-only-throw 
Do not stop on scss compilation failure
 2017-09-26 16:26:43 +02:00
John Molakvoæ (skjnldsv)
dec713fc92
Do not stop on scss compilation failure 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-26 15:29:37 +02:00
Joas Schilling
fe3b2385ab
Code clean up 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-26 14:27:42 +02:00
Joas Schilling
1287d6ddb3
Only allow colons in db host for IPv6 addresses 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-09-26 14:20:04 +02:00
Morris Jobke
11c31e94fe
Improve exception handling 
If there is an exception in the template handling then a white page is shown.
This improves the handling of this and shows text only about the internal
error.

To test this just setup redis as cache and then disable the php-redis module.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-09-26 13:54:51 +02:00
Morris Jobke
292a704648 Merge pull request #6544 from nextcloud/fix/duplicate-session-token 
Fix duplicate session token after remembered login
 2017-09-25 17:39:02 +02:00
Roeland Jago Douma
3bd4e7e541 Merge pull request #6632 from nextcloud/do_not_show_hyphen 
Do not show hyphen
 2017-09-25 16:34:50 +02:00
Roeland Jago Douma
29fb315ffc
Allow requesting the max preview 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 16:18:48 +02:00
Stephan Müller
86265320b8
do not show hyphen after instance name in emails if slogan does not exist 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-25 09:20:46 +02:00
Roeland Jago Douma
c257cd57d4
Handle SameSiteCookie check for index.php in AppFramework Middleware 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-24 21:07:16 +02:00
John Molakvoæ (skjnldsv)
4a5eeb2ce7
Fixed webroot detection 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-22 07:20:31 +02:00
Morris Jobke
38568c362b Merge pull request #6605 from nextcloud/oc_ocs_response_is_dep 
OC_OCS_Response is deprecated
 2017-09-21 20:38:18 +02:00
Roeland Jago Douma
2207fdcd8c
Remove private legacy OC_OCS_Response 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-21 17:56:56 +02:00
Roeland Jago Douma
87e10f9e6a
OC_OCS_Response is deprecated 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-09-21 17:56:00 +02:00
Robin Appelman
385d6f098c
Add tests for multipart upload 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-21 14:47:34 +02:00
Robin Appelman
4ae46d8876
only do multipart upload for large files 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-21 14:06:59 +02:00
John Molakvoæ (skjnldsv)
0e17b65bcf
Avoid error undefined index classes in log 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2017-09-21 14:00:39 +02:00
Christoph Wurst
38bb6e1477
Fix duplicate session token after remembered login 
On a remembered login session, we create a new session token
in the database with the values of the old one. As we actually
don't need the old session token anymore, we can delete it right
away.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-09-20 21:39:31 +02:00
Roeland Jago Douma
8358c63f53 Merge pull request #6573 from nextcloud/nonfound-webroot-empty-string 
Fix "webroot not found" when installed to the root of the webserver
 2017-09-20 20:04:27 +02:00
Robin Appelman
e4e5e735db
multipart upload for s3 object storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-20 17:51:58 +02:00
Robin Appelman
5430d73a0e
Fix "webroot not found" when installed to the root of the webserver 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-09-20 14:19:15 +02:00
Christoph Wurst
2e19c42bc5
Check whether an app archive can be extracted 
If extraction fails we should not continue the installation/update
process as the info.xml cannot be loaded and an unrelated error
occurs.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-09-20 14:07:17 +02:00