2039 Commits

Author SHA1 Message Date
Andras Timar
0ab25bcfbc Merge pull request #29 from pranavk/master
Use window.postMessage API for cross-domain frame communication
2016-04-01 15:31:04 +02:00
Pranav Kant
96c88b5a1e Use window.postMessage API for cross-domain frame communication
Use filename as additional param to let the child frame know the
name of the document easily.

Use closebutton param to instruct the child frame about whether
to show the close button, or not.
2016-04-01 18:34:04 +05:30
Andras Timar
d1c76983c1 Merge pull request #28 from timar/master
local file access method is deprecated by WOPI
2016-03-31 17:10:13 +02:00
Andras Timar
2b302fa1af local file access method is deprecated by WOPI 2016-03-31 16:24:16 +02:00
Andras Timar
79e6af8182 Merge pull request #26 from timar/master
Bump version to 0.9.1 to trigger database update
2016-03-25 12:14:06 +01:00
Andras Timar
773b4c8d5e Bump version to 0.9.1 to trigger database update 2016-03-25 12:13:16 +01:00
Henry Castro
a149c97639 Merge pull request #25 from Ashod/wopi_fileinfo
Wopi fileinfo
2016-03-23 22:26:46 -04:00
Ashod Nakashian
38c1b87435 wopi: support for file sharing and authentication 2016-03-23 21:58:13 -04:00
Ashod Nakashian
1a737b4f07 wopi: pass the url wopi without /contents, to make it more flexible 2016-03-23 21:58:13 -04:00
Ashod Nakashian
dc05bb09f5 wopi: CheckFileInfo handler added 2016-03-23 21:58:12 -04:00
Henry Castro
e059a5f74f Merge pull request #24 from timar/master
use SSL
2016-03-23 20:03:02 -04:00
Andras Timar
f3eaa1683d use SSL 2016-03-23 22:03:39 +01:00
Henry Castro
deed4fc366 Merge pull request #23 from hcvcastro/master
Fix close button bug
2016-03-17 15:45:57 -04:00
Henry Castro
81ba6a184e Fix close button bug 2016-03-17 15:09:27 -04:00
Andras Timar
b30a0c3cf0 Merge pull request #21 from timar/master
rpm package requirements update
2016-03-17 15:27:33 +01:00
Andras Timar
21a5d3f2d9 Merge pull request #22 from hcvcastro/master
Clear cache when saves admin settings
2016-03-17 15:27:20 +01:00
Henry Castro
0d243cbc60 Clear cache when saves admin settings 2016-03-17 10:00:46 -04:00
Henry Castro
119e5ca38c Fix inconsistent validation bug 2016-03-17 09:58:11 -04:00
Andras Timar
fb319c3186 rpm package requirements update
+ it does not require loleaflet and loolwsd, because
  loolwsd server can run on a separate machine, and
  loleaflet will be served by loolwsd in the near
  future.
+ it requires php5-apcu and the following line should be
  inserted to owncloud/config/config.php:
  'memcache.local' => '\OC\Memcache\APCu',
2016-03-17 11:17:20 +01:00
Andras Timar
97693fc420 Merge pull request #20 from hcvcastro/master
Add response error page
2016-03-17 10:29:08 +01:00
Henry Castro
3a8b677bfd Add response error page 2016-03-16 23:46:13 -04:00
Andras Timar
c675eccee9 Merge pull request #19 from hcvcastro/master
Application config, set default port 9980
2016-03-16 14:29:41 +01:00
Henry Castro
b135ad4a5c Add WOPISrc parameter 2016-03-16 09:05:33 -04:00
Henry Castro
c168936107 Allow domain websocket URI 2016-03-16 09:04:35 -04:00
Henry Castro
e6bda70834 Application config, set default port 9980 2016-03-15 19:24:34 -04:00
Andras Timar
fc1126506b Merge pull request #17 from timar/master
remove dead code (from Collabora Online perspective)
2016-03-15 11:27:54 +01:00
Andras Timar
a32c1e2be3 remove unused webODF unstable setting 2016-03-15 00:23:17 +01:00
Andras Timar
c406216116 internal name: richdocuments, name: Collabora Online, version: 0.9.0 2016-03-15 00:16:16 +01:00
Andras Timar
b323d9512d internal name: richdocuments, name: Collabora Online, version: 0.9.0 2016-03-15 00:13:55 +01:00
Andras Timar
f0f3e42c0e remove dead code (from Collabora Online perspective) 2016-03-14 23:34:29 +01:00
Andras Timar
664a564ee4 Merge pull request #16 from Ashod/putfile
Pass fileId to get path
2016-03-14 11:40:44 +01:00
Ashod Nakashian
4585de5261 Pass fileId to get path 2016-03-13 23:23:57 -04:00
Andras Timar
c7b2c42085 Merge pull request #15 from hcvcastro/master
Read discovery.xml capabilities
2016-03-10 23:10:49 +01:00
Henry Castro
3a2d2a219f JS handle urlsrc attribute 2016-03-10 10:41:07 -04:00
Henry Castro
14eda814f5 Read discovery.xml capabilities 2016-03-10 08:00:52 -04:00
Andras Timar
a4b9e783d4 Merge pull request #14 from Ashod/wopi
Wopi
2016-03-10 08:03:32 +01:00
Ashod Nakashian
30a22ef7e7 WOPI GetFile and PutFile added and document loader updated 2016-03-09 08:42:47 -05:00
Ashod Nakashian
be97780451 WOPI Token table and database plumbing added 2016-03-09 08:40:48 -05:00
Andras Timar
789d0050fb Merge pull request #13 from hcvcastro/master
Add initial cache support
2016-03-09 14:17:39 +01:00
Henry Castro
13692a5d3b Request discovery.xml from WOPI client 2016-03-09 08:54:56 -04:00
Henry Castro
2d2edffa80 Add initial cache support 2016-03-09 08:50:49 -04:00
Andras Timar
0f01c190ef Merge pull request #11 from hcvcastro/master
Add WOPI client settings
2016-03-06 09:05:44 +01:00
Henry Castro
85f3079b47 Post WOPI url iframe 2016-03-05 18:57:23 -04:00
Henry Castro
3a607668cc Add template response wopi_url 2016-03-05 18:14:16 -04:00
Henry Castro
08dbf236d9 Add WOPI client settings 2016-03-05 17:40:47 -04:00
Andras Timar
ce5528be4d Merge pull request #10 from timar/master
Bump version to 1.0.7
2016-02-24 14:15:37 +01:00
Andras Timar
efd062200f Bump version to 1.0.7 2016-02-24 14:14:41 +01:00
Andras Timar
253583537d Merge pull request #9 from timar/master
remove temp file only when all edit instances are closed
2016-02-23 23:13:33 +01:00
Andras Timar
407df19d7a remove temp file only when all edit instances are closed 2016-02-23 15:35:21 +01:00
Andras Timar
92f970a08b Merge pull request #8 from timar/master
Bump version to 1.0.6.
2016-02-09 22:10:29 +01:00