Commit Graph

10707 Commits

Author SHA1 Message Date
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
6e45bc5aa8 removed unused variables 2022-12-09 16:34:00 +03:00
7e52c309c1 Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 15:13:43 +03:00
796092812b Files: refactor 2022-12-09 13:30:25 +03:00
e8e75dfa8a
Merge pull request #1110 from ONLYOFFICE/fix/tests
Fix/tests
2022-12-09 13:16:21 +03:00
00709ad59d Merge branch 'develop' into feature/advanced-security 2022-12-09 13:12:47 +03:00
153c68b3bd Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 13:05:08 +03:00
eb697afd4f Files: return 2022-12-09 12:57:35 +03:00
5f8f9dc29e Files: removed unnecessary 2022-12-09 12:41:59 +03:00
ddae93c516 Files.Service: added new using 2022-12-09 12:39:44 +03:00
9f7c856e1c Files.Service: register new service 2022-12-09 12:39:35 +03:00
36181065e2 Files: removed unnecessary 2022-12-09 12:22:50 +03:00
966364da9e Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 12:14:48 +03:00
d557f7585c Files: fix tenant resolving 2022-12-09 11:27:43 +03:00
078e59815d Files: return first check 2022-12-08 19:55:34 +03:00
5e630feb68 Merge branch 'develop' into fix/tests 2022-12-08 19:46:44 +03:00
605a4dd0e7 Merge branch 'develop' into feature/advanced-security 2022-12-08 17:32:46 +03:00
ef97d0c4d0 Files: fix access in file dto 2022-12-08 15:16:30 +03:00
7ae8cbc5a6 Files: added additional parameter for link 2022-12-08 14:57:36 +03:00
33de49463a People: fix permissions checking 2022-12-08 14:56:05 +03:00
6b2b7cbf0c Files: fix duplicating tags 2022-12-08 13:46:50 +03:00
9b0082b23f Files: added deleting unused tags 2022-12-08 13:46:37 +03:00
8dac43b756 Files: removed products/files/httphandlers 2022-12-08 13:24:57 +03:00
6aaa58c237 Files: fix tag new 2022-12-08 13:10:37 +03:00
ac1c2beb20 Files: added deleting pin after archiving 2022-12-08 11:27:02 +03:00
f120d8240f Files: fix 2022-12-07 20:20:41 +03:00
6646076cd2 Files: fix 2022-12-07 19:04:53 +03:00
4affc5f58f Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 18:50:14 +03:00
9c326052c8 Files: refactoring, removed unnecessary 2022-12-07 16:41:56 +03:00
04a092782c Files: new tag for folder 2022-12-07 16:36:58 +03:00
a03b50bd7c Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 16:20:29 +03:00
ea1f2ba1b7 Merge branch 'develop' into feature/socket-newtag 2022-12-07 16:16:59 +03:00
554c404b03 remove waste 2022-12-07 13:53:05 +03:00
0f3cbd3ecd Files: removed unnecessary 2022-12-07 13:50:13 +03:00
c24349bad7 Files: removed unnecessary 2022-12-07 13:44:44 +03:00
7af896c925 Files: refactor 2022-12-07 13:44:24 +03:00
8236c38af5 remove waste 2022-12-07 13:38:35 +03:00
8f7a657671 fix files tests 2022-12-07 13:38:35 +03:00
56ca88641d Files: removed reading history from thirdparty files 2022-12-07 12:33:36 +03:00
e0f253ec0a Files: removed unnecessary 2022-12-07 12:20:30 +03:00
4951dd79ff Files: added checks 2022-12-07 11:58:11 +03:00
824dbc57d0 Files: added archiving/unarchiving action 2022-12-07 11:55:56 +03:00
721f50e95d Files: fix new tag 2022-12-07 10:53:45 +03:00
b7a3819d91 Files: added sharing security 2022-12-07 02:18:14 +03:00
0451b6ce92 Files: added rules for pinning a room 2022-12-07 01:11:10 +03:00
ccf252148c Files: fix actions in root folders, refactoring 2022-12-06 23:52:49 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
bf7fe0790f Files: fix security, removed unnecessary 2022-12-06 19:16:57 +03:00
7d0cc5a396
Merge pull request #1099 from ONLYOFFICE/bugfix/room-admin-permissions
Bugfix/room admin permissions
2022-12-06 15:22:47 +03:00
837cee5b8f People: changed permissions validation logic 2022-12-06 01:57:55 +03:00
00e9ce2fb1 Security: refactoring 2022-12-05 18:35:25 +03:00
094e8d41ff Merge branch 'develop' into feature/room-admin-permissions 2022-12-05 11:15:15 +03:00
6cf303a1d4 Files: copyTo, copyFrom rights 2022-12-02 16:48:00 +03:00
580c6688a3 Files: fix delete and readHistory for archive, added changeHistory 2022-12-02 15:02:42 +03:00
fa43e3deaf Files: fix model 2022-11-30 22:55:24 +03:00
2b7ece7553 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/AppServer into release/rc-v1.2.0 2022-11-30 18:41:02 +03:00
eee9c05d9a ASC.Web.Core: Notify: fix email templates 2022-11-30 18:40:01 +03:00
fbfd9daa46 Merge branch 'develop' into feature/socket-newtag 2022-11-30 18:37:34 +03:00
Viktor Fomin
8f97413d1d Merge branch 'develop' into feature/fix-whitelable 2022-11-30 12:33:31 +03:00
a919c6ee48 Files: new security fields 2022-11-30 12:29:46 +03:00