Commit Graph

7866 Commits

Author SHA1 Message Date
mushka
0a2318ea59 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-05 20:53:35 +03:00
cf88dc8243 Files: changed to get room information 2022-09-05 14:27:24 +03:00
mushka
84a47113b0 Merge branch 'develop' into feature/doc-space-info-panel 2022-09-05 13:44:33 +03:00
844cc0338c Files: fix files counter 2022-09-05 13:41:11 +03:00
45339de198 Files: added gettting shares for rooms 2022-09-05 13:12:40 +03:00
16722854df Files: canshare =false for files in personal room in docspace 2022-09-02 10:44:37 +03:00
7895a214c9
Merge pull request #780 from ONLYOFFICE/feature/private-virtual-rooms
Feature/private virtual rooms
2022-09-01 19:34:12 +04:00
mushka
a1db010869 Merge branch 'develop' into feature/doc-space-info-panel 2022-08-30 14:06:55 +03:00
da7bea6736 Files: refactor 2022-08-30 13:01:27 +03:00
4092c567b6 Files: fix 2022-08-30 12:59:39 +03:00
13a1da0b04 Files: added private 2022-08-30 12:59:20 +03:00
605aee5529 Merge branch 'develop' into feature/security-history-audit 2022-08-30 11:55:19 +05:00
08832f005c Files: refactor 2022-08-29 22:10:27 +03:00
3db342ffec Merge branch 'develop' into feature/private-virtual-rooms 2022-08-29 17:39:57 +03:00
mushka
18b56dbc3e Merge branch 'develop' into feature/create-room 2022-08-29 12:36:47 +03:00
16c7d80398 Files: fix root files 2022-08-29 11:57:48 +03:00
e3e47364e0 Merge branch 'develop' into feature/security-history-audit 2022-08-29 13:36:09 +05:00
a8972c7cba Files: fix rooms sorting 2022-08-29 10:47:54 +03:00
d11e228792 Merge branch 'develop' into bugfix/sharpbox 2022-08-29 10:27:50 +03:00
mushka
56c2cd64c5 Merge branch 'develop' into feature/create-room 2022-08-26 19:28:06 +03:00
4797576a0c Files: fix open in editor 2022-08-26 13:54:22 +03:00
b4a5fb253f Files: fix rename for SharpBox, SharePoint providers 2022-08-26 13:08:03 +03:00
1be967fe3f Files: added id conversion in base64 string 2022-08-26 13:07:27 +03:00
mushka
50eb4cf072 Merge branch 'develop' into feature/doc-space-info-panel 2022-08-25 21:38:52 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
mushka
64f899fbbf Merge branch 'develop' into feature/create-room 2022-08-25 15:36:52 +03:00
0c596956f6 Merge branch 'develop' into feautre/private-virtual-rooms 2022-08-25 15:30:11 +03:00
4dcd9be041 fix: removed IOptionsSnapshot 2022-08-25 13:29:08 +03:00
9b22d27306 Files: added keys check 2022-08-25 11:55:54 +03:00
1b158e1e5e Merge branch 'develop' into feature/push 2022-08-25 11:22:07 +03:00
ca8b4f9b54 Merge branch 'develop' into feature/private-virtual-rooms 2022-08-25 10:36:39 +03:00
6ee5cdb0c3 Merge branch 'develop' into feature/room-filter 2022-08-25 10:23:24 +03:00
e2472b392e Files: fix doceditor link 2022-08-24 20:27:20 +03:00
cce276ed20 Files: fix 2022-08-24 18:07:36 +03:00
ccea188dd4 Merge branch 'develop' into feature/create-room 2022-08-24 17:55:37 +03:00
7f4838901a fix after merge 2022-08-24 17:30:06 +03:00
0daea49132 Merge branch 'develop' into feature/private-virtual-rooms 2022-08-24 17:12:13 +03:00
00e580438f Files: fix rename room 2022-08-24 16:13:20 +03:00
3d706635f5 Files: fix rename room 2022-08-24 16:09:43 +03:00
6d3a6cb58e Merge branch 'develop' into feature/create-room 2022-08-23 18:06:58 +03:00
0e9099017a
Merge branch 'develop' into bugfix/room-logo 2022-08-23 18:05:14 +03:00
58b48df3ab Files: added folders only filter for rooms 2022-08-23 17:22:50 +03:00
b633dcb4e6 update DocStore 2022-08-23 17:19:21 +03:00
718d87c7d6 Files: forms. remove caching 2022-08-23 17:16:15 +03:00
34232bc735 Files: removed oformservice 2022-08-23 16:34:54 +03:00
e7fa60d13c Merge branch 'develop' into feature/push 2022-08-23 15:32:06 +03:00
53ee8e9e15 Files: fix security 2022-08-23 15:18:37 +03:00
4c923b5117 Files: fix access 2022-08-23 14:54:51 +03:00
4278dbbf13 Merge branch 'develop' into feature/create-room 2022-08-23 14:23:45 +03:00
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00