2039 Commits

Author SHA1 Message Date
Andras Timar
42d1f78f39 Bump version to 1.1.2 2016-07-19 15:49:44 +02:00
Andras Timar
8396b91ae1 Merge pull request #89 from owncloud/loose-comparison-token
Use non strict comparison to validate token
2016-07-19 15:48:24 +02:00
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
2016-07-19 15:04:32 +02:00
Andras Timar
8ec0138f5d Bump version to 1.1.1 2016-07-19 14:15:24 +02:00
Andras Timar
152311b9a2 get version number from appinfo/info.xml 2016-07-19 11:23:53 +02:00
Andras Timar
c328ae592f Merge branch 'rename-info-xml' 2016-07-19 11:10:54 +02:00
Andras Timar
444f987412 Merge branch 'master' into rename-info-xml 2016-07-19 11:10:17 +02:00
Andras Timar
b091c74814 Merge pull request #87 from owncloud/add-ocs-id
Add OCS ID
2016-07-19 11:08:57 +02:00
Andras Timar
7c16985efd Merge pull request #88 from owncloud/use-event-dispatcher
Use event dispatcher
2016-07-19 11:08:42 +02:00
Jenkins for ownCloud
3347d9fa59 [tx-robot] updated from transifex 2016-07-19 02:36:17 -04:00
Lukas Reschke
294274adc6
Use event dispatcher
Registers the JS via event dispatchers. Otherwise the JS is not loaded when somebody has pretty URLs configured.
2016-07-18 23:47:01 +02:00
Andras Timar
2f2701184c Merge pull request #86 from pranavk/files_external
Add support for opening and editing files from external storage
2016-07-18 22:32:14 +02:00
Lukas Reschke
d48d3b4f70 Correct spelling 2016-07-18 19:59:04 +02:00
Lukas Reschke
fe248b98f8 Add OCS ID
Adds the OCS ID for https://apps.owncloud.com/content/show.php/Collabora+Online+connector?content=174727
2016-07-18 19:58:33 +02:00
Pranav Kant
be84ac71f8 Explicit is better than implicit
For consistency, lets close the opened user login session here
also.
2016-07-18 17:09:27 +05:30
Pranav Kant
45d76a1c68 Add support for opening and editing files from external storage 2016-07-18 16:17:44 +05:30
Lukas Reschke
6d8b89b949
Name file info.xml directly
When developing apps for Nextcloud it is more usual that as a developer you can directly clone the app and enable it. The makefile is also very specific.

To improve the developer experience I have renamed that file to "info.xml" directly. At least I was kinda confused why I couldn't enable the app the first time I cloned it :-)
2016-07-18 12:07:09 +02:00
Andras Timar
e906c47ef5 Merge pull request #84 from pranavk/master
Add restore button after fixing prerequisites
2016-07-18 10:00:48 +02:00
Pranav Kant
4cda46798e Add restore button to the revision history sidebar 2016-07-18 11:11:52 +05:30
Pranav Kant
ea484bb357 Fix a typo 2016-07-18 11:11:52 +05:30
Pranav Kant
82906c7cd7 No need to make the user login here, and fix incorrect userid
Setting up FS is enough to get the correct file version. No need
to make the user login here.

File version would be in owner's FS, not editor, so
s/editorid/ownerid/
2016-07-18 11:11:52 +05:30
Pranav Kant
e0da6fa8d1 Create a dummy memory session before signing in as user
Since this WOPI Put method is executed when loolwsd hits owncloud
server, it has no session or probably invalid session data. Even
though WOPI Put file operation initiated by loolwsd succeds, i.e
file is successfully put into owncloud storage and versioned, it
returns an HTTP 500 Internal server error as response to loolwsd
which causes problem on loolwsd side messing up its state.

Following trace can be observed in webserver's error logs after
HTTP 500 is returned:

PHP Fatal error:  Uncaught exception 'Exception' with message 'Session has been closed - no further changes to the session are allowed'
in /var/www/html/owncloud9/lib/private/session/internal.php:135
Stack trace:
 #0 /var/www/html/owncloud9/lib/private/session/internal.php(60): OC\\Session\\Internal->validateSession()
 #1 /var/www/html/owncloud9/lib/private/session/cryptosessiondata.php(150): OC\\Session\\Internal->set('encrypted_sessi...', 'e747091469b9905...')
 #2 /var/www/html/owncloud9/lib/private/session/cryptosessiondata.php(64): OC\\Session\\CryptoSessionData->close()
 #3 [internal function]: OC\\Session\\CryptoSessionData->__destruct()
 #4 {main}\n  thrown in /var/www/html/owncloud9/lib/private/session/internal.php on line 135

Creating a dummy memory session, setting it as current session,
and then setting the desired user session seems to address this
problem and does not emit HTTP 500 anymore.
2016-07-18 11:11:49 +05:30
Jenkins for ownCloud
5fde788a9e [tx-robot] updated from transifex 2016-07-17 02:36:12 -04:00
Jenkins for ownCloud
23c8155c61 [tx-robot] updated from transifex 2016-07-16 02:34:34 -04:00
Andras Timar
53256007de Merge pull request #81 from pranavk/download_tooltip
Show 'Download' tooltip for download icon in revision history
2016-07-15 19:45:42 +02:00
Andras Timar
1cf1268533 Merge pull request #80 from pranavk/lolang
Respect lolang param in revision history mode too
2016-07-15 19:45:24 +02:00
Jenkins for ownCloud
85cf2c564e [tx-robot] updated from transifex 2016-07-15 02:34:34 -04:00
Jenkins for ownCloud
84cb2c9c1a [tx-robot] updated from transifex 2016-07-14 02:34:38 -04:00
Jenkins for ownCloud
eac23e869a [tx-robot] updated from transifex 2016-07-10 04:39:33 -04:00
Jenkins for ownCloud
bb032cde41 [tx-robot] updated from transifex 2016-07-09 02:36:14 -04:00
Jenkins for ownCloud
3d3a583baa [tx-robot] updated from transifex 2016-07-08 02:49:52 -04:00
Jenkins for ownCloud
cad7b37e59 [tx-robot] updated from transifex 2016-07-07 02:34:38 -04:00
Jenkins for ownCloud
88d398f5c2 [tx-robot] updated from transifex 2016-07-06 02:34:46 -04:00
Jenkins for ownCloud
351126a0bf [tx-robot] updated from transifex 2016-07-05 02:34:39 -04:00
Pranav Kant
d91151091d Show 'Download' tooltip for download icon in revision history 2016-07-04 13:55:42 +05:30
Pranav Kant
1a41f8bbd3 Respect lolang param in revision history mode too 2016-07-04 13:35:43 +05:30
Jenkins for ownCloud
1696a1238e [tx-robot] updated from transifex 2016-07-04 02:35:48 -04:00
Jenkins for ownCloud
3d57f733f0 [tx-robot] updated from transifex 2016-07-03 02:35:42 -04:00
Jenkins for ownCloud
59bc3f9899 [tx-robot] updated from transifex 2016-07-02 02:34:27 -04:00
Jenkins for ownCloud
0e88c8e2b5 [tx-robot] updated from transifex 2016-07-01 02:34:36 -04:00
Jenkins for ownCloud
147f01abec [tx-robot] updated from transifex 2016-06-30 02:35:41 -04:00
Andras Timar
e0411f237f Merge pull request #79 from pranavk/404_slowserver
404 slowserver
2016-06-29 22:39:41 +02:00
Andras Timar
add49b6f47 Merge pull request #78 from pranavk/explicit_rev
Explicitly ask for revision history option
2016-06-29 22:38:05 +02:00
Pranav Kant
c084533efb Wait till page is rendered
There's a race condition here between page being rendered with
all the document(s) information and showing the editor to the
user. The later requires the former as it uses data rendered into
the page.

In most cases, former is quick enough and we do not see any
problems, but in some cases, mostly when the server is responding
very slowly, it will lag behind the later causing the editor to
be shown before data is rendered into the page leading to '404
Object not found'.

This should, hopefully, avoid such cases.
2016-06-29 22:03:01 +05:30
Pranav Kant
c80a31ebe0 $.getJSON already returns a promise like object
... so no need to create a deferred object separately and then
resolve it manually. This is since jquery 1.5

See: https://api.jquery.com/jquery.getjson/
2016-06-29 21:12:15 +05:30
Pranav Kant
f3e7211ee5 Add Handlebars to global 2016-06-29 19:43:10 +05:30
Pranav Kant
58f9b4c5b4 Explicitly ask for revision history option
... since loleaflet explicitly requires it now if revision
history option is required.
2016-06-29 17:42:18 +05:30
Andras Timar
646706c2ec add app target in Makefile 2016-06-29 10:13:39 +02:00
Andras Timar
27f17f5a31 update packaging 2016-06-29 10:13:39 +02:00
Andras Timar
be3c121c1f Merge pull request #74 from pranavk/revision_hist_sidebar
Revision history sidebar
2016-06-29 10:11:27 +02:00