1706 Commits

Author SHA1 Message Date
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
Lukas Reschke
0806876fd0 Merge pull request #109 from timar/master
remove unused 'Save new documents to' setting, fixes #76
2016-09-17 16:42:11 +02:00
Lukas Reschke
52379137fc Merge pull request #110 from pranavk/constsig
Fix incorrect constructor signature
2016-09-17 16:41:33 +02:00
Lukas Reschke
128e0cbf1e
Disable builds for 5.4 and 5.5
Not anymore supported in Nc and oC master.
2016-09-17 16:40:58 +02:00
Pranav Kant
70016ad4de Fix incorrect constructor signature
Fallback from c166c7b18907bb5e25144723810bf567b1910a30
2016-09-14 11:48:25 +05:30
Pranav Kant
84dbbafe70 Formatting 2016-09-14 11:48:25 +05:30
Andras Timar
6fc595eb93 remove unused 'Save new documents to' setting, fixes #76 2016-09-12 19:42:46 +02:00
Andras Timar
7a0d2b944c change id of Apply button, fixes #93, fixes #92 2016-09-12 18:53:54 +02:00
Andras Timar
d16f783a5d Merge pull request #108 from owncloud/port-documents-652
Fix upload in richdocuments
2016-09-07 20:19:03 +02:00
Morris Jobke
d6a412caac
Fix error in richdocuments
Ports https://github.com/owncloud/documents/pull/652 by @vicdeo to richdocuments
2016-09-07 13:27:09 +02:00
Andras Timar
ccc483e8e8 Bump version to 1.1.5 2016-09-01 17:16:40 +02:00
Andras Timar
8676a7d2c9 Merge pull request #104 from pranavk/userlist
Add UserId, UserFriendlyName to WOPI CheckFileInfo
2016-08-30 10:19:06 +02:00
Pranav Kant
e3d3f6bec3 Remove unused fields 2016-08-30 13:28:28 +05:30
Pranav Kant
05b4d568f6 Add UserId, UserFriendlyName to WOPI CheckFileInfo 2016-08-29 19:08:57 +05:30
Andras Timar
7c4aa05c20 Merge pull request #103 from pranavk/invalidurl
Respect default settings
2016-08-29 13:16:53 +02:00
Pranav Kant
11a7819dac Adjust documentcontrollertest
... as document controller class interface has changed now
2016-08-29 15:42:20 +05:30
Pranav Kant
c166c7b189 Respect default settings
Support for default settings when there is none provided by user
was already in lib/appconfig.php

But we were using the CoreConfig object always which queries the
database; lets use the appConfig object so that if the value is
missing in the database, we still have the default value to take
care of the app.
2016-08-29 14:47:31 +05:30
Jenkins for ownCloud
fc1f22584c [tx-robot] updated from transifex 2016-08-29 02:34:36 +02:00
Jenkins for ownCloud
3ffed7d8a1 [tx-robot] updated from transifex 2016-08-26 02:34:31 +02:00
Andras Timar
955098c52c Bump max-version to 9.2 2016-08-25 09:11:39 +02:00
Jenkins for ownCloud
c1946740bf [tx-robot] updated from transifex 2016-08-24 02:34:32 +02:00
Jenkins for ownCloud
f1d204eb37 [tx-robot] updated from transifex 2016-08-22 02:34:32 +02:00
Jenkins for ownCloud
361667d248 [tx-robot] updated from transifex 2016-08-20 02:34:32 +02:00
Jenkins for ownCloud
27969e411d [tx-robot] updated from transifex 2016-08-19 02:34:32 +02:00
Jenkins for ownCloud
03181548c9 [tx-robot] updated from transifex 2016-08-17 02:34:31 +02:00
Jenkins for ownCloud
3b4a9e0892 [tx-robot] updated from transifex 2016-08-16 02:34:30 +02:00
Jenkins for ownCloud
1444523a72 [tx-robot] updated from transifex 2016-08-15 02:34:31 +02:00
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