1790 Commits

Author SHA1 Message Date
Pranav Kant
f4a40b1067 Log in as owner, not editor during checkFileInfo WOPI call
This seems to not work in some cases when files are shared.
2016-10-27 12:35:05 +02:00
Andras Timar
8f0c7d304e bump version to 1.1.9 2016-10-24 12:54:34 +02:00
Andras Timar
c3dba1b852 Merge pull request #133 from pranavk/test_server_cache_handling
Handle cache for test server options
2016-10-24 12:27:46 +02:00
Pranav Kant
2bca5aa2cb Handle cache for test server options 2016-10-24 15:45:17 +05:30
Jenkins for ownCloud
800332cec5 [tx-robot] updated from transifex 2016-10-21 02:34:21 +02:00
Andras Timar
a7f8fb75b3 Merge pull request #130 from pranavk/readonliness
Add UserCanWrite WOPI property
2016-10-20 10:39:35 +02:00
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.
2016-10-19 21:12:29 +05:30
Pranav Kant
c158859040 Setup FS during artificial login; new internal method logoutUser 2016-10-19 21:12:29 +05:30
Pranav Kant
d0589c3e48 Second param not needed here 2016-10-19 21:12:29 +05:30
Pranav Kant
93416e52a4 Kill edit for specific groups code 2016-10-19 21:12:29 +05:30
Pranav Kant
408fe08d5e Set UserCanWrite WOPI property if file is updatable 2016-10-19 21:12:29 +05:30
Pranav Kant
74dd2a6d8a Login as editor, not owner
This token belongs to editor, not owner, so its wrong to login as
owner.
2016-10-19 21:12:29 +05:30
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
2016-10-19 21:12:29 +05:30
Pranav Kant
81e60581e4 Add a db index to access token 2016-10-19 21:12:29 +05:30
Jenkins for ownCloud
df7ceb9865 [tx-robot] updated from transifex 2016-10-19 02:34:19 +02:00
Jenkins for ownCloud
2b1f251fb7 [tx-robot] updated from transifex 2016-10-17 02:34:19 +02:00
Jenkins for ownCloud
c6c0ee8703 [tx-robot] updated from transifex 2016-10-16 02:34:19 +02:00
Jenkins for ownCloud
1e52d6ed52 [tx-robot] updated from transifex 2016-10-15 02:34:18 +02:00
Andras Timar
13e7319083 Merge pull request #125 from pranavk/emptyarray
Handle empty arrays correctly
2016-10-14 11:58:40 +02:00
Pranav Kant
c98c1e6ba7 Handle empty arrays correctly 2016-10-14 15:26:05 +05:30
Andras Timar
974318a056 Merge pull request #124 from pranavk/testserver
New test server option for specific groups
2016-10-14 11:23:26 +02:00
Jenkins for ownCloud
89d4e4af8d [tx-robot] updated from transifex 2016-10-14 02:34:21 +02:00
Pranav Kant
1ad1f667ee Simplify edit group checking algorithm
Rather than making a server call, which seems to be not working
always anyways, use a foolproof method for this.
2016-10-13 20:50:48 +05:30
Pranav Kant
de62725ed2 Some beautification of admin settings 2016-10-13 20:16:02 +05:30
Pranav Kant
e593c34fdd New test server option for specific groups 2016-10-13 19:58:43 +05:30
Andras Timar
419bd3b65e Merge pull request #123 from pranavk/ooxml
New option : Use OOXML by default for new files
2016-10-13 13:03:43 +02:00
Pranav Kant
145854400e New 'Use OOXML by default' option in admin settings 2016-10-13 14:41:49 +05:30
Pranav Kant
f2e6c36060 Lets remove this <br> 2016-10-13 12:54:59 +05:30
Jenkins for ownCloud
44174224cb [tx-robot] updated from transifex 2016-10-13 02:34:21 +02:00
Andras Timar
18f441ab8f Merge pull request #121 from pranavk/editgroups
Cleanup/refactor, remove debug code
2016-10-11 14:51:35 +02:00
Andras Timar
a5c3f6de81 Merge pull request #122 from jancborchardt/viewbox
add viewBox attribute to icon so it shows correctly in the app management
2016-10-11 14:48:55 +02:00
Jan-Christoph Borchardt
f63bbdf1e2 add viewBox attribute to icon so it shows correctly in the app management
Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
2016-10-11 14:16:35 +02:00
Pranav Kant
40323cab8c Cleanup/refactor, remove debug code 2016-10-11 17:15:36 +05:30
Andras Timar
f63aaeb631 Merge pull request #120 from pranavk/editgroups
Edit groups functionality
2016-10-11 13:27:39 +02:00
Pranav Kant
c24c5a0439 Only allow users to edit documents if part of edit groups
If edit group setting is not set in Collabora Online settings,
then allow all users.
2016-10-11 13:21:35 +05:30
Pranav Kant
1174105402 Setup edit groups functionality 2016-10-11 13:03:19 +05:30
Jenkins for ownCloud
ae6a734df7 [tx-robot] updated from transifex 2016-10-09 02:34:19 +02:00
Thomas Müller
31946275d1 Merge pull request #119 from owncloud/DeepDiver1975-patch-1
There are no personal settings
2016-10-07 13:06:29 +02:00
Thomas Müller
517cc37372 There are no personal settings
Fixes #118
2016-10-07 12:28:15 +02:00
Andras Timar
2ffa1b04b3 Merge pull request #116 from vmiklos/bccu2033
bccu#2033 Respect WOPI action names
2016-10-04 16:16:19 +02:00
Miklos Vajna
d6b65b7983 bccu#2033 Respect WOPI action names
Don't assume that the action name is 'edit' all the time. Instead, if
it's view, then initialize leaflet with permission=readonly.
2016-10-04 15:53:36 +02:00
Andras Timar
63c74865f0 Merge pull request #115 from pranavk/timestamps
Show relative timestamps as heading, formatted as tooltip
2016-10-03 11:03:47 +02:00
Pranav Kant
cf97470caf Show relative timestamps as heading, formatted as tooltip
Be consistent with owncloud own version sidebar, and loleaflet's
DocumentRepair dialog.
2016-10-03 11:17:36 +05:30
Andras Timar
ee1e6388f9 Bump version to 1.1.6 2016-10-02 16:20:30 +02:00
Jenkins for ownCloud
c09ebc0782 [tx-robot] updated from transifex 2016-09-28 02:34:31 +02:00
Jenkins for ownCloud
0be722cc45 [tx-robot] updated from transifex 2016-09-27 02:34:30 +02:00
Jenkins for ownCloud
a24cf08355 [tx-robot] updated from transifex 2016-09-21 02:34:31 +02:00
Andras Timar
99873b7331 change the id of Apply button to wopi_apply 2016-09-20 10:49:33 +02:00
Jenkins for ownCloud
125f882e44 [tx-robot] updated from transifex 2016-09-20 09:07:42 +02:00
Lukas Reschke
c6340c69ff Merge pull request #111 from owncloud/fix-travis
Disable builds for 5.4 and 5.5
2016-09-17 16:47:56 +02:00