Commit Graph

10666 Commits

Author SHA1 Message Date
c528b83dd2 Files: refactor 2022-12-26 12:32:08 +03:00
846aa53583 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-26 12:19:54 +03:00
1ae54147ce Files: added warning message, added demotion on invitation 2022-12-26 12:19:37 +03:00
59fc0dd457 fix bug 60245 2022-12-25 19:22:14 +03:00
9f8ad6fb2a fix bug 60225 2022-12-25 19:05:03 +03:00
00b32e638a fix Bug 60214 2022-12-23 21:00:05 +03:00
d0fe06052e Db: optimization 2022-12-21 15:57:32 +03:00
a12ea359d6 Merge branch 'feature/advanced-security' of https://github.com/ONLYOFFICE/DocSpace into feature/advanced-security 2022-12-16 15:07:40 +03:00
b0f25d1f58 Merge branch 'release/rc-v1.2.0' into feature/advanced-security 2022-12-16 15:07:32 +03:00
6b7f1b313d Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/DocSpace into feature/advanced-security 2022-12-16 15:02:14 +03:00
50b1cd34c8 Files: fixed archiving/deleting room with locked files 2022-12-16 15:02:06 +03:00
d0b03e170b Files: fix 2022-12-16 13:24:05 +03:00
496d7d2d48 Files: added logging 2022-12-16 11:45:39 +03:00
cfc81fc626 Merge branch 'feature/advanced-security' of github.com:ONLYOFFICE/DocSpace into feature/advanced-security 2022-12-16 11:42:36 +03:00
e12637ddb3 Files: fixed getting lock tag, removed unnecessary 2022-12-16 11:42:22 +03:00
5566298dca Files: removed CanWebRestrictedEditing, CanFillForms, CanEdit
added Accessability:convert
2022-12-15 20:54:35 +03:00
fd00fb18bb Files: removed unnecessary 2022-12-15 17:18:23 +03:00
37b2a9aafd Files: changed logic 2022-12-15 17:17:58 +03:00
8b009551fb Files: added HasLogo 2022-12-15 17:15:18 +03:00
0cf0ffbadb Merge branch 'release/rc-v1.2.0' into feature/advanced-security 2022-12-15 15:18:06 +03:00
5abfaf135f Files: changed check 2022-12-15 10:31:37 +03:00
3c998f637a Files: removed unnecessary 2022-12-15 10:30:38 +03:00
40a2bc3ead Files: added edit access parametr to share 2022-12-14 15:48:55 +03:00
6c112da511 Core: fixed user status change 2022-12-14 14:38:40 +03:00
51bfb4d7cb Files: added read access action 2022-12-14 14:20:47 +03:00
3a69c17856 Files: fixed security 2022-12-14 12:08:59 +03:00
498983e14a Files: fixed editing history for editor role 2022-12-14 11:49:39 +03:00
effed62662 People: fixed user status change 2022-12-13 22:59:52 +03:00
ec2d02e018 Files: added duplicate action, fixed lock for my documents folder 2022-12-13 22:34:53 +03:00
fb32a9f4f6 Merge branch 'release/rc-v1.2.0' into feature/advanced-security 2022-12-13 11:53:59 +03:00
9625b10077 Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-12 19:58:43 +03:00
c36ba1584a fixed upload room logo to s3 2022-12-12 19:58:21 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
be698591d2 Merge branch 'develop' into bugfix/room-logo 2022-12-12 18:07:59 +03:00
965867e3f5 Merge branch 'develop' into feature/fix-whitelable 2022-12-12 17:22:03 +03:00
7f6d9f7b0e Files: fixed messages creating from collection 2022-12-12 12:59:36 +03:00
3ead7898d1 Files: fixed getting headers 2022-12-12 12:59:04 +03:00
9b21875892 Merge branch 'develop' into feature/advanced-security 2022-12-12 11:01:23 +03:00
dc8ec5a963 Files: fix 2022-12-12 10:57:26 +03:00
a4b5726d99 Files: fix 2022-12-12 10:17:20 +03:00
528865128e Files: fix, refactor 2022-12-12 02:45:29 +03:00
facee47ca2 Files: optimization 2022-12-12 02:01:22 +03:00
17d8488217 Files: refactor 2022-12-12 00:54:13 +03:00
def75f8e6f Files: updated the rights 2022-12-11 23:34:18 +03:00
d58fe4fabe Files: fixed security 2022-12-11 21:28:36 +03:00
60688e791f Files: fix 2022-12-11 21:22:17 +03:00
5a4e2020c4 Files: added processing to get room logo path 2022-12-09 21:17:31 +03:00
2678cec591 Files: changed getting room logo logic 2022-12-09 21:16:30 +03:00
d6226ca7f6 Files: added new param const 2022-12-09 21:15:14 +03:00
143a4d01ec removed unused variables 2022-12-09 17:47:46 +03:00