Commit Graph

2988 Commits

Author SHA1 Message Date
aa447f3384 fix key 2022-12-23 13:27:49 +03:00
ceebd5b47d refactoring 2022-12-22 18:48:05 +03:00
575784dd01 fix migration 2022-12-22 18:17:21 +03:00
9ed6dff1be remove waste 2022-12-22 18:17:10 +03:00
62cec7b7c5 Merge branch 'release/rc-v1.2.0' into feature/asc.apicache 2022-12-22 14:17:24 +03:00
82392b601d Merge branch 'release/rc-v1.2.0' of github.com:ONLYOFFICE/DocSpace into release/rc-v1.2.0 2022-12-21 21:22:19 +03:00
6496ff3576 Log: disable cloudwatch logging when awsAccessKeyId not specified 2022-12-21 21:22:04 +03:00
724345a2b7 fixed validate link restore password 2022-12-21 20:12:43 +03:00
84aec69091 fix backup files_thirdparty_account 2022-12-21 18:34:23 +03:00
d0fe06052e Db: optimization 2022-12-21 15:57:32 +03:00
995d78ecd6 Merge branch 'release/rc-v1.2.0' into feature/asc.apicache 2022-12-21 12:39:28 +03:00
a1daacb4d0 fix 2022-12-21 12:38:47 +03:00
d4aaa4afaf fix Bug 60194 - Settings: Restore. When trying to restore the docspace portal crashes with multiple errors in the console 2022-12-21 12:19:47 +03:00
a764ceef1a fix Bug 60191 - Settings: Backup. Does not create a backup file in temporary storage 2022-12-20 13:58:16 +03:00
045d61c0bf add bat for asc.apicache 2022-12-20 13:04:21 +03:00
40ea7aefeb Merge branch 'release/rc-v1.2.0' into feature/asc.apicache 2022-12-20 12:47:44 +03:00
14d07500b2 fix 2022-12-20 12:34:39 +03:00
d31e341ff9 add async and AddBaseDbContext with settings 2022-12-20 10:27:55 +03:00
d1c436ea11 add migration to Teamlabsite 2022-12-19 18:01:57 +03:00
56c9ffcd21 Api.Core: added option for default logo 2022-12-19 11:54:32 +03:00
0b6ba47863 refactoring 2022-12-16 15:56:03 +03:00
db951d00e6 asc.apicache 2022-12-16 15:41:09 +03:00
6c112da511 Core: fixed user status change 2022-12-14 14:38:40 +03:00
cd684de7cc Core: fixed permissions checking 2022-12-13 14:11:37 +03:00
426a11d080 Merge branch 'develop' into release/rc-v1.2.0 2022-12-12 19:33:41 +03:00
965867e3f5 Merge branch 'develop' into feature/fix-whitelable 2022-12-12 17:22:03 +03:00
ffde2bf1c2 s3: fixed presigned url 2022-12-09 23:46:08 +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
e8e75dfa8a
Merge pull request #1110 from ONLYOFFICE/fix/tests
Fix/tests
2022-12-09 13:16:21 +03:00
153c68b3bd Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 13:05:08 +03:00
ddd791096d Feed.Aggregator: changed socket client resolving 2022-12-09 12:38:02 +03:00
8d1393ba8e Core: changed singleton to scope 2022-12-09 12:23:26 +03:00
966364da9e Merge branch 'develop' into release/rc-v1.2.0 2022-12-09 12:14:48 +03:00
5e630feb68 Merge branch 'develop' into fix/tests 2022-12-08 19:46:44 +03:00
4fa41aa273 fixed updating ownerId 2022-12-08 18:50:50 +03:00
cd0de88e6c Core.Common: fix getting user groups 2022-12-08 14:55:05 +03:00
4affc5f58f Merge branch 'develop' into release/rc-v1.2.0 2022-12-07 18:50:14 +03:00
ce773b76bd rename appsettings in migration.sln 2022-12-07 17:28:40 +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
de46ba5203 fix test GlobalFilter 2022-12-07 14:25:45 +03:00
0e6d5405d2 fix web.api tests 2022-12-07 13:38:35 +03:00
7afc44abda fix webhooks tests 2022-12-07 13:38:35 +03:00
2ca007eb81 ApiSystem: cors 2022-12-07 12:34:14 +03:00
61f7765a4f Merge branch 'develop' into feature/api-origin 2022-12-06 21:47:56 +03:00
Viktor Fomin
15ff7aa19d Merge branch 'develop' into feature/fix-whitelable 2022-12-06 16:50:55 +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
346c8d08e3 Core.Common: changed permissions validation logic 2022-12-06 01:57:45 +03:00