1914 Commits

Author SHA1 Message Date
Jenkins for ownCloud
0adadfb7ca [tx-robot] updated from transifex 2016-08-14 02:34:32 +02:00
Jan Holesovsky
1e6bd85e6b Merge pull request #100 from pranavk/master
Make NewFileMenu's display name translatable
2016-08-12 11:06:21 +02:00
Pranav Kant
517e1c79a3 Make NewFileMenu's display name translatable 2016-08-12 14:23:34 +05:30
Jenkins for ownCloud
0ecf00f6c0 [tx-robot] updated from transifex 2016-08-12 02:34:30 +02:00
Jan Holesovsky
1d16bf0246 Bump version to 1.1.4, update max-version to 9.1. 2016-08-09 13:32:33 +02:00
Jenkins for ownCloud
6a94f92c20 [tx-robot] updated from transifex 2016-08-07 02:34:30 +02:00
Jenkins for ownCloud
c441a09769 [tx-robot] updated from transifex 2016-08-04 20:35:17 -04:00
Jenkins for ownCloud
7cee44b618 [tx-robot] updated from transifex 2016-08-02 20:35:13 -04:00
Jenkins for ownCloud
6c0bf829f8 [tx-robot] updated from transifex 2016-08-01 20:35:28 -04:00
Jenkins for ownCloud
271076a8ec [tx-robot] updated from transifex 2016-07-30 20:38:02 -04:00
Jenkins for ownCloud
6dff57f99a [tx-robot] updated from transifex 2016-07-29 20:35:43 -04:00
Jenkins for ownCloud
13b76e6688 [tx-robot] updated from transifex 2016-07-28 20:35:03 -04:00
Jan Holesovsky
dd832f3501 Improve the error message. 2016-07-28 14:35:54 +02:00
Jenkins for ownCloud
999c635f1d [tx-robot] updated from transifex 2016-07-26 21:18:11 -04:00
Jenkins for ownCloud
d876625bb4 [tx-robot] updated from transifex 2016-07-26 03:50:02 -04:00
Jenkins for ownCloud
24c5cde49f [tx-robot] updated from transifex 2016-07-23 22:27:59 -04:00
Andras Timar
b99c5d49bb updated .gitignore 2016-07-22 11:17:37 +02:00
Andras Timar
2cb728e02c Set app icon 2016-07-22 11:02:53 +02:00
Jenkins for ownCloud
4994e5f153 [tx-robot] updated from transifex 2016-07-20 20:36:12 -04:00
Lukas Reschke
aa777cea85 Add more metadata 2016-07-20 10:33:14 +02:00
Jenkins for ownCloud
d2623ee54a [tx-robot] updated from transifex 2016-07-20 02:36:15 -04:00
Andras Timar
1bfa8d2a9d update name to fit in the app dropdown, for real 2016-07-19 20:49:04 +02:00
Andras Timar
31ee01520f Bump version to 1.1.3 2016-07-19 20:35:41 +02:00
Lukas Reschke
9364e51ef5 Merge pull request #90 from jancborchardt/patch-1
update name to fit in the app dropdown
2016-07-19 17:45:11 +02:00
Jan-Christoph Borchardt
8b75221ff3 update name to fit in the app dropdown 2016-07-19 17:02:39 +02:00
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