Граф коммитов

90 Коммитов

Автор SHA1 Сообщение Дата
Julius Härtl 355175c0ac
Check via discovery if collabora server is available before opening the document
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-03-01 15:29:05 +01:00
Daniel Kesselberg 117d75a282 Add settings to disable certificate validation
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-02-24 16:01:25 +01:00
Roeland Jago Douma c37d0a7e5f
Move to a service to also fetch the capabilities when the settings are updated
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-02-06 21:13:08 +01:00
Julius Härtl 12b3780c7d
Properly load file model with correct name on creation
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-01-25 17:42:10 +01:00
Roeland Jago Douma 56bd27d5c5
Set userId so anonymous collabora calls also work
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:45 +01:00
Roeland Jago Douma ae2d802a0f
Check the passed variables
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:45 +01:00
Roeland Jago Douma cc948a3b3d
Actually create the file in a subfolder
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:45 +01:00
Roeland Jago Douma 9b6b581f9a
Make 5.6 compatible
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:45 +01:00
Roeland Jago Douma 1e641159bc
Add TemplateSaveAs
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:45 +01:00
Julius Härtl b56d63b227
Add personal settings for template folder
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-12-20 07:38:45 +01:00
Roeland Jago Douma ceaa514833
Templates controller php5.6
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:45 +01:00
Roeland Jago Douma e4abb15651
Return empty templates by default
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:44 +01:00
Roeland Jago Douma 8ffc77c4fc
Allow templates to be created from the web
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:44 +01:00
Roeland Jago Douma d00081c85f
Use actual name provided by API
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:44 +01:00
Roeland Jago Douma a854a7ff47
Really implement put relative
Special handling for tokens from a template

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:44 +01:00
Roeland Jago Douma c5df57dfcc
Open template via OCS (Direct view)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:44 +01:00
Roeland Jago Douma cb6c9315cf
Add helper fucntions and just pass objects around instead of magic
arrays

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:44 +01:00
Roeland Jago Douma c6f87ee931
Add tempalte destination to WOPI token
This is required to perform the proper save as for the first time when a
template is opened.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:44 +01:00
Roeland Jago Douma 34106609ea
Move templates over to use fileids as well
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:44 +01:00
Roeland Jago Douma c35ee8759d
Some cleanup
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-20 07:38:44 +01:00
John Molakvoæ (skjnldsv) a5eb500d5e
Api get all fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-12-20 07:38:43 +01:00
John Molakvoæ (skjnldsv) 8622c54948
Ocs api
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-12-20 07:38:43 +01:00
John Molakvoæ (skjnldsv) 94f9603dde
Fix preview and default size
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-12-20 07:38:43 +01:00
John Molakvoæ (skjnldsv) 45ecbbf62c
Design fixes and preview check
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-12-20 07:38:43 +01:00
John Molakvoæ (skjnldsv) 5e589bacfe
Fix code style and practice
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-12-20 07:38:43 +01:00
John Molakvoæ (skjnldsv) ec9a211846
Fix DI error, added design base and delete handler
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-12-20 07:38:43 +01:00
John Molakvoæ (skjnldsv) 6a7b73f598
Error handler and class code style fixes
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-12-20 07:38:43 +01:00
John Molakvoæ (skjnldsv) e334a2420e
Template manager init
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-12-20 07:38:41 +01:00
Roeland Jago Douma dd053529e8
Pass the uid when generating a WOPI token for a directview
Else the editor will show up as a ? in the editorlist.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-08 11:11:02 +01:00
Roeland Jago Douma 2b8ad9f9a8
Do not clear asset on HEAD request
If Collabora sends a head request to obtain info about the assets we
should not directly delete it. Instead just let it be if it is a HEAD
request.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-10-28 21:15:04 +01:00
Jan Holesovsky ca401f0843 Strip the service root prefixes in the Collabora Online wopi_url.
Otherwise we cannot set the content security policy correctly.
2018-09-13 21:42:55 +02:00
Roeland Jago Douma 6cac5cada1
For now no CSRF on that endpoint
* Maybe move endpoint to OCS?

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-04 15:23:49 +02:00
Roeland Jago Douma ab977712fc
Enable remote image insert and sharing
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-09-04 13:24:32 +02:00
Roeland Jago Douma 6db0348bcd
Allow creation of OOXML docs if app not in default location
Fixes #118

In case the apps folder is not /apps (the docker container for example).
The template manager will not work with that path then obviously. This
makes sure the path can always be found.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-17 14:38:49 +02:00
Roeland Jago Douma 921198aad0
Delete assets once it is fetched
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-07 10:48:56 +02:00
Roeland Jago Douma c0f7a6567b
First start of assets endpoint
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-08-07 10:48:55 +02:00
Morris Jobke 39346cc67d
Merge pull request #219 from nextcloud/fix/184/use_editor_to_edit
Fix editing on external storage
2018-07-20 20:40:25 +02:00
Roeland Jago Douma 8f44ee892c
Tokens expire after 10 minutes
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-20 20:24:33 +02:00
Roeland Jago Douma a59e887aa5
Delete the token on use
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-20 20:24:33 +02:00
Roeland Jago Douma b02dc96547
Return responses instead of just errors
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-20 20:24:33 +02:00
Roeland Jago Douma 21059397a9
Initial mobile edit
* Add OCS endpoint for client to request a view
* Endpoint returns an URL
* DirectView controller to show info

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-20 20:24:33 +02:00
Roeland Jago Douma 6c07e82d50
Revert "No need for allow inline script since we use a nonce" 2018-07-11 22:26:05 +02:00
Morris Jobke 996e9e6c4f
Merge pull request #212 from nextcloud/dept/noid/nonce_is_used
No need for allow inline script since we use a nonce
2018-07-10 13:28:40 +02:00
Roeland Jago Douma 8b1404f356
Inject IUserSession
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-10 10:05:27 +02:00
Roeland Jago Douma 8f58e022c0
Use the editor to edit save a file
Fixes #184

We should always open try to access the file from the editor point of
view. The only moment we can't do this is when we edit from a public
page.

This makes sure that the paths match properly for versions.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-10 10:00:54 +02:00
Roeland Jago Douma 473584b66d
Some code fixes by phpstorm inspections
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-09 21:25:35 +02:00
Roeland Jago Douma b2318d628b
Use the NodeAPI to create a new file
The view should not be used by apps.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-09 15:58:37 +02:00
Roeland Jago Douma d69e74e0db Use more injection (#213)
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-09 10:37:08 +02:00
Roeland Jago Douma 0d70bc4316
No need for allow inline script since we use a nonce
Function call had been deprecated in NC10 already.
We add a nonce to the inline javascript already. So no need to weaken
the CSP by allowing possible other inline scripts.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-07-06 15:15:46 +02:00
nithom bcb67076a9 Let external users set their display name when editing. (#200)
Signed-off-by: Nico Thomas <nithom@online.de>

Co-authored-by: JonasBlaesche <jonas.blaesche@me.com>
2018-06-13 15:31:18 +02:00