Commit Graph

252 Commits (bbefee2e4f3166e931488faf1fbaa04fcebb491b)

Author SHA1 Message Date
Pranav Kant 32755343ed Use the file owner from the share object, if available
Fixes #85

When a link is shared on external storage and user is not logged in, the
owner returned by the $file object is null. Use owner information from
the $share object whenever available.

(cherry picked from commit ee09fb0748)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Pranav Kant 2c1dd44651 Don't throw exception when user not found
It might be a public link share.

(cherry picked from commit 3f4aa7b23e)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Pranav Kant 654c8e988d Show Display Name of user, not its uid in userlist
(cherry picked from commit 3940ec64c7)
7 years ago
Pranav Kant 9afe6fb69c Guard encryption support
(cherry picked from commit c14ff8fee8)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Pranav Kant 0a4c5816ee Register the change under user's name when saving the document
(cherry picked from commit 0f086cfe87)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Pranav Kant 6b112402f9 Support opening encrypted files
(cherry picked from commit eef417f05b)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Andras Timar b44c4da9a5 Merge pull request #61 from pranavk/nc11
Revert "Remove unrequired route"; respect OOXML settings again
7 years ago
Andras Timar cc5fb99cb4 Fix issue#68: undefined variable instanceId
(cherry picked from commit 4ffef00aca)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Pranav Kant d6c90226b9 Revert "Remove unrequired route"; respect OOXML settings again
This reverts commit aa89c908a7.

(cherry picked from commit 0c14789cc3)
7 years ago
Pranav Kant 2385b70915 Fix file revisions
(cherry picked from commit 9bb400714c)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Pranav Kant c21c029fa4 Send file path to the client also, fix revision history
(cherry picked from commit 66935d4bed)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Lukas Reschke 7e4c59e360 Append instance id to rev history
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
(cherry picked from commit 9cd9258dbb)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Lukas Reschke ad61db1158 Add instance id to file id
For multitenancy

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
(cherry picked from commit 1441bdc594)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
michag86 6b629b2c67 Make files_versions work again
Added some lines which were lost after rewrite with version 1.1.22.
(cherry picked from commit c72f22e180)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Andras Timar 1cc5e43106 set the correct language tag expected by JS
(cherry picked from commit b565415e1c)
Signed-off-by: Andras Timar <andras.timar@collabora.com>
7 years ago
Lukas Reschke 719b159a44
v1.1.24
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago
Lukas Reschke 7ff4d5bb52
Add OwnerId
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago
Lukas Reschke 58134ab0a2
Gracefully handle exception
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago
Lukas Reschke cb8e416343
Catch exceptions
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago
Lukas Reschke 5dd6344629
Delete cached discovery file if settings are changed
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago
Lukas Reschke aa89c908a7
Remove unrequired route
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago
Lukas Reschke 88a93503ca
Properly use an integer
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago
Lukas Reschke 7ef24654cf
Public editing
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago
Lukas Reschke 75af90b4f1
Cleanup source code
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago
Lukas Reschke f304fd4629
New admin pages
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
8 years ago
Pranav Kant a12ff8d0d2 security: Support WOPI's PostMessageOrigin
Adds a new property PostMessageOrigin to WOPI's CheckFileInfo.
The inner frame then only sends message to target with origin
mentioned in this property.

Also implement editor initialization WOPI specs. Inner frame
sends a App_LoadingStatus message to us when ready, and we send
Host_PostmessageReady when we are ready.
8 years ago
Pranav Kant 7e64777f4a Store canwrite property in DB
Move whether the file is editable or not logic when generating a
token and store it in the DB with the access token instead of
checking it dynamically in WOPI calls.
8 years ago
Pranav Kant 20d2ce582a Don't ignore non-updatable files
Don't discriminate with these files; let them have the right to
join the session or generate access token like other sessions
8 years ago
Pranav Kant 84dbbafe70 Formatting 8 years ago
Robin Appelman cfd3bb662a Use non strict comparison to validate token
On my setup this is needed to load a document

Maybe related to using postgres
8 years ago
Pranav Kant 45d76a1c68 Add support for opening and editing files from external storage 8 years ago
Pranav Kant 3235b886ad Add a revision history sidebar 8 years ago
Pranav Kant eb79866efd Fix path for shared documents 8 years ago
Pranav Kant 440eb9e27c Add missing mtime field to processed documents 8 years ago
Ashod Nakashian 0517f76c32 Shared documents now show correct editor's name in the change hisotry 8 years ago
Ashod Nakashian 0c508a09e0 Support for file versioning in WOPI 8 years ago
Pranav Kant af16a4cd27 Make me work with owncloud9
Due to API change (searchByMime), app was completely broken when
installed with owncloud9. This change should make it work with
owncloud9, while still keeping older owncloud version (upto 8.2)
in working state.

Lets use functions on object returned by searchByMime instead of
directly accessing its data members.
8 years ago
Pranav Kant b138109820 Don't load all documents when only one is clicked on from 'Files' 8 years ago
Andras Timar ef78d87173 PHP syntax error on Ubuntu 14.04 LTS
syntax error, unexpected '*', expecting ',' or ';' at /var/www/owncloud/apps/richdocuments/lib/db/wopi.php#28
8 years ago
Ashod Nakashian 38c1b87435 wopi: support for file sharing and authentication 8 years ago
Andras Timar f3eaa1683d use SSL 8 years ago
Henry Castro e6bda70834 Application config, set default port 9980 8 years ago
Andras Timar a32c1e2be3 remove unused webODF unstable setting 8 years ago
Andras Timar f0f3e42c0e remove dead code (from Collabora Online perspective) 8 years ago
Ashod Nakashian be97780451 WOPI Token table and database plumbing added 8 years ago
Henry Castro 08dbf236d9 Add WOPI client settings 8 years ago
Victor Dubiniuk 447610b260 Fix appid 9 years ago
Andras Timar 8010839279 bccu#1335 don't try to handle pdf, internal pdf.js does a better job 9 years ago
Jan Holesovsky e6593def87 cloudsuite: Add buttons to create new spreadsheet and new presentation. 9 years ago
Mihai Varga ddc34a60c3 bug #1261 - added microsoft document mime types 9 years ago