|
|
30277d4fb3
|
net6: bugfix
|
2021-10-22 17:20:40 +03:00 |
|
|
|
e5e4a89e5b
|
Merge branch 'develop' into feature/net6
|
2021-10-22 16:10:37 +03:00 |
|
|
|
018c1939ab
|
replace type name with type
|
2021-10-22 13:08:09 +03:00 |
|
|
|
5eab8516f8
|
EF: removed unused class
|
2021-10-22 12:30:06 +03:00 |
|
|
|
36db823276
|
removed unused class
|
2021-10-22 11:54:45 +03:00 |
|
|
|
dd8f77f827
|
Merge branch 'develop' into feature/wizard/migration
|
2021-10-22 11:44:21 +03:00 |
|
|
|
e310d5e655
|
net6: httpClient: add using
|
2021-10-21 17:56:31 +03:00 |
|
|
|
f6f317ec42
|
net6: refactoring and bugfix
|
2021-10-21 16:23:26 +03:00 |
|
|
|
ed8487e99f
|
Webhook: format
|
2021-10-19 19:53:28 +03:00 |
|
|
|
5a5e299d98
|
Merge branch 'develop' into feature/webhooks
# Conflicts:
# ASC.Web.sln
# common/ASC.Api.Core/Core/BaseStartup.cs
# common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
|
2021-10-19 18:30:59 +03:00 |
|
|
|
9f12c95828
|
Merge branch 'feature/webhooks' of github.com:ONLYOFFICE/AppServer into feature/webhooks
|
2021-10-19 15:25:53 +03:00 |
|
|
|
4bd4954ad4
|
Merge branch 'release/1.0.0' into feature/desktop-login
|
2021-10-19 13:10:47 +03:00 |
|
|
|
9dd28a144d
|
Web: Fixed callback pages, added login callback for desktop client
|
2021-10-19 10:31:34 +03:00 |
|
|
|
fb7922f579
|
Thirdparty: login. Desktop
|
2021-10-15 11:34:34 +03:00 |
|
|
|
803a8f3baa
|
fixed bug 53156: removed constructor without HttpContextAccessor parameter.
|
2021-10-14 18:36:31 +03:00 |
|
|
|
a324b8b9b9
|
fixed bug 52923 for s3 storage
|
2021-10-13 16:23:54 +03:00 |
|
|
|
735a9b60cf
|
net6: warning CA1416
also remove unnecessary usings
|
2021-10-13 11:07:03 +03:00 |
|
|
|
66d126410c
|
Login: added desktop param
|
2021-10-13 10:25:19 +03:00 |
|
|
|
f5a25b80be
|
update migrations
|
2021-10-12 17:54:11 +03:00 |
|
|
|
0fb10454ca
|
refactor
|
2021-10-12 17:51:36 +03:00 |
|
|
|
24f658754f
|
refactor
|
2021-10-12 17:51:13 +03:00 |
|
|
|
4c972a48c2
|
changed last migration searching logic
|
2021-10-12 17:50:42 +03:00 |
|
|
|
9db8371344
|
add contexts search for all providers
|
2021-10-12 17:48:33 +03:00 |
|
|
|
1a7021d6c4
|
move to directories
|
2021-10-12 17:45:12 +03:00 |
|
|
|
a19dfef1ab
|
update postgresql migrations
|
2021-10-12 13:25:56 +03:00 |
|
|
|
55da5e7c54
|
add postgresql model configuring
|
2021-10-12 13:24:19 +03:00 |
|
|
|
1ddbb41052
|
rename Postgre to PostgreSql
|
2021-10-12 13:23:20 +03:00 |
|
|
|
ae9a3187bc
|
net6: warning SYSLIB0014
|
2021-10-12 13:14:33 +03:00 |
|
|
|
b483025437
|
add provider name property
|
2021-10-12 12:43:49 +03:00 |
|
|
|
9541b9e6b4
|
optimization migration
|
2021-10-12 12:04:24 +03:00 |
|
|
|
94c81d11d1
|
add generation migration name logic
|
2021-10-11 17:34:11 +03:00 |
|
|
|
494a201a0b
|
cosmetic changes
|
2021-10-11 17:25:25 +03:00 |
|
|
|
243a2cb55f
|
update migration
|
2021-10-11 17:24:15 +03:00 |
|
|
|
8b4d793d78
|
remove unnecessary HasData
|
2021-10-11 17:23:39 +03:00 |
|
|
|
0066585554
|
replace DateTime.Now to fixed DateTime
|
2021-10-11 17:23:02 +03:00 |
|
|
|
73624e0aed
|
add auto migration creator
|
2021-10-07 12:52:35 +03:00 |
|
|
|
8ced3a052a
|
change access modificator
|
2021-10-07 12:51:29 +03:00 |
|
|
|
040f3065c5
|
fix
|
2021-10-07 12:51:10 +03:00 |
|
|
|
6cc771bb87
|
fix
|
2021-10-07 12:50:57 +03:00 |
|
|
|
814fe65535
|
fix
|
2021-10-07 12:49:55 +03:00 |
|
|
|
05b2c63543
|
net6: warning SYSLIB0013
|
2021-10-07 12:05:32 +03:00 |
|
|
|
1ac44d3c92
|
net6: warning SYSLIB0021
|
2021-10-07 12:03:13 +03:00 |
|
|
|
7a380542aa
|
net6: warning SYSLIB0023
|
2021-10-07 12:00:26 +03:00 |
|
|
|
498a896322
|
fix Bug 50254
|
2021-10-05 22:28:07 +03:00 |
|
|
|
8409b10705
|
net6: warning SYSLIB0022
|
2021-10-01 13:34:47 +03:00 |
|
|
|
0f833ae1de
|
net6: warning SYSLIB0020
|
2021-10-01 13:26:36 +03:00 |
|
|
|
24224a7437
|
Files: fix rename folders. fix favorites
|
2021-09-30 21:26:01 +03:00 |
|
|
|
1bc64ce5ae
|
Files: check state before get stream
|
2021-09-30 09:51:38 +03:00 |
|
|
|
6c5d0d8940
|
add GetUserGroupRef
|
2021-09-28 20:32:22 +03:00 |
|
|
|
1c4d1efa83
|
fix
|
2021-09-28 20:30:02 +03:00 |
|
|
|
82cb6ddb6a
|
add scoped caching, remove unnecessary
|
2021-09-28 20:29:25 +03:00 |
|
|
|
2bd3a5764d
|
add method GetUserGroupRef, change return type
|
2021-09-28 20:26:16 +03:00 |
|
|
|
d27160cf98
|
Fix mobile app requests
|
2021-09-28 14:41:35 +03:00 |
|
|
|
511cea560b
|
add scoped caching
|
2021-09-27 19:59:09 +03:00 |
|
|
|
a0e39d0112
|
add ScopeCache
|
2021-09-27 19:54:01 +03:00 |
|
|
|
e755d2eda8
|
renamed providers to lowercase
|
2021-09-24 17:36:46 +03:00 |
|
|
|
90bb2ef44a
|
fixed bearer
|
2021-09-24 12:08:10 +03:00 |
|
|
|
315665e87a
|
BuildAndDeploy
|
2021-09-23 20:58:39 +03:00 |
|
|
|
f4feb48d2c
|
fix dependencies
|
2021-09-22 19:51:06 +03:00 |
|
|
|
d32f555706
|
ResManager: fix
|
2021-09-17 16:46:24 +03:00 |
|
diana-vahomskaya
|
a5e1609dac
|
two methods
|
2021-09-16 11:25:17 +03:00 |
|
|
|
ea4fa97838
|
Merge branch 'develop' into feature/wizard/migration
# Conflicts:
# ASC.Tests.sln
# common/ASC.Core.Common/EF/Model/Tenant/DbQuota.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Core/DbHelper.cs
# common/ASC.Data.Backup.Core/Storage/BackupRepository.cs
# common/Tests/ASC.Common.Tests/ASC.Common.Tests.csproj
# common/Tests/ASC.Core.Common.Tests/ASC.Core.Common.Tests.csproj
# common/Tests/ASC.Notify.Textile.Tests/ASC.Notify.Textile.Tests.csproj
|
2021-09-15 15:52:13 +03:00 |
|
|
|
ec66a65d38
|
User: fix request
|
2021-09-10 17:00:26 +03:00 |
|
|
|
2e20b4958d
|
fix CookieAuthHandler
|
2021-09-08 13:16:58 +03:00 |
|
|
|
51d905abc6
|
Cookie: logout after failed auth
|
2021-09-07 22:58:01 +03:00 |
|
|
|
5a5bb8fb25
|
Merge branch 'develop' into release/1.0.0
|
2021-09-05 22:59:31 +03:00 |
|
|
|
1e77063d32
|
fix Bug 51866
|
2021-09-05 22:59:14 +03:00 |
|
|
|
d099326e7f
|
Merge branch 'develop' into feature/backup.core
# Conflicts:
# common/services/ASC.Data.Backup/Program.cs
|
2021-09-05 12:50:05 +03:00 |
|
|
|
ec7fcd34b3
|
Merge branch 'develop' into release/1.0.0
|
2021-09-03 18:07:09 +03:00 |
|
|
|
9cb01be544
|
Elastic: removed unused isInit
|
2021-09-03 18:05:05 +03:00 |
|
|
|
d78195aa5a
|
Added notify
|
2021-09-03 18:04:06 +03:00 |
|
Vashchuk Nikita
|
3b4cb1dfc6
|
Added GlobalFilter, fix
|
2021-09-03 17:02:52 +03:00 |
|
|
|
0970b1b420
|
Merge branch 'develop' into release/1.0.0
|
2021-09-02 23:50:18 +03:00 |
|
|
|
211224ca1a
|
Storage: fix S3
|
2021-09-02 23:49:59 +03:00 |
|
|
|
c5b135afbe
|
backup.core: remove waste
|
2021-09-02 16:11:41 +03:00 |
|
|
|
8171563965
|
backup.core: move backup.core
|
2021-09-02 15:41:54 +03:00 |
|
|
|
fa204303f5
|
Merge branch 'develop' into release/1.0.0
|
2021-09-01 16:08:41 +03:00 |
|
|
|
d8654444c6
|
backup.core: fix
|
2021-08-31 16:59:32 +03:00 |
|
|
|
115d752582
|
backup.core: fix
|
2021-08-31 15:43:40 +03:00 |
|
|
|
a812971c07
|
Merge branch 'develop' into feature/backup.core
|
2021-08-31 13:55:47 +03:00 |
|
|
|
4b3cb1b4fb
|
backup.core: first version
|
2021-08-31 12:40:28 +03:00 |
|
|
|
f62209d88e
|
Merge branch 'develop' into feature/webhooks
|
2021-08-30 19:18:18 +03:00 |
|
|
|
a84bddad3c
|
fix
|
2021-08-30 19:17:57 +03:00 |
|
|
|
2addb81adf
|
Quota: Price2 removed
|
2021-08-30 18:19:20 +03:00 |
|
Vashchuk Nikita
|
5e6bd9ee5f
|
fix
|
2021-08-27 18:33:21 +03:00 |
|
Vashchuk Nikita
|
0521d8af09
|
fix
|
2021-08-27 17:50:49 +03:00 |
|
Vashchuk Nikita
|
d66600b6c7
|
fix
|
2021-08-27 10:50:52 +03:00 |
|
Vashchuk Nikita
|
e5b40b3d0c
|
fix ASC.Webhooks.Tests
|
2021-08-27 00:15:47 +03:00 |
|
Vashchuk Nikita
|
45d221a109
|
Split webhooks into service and core
|
2021-08-26 21:43:41 +03:00 |
|
|
|
dd9e5e9b5d
|
Merge branch 'develop' into feature/webhooks
|
2021-08-26 15:17:53 +03:00 |
|
|
|
14e8c59b17
|
Merge branch 'develop' into release/1.0.0
|
2021-08-25 21:17:41 +03:00 |
|
|
|
b791586252
|
net6
|
2021-08-25 18:26:13 +03:00 |
|
Vashchuk Nikita
|
c41361bdd8
|
fix
|
2021-08-24 11:08:58 +03:00 |
|
|
|
a0f5c4231f
|
fixed run via vs
|
2021-08-23 15:55:19 +03:00 |
|
Vashchuk Nikita
|
c851641b6c
|
Merge remote-tracking branch 'remotes/origin/feature/webhooks' into feature/webhooks
|
2021-08-23 13:01:48 +03:00 |
|
Vashchuk Nikita
|
9f0e41b880
|
Merge branch 'develop' into feature/webhooks
|
2021-08-23 12:36:01 +03:00 |
|
|
|
a471a19dfd
|
Merge branch 'develop' into release/1.0.0
|
2021-08-23 11:50:35 +03:00 |
|
|
|
610e31ec3b
|
fixed equals
|
2021-08-20 19:04:55 +03:00 |
|
|
|
e5faa90adb
|
removed nuget warnings
|
2021-08-20 16:53:27 +03:00 |
|
|
|
9207238d8d
|
Merge branch 'develop' into release/1.0.0
|
2021-08-20 16:12:40 +03:00 |
|
|
|
9f83801f88
|
Nlog: optimization
|
2021-08-20 15:42:43 +03:00 |
|
|
|
91fd7615b3
|
Optimization
|
2021-08-20 10:52:52 +03:00 |
|
Vashchuk Nikita
|
3dc5ca5afc
|
Merge branch 'develop' into feature/webhooks
|
2021-08-19 15:58:57 +03:00 |
|
|
|
0745110a44
|
Test: fix
|
2021-08-19 15:58:25 +03:00 |
|
Vashchuk Nikita
|
66be58c759
|
fix
|
2021-08-19 15:56:14 +03:00 |
|
Vashchuk Nikita
|
e1c648e06a
|
Merge branch 'develop' into feature/webhooks
|
2021-08-19 13:49:16 +03:00 |
|
Vashchuk Nikita
|
5e72bcc224
|
fix
|
2021-08-19 13:17:54 +03:00 |
|
Vashchuk Nikita
|
2859d05ce3
|
fix
|
2021-08-19 12:25:43 +03:00 |
|
Vashchuk Nikita
|
7d4b22ca83
|
added tests, migrations
|
2021-08-19 12:11:26 +03:00 |
|
|
|
cf87addaa3
|
Security: added new method
|
2021-08-18 17:04:16 +03:00 |
|
diana-vahomskaya
|
945739fe44
|
fix test ASC.Web.Api.Tests
|
2021-08-16 15:20:41 +03:00 |
|
|
|
9f5c732501
|
Merge branch 'develop' into release/1.0.0
|
2021-08-16 11:08:09 +03:00 |
|
|
|
5bf9bfae27
|
Files: optimization
|
2021-08-13 18:59:17 +03:00 |
|
|
|
b23fe977cb
|
Kafka: fix
|
2021-08-13 17:05:11 +03:00 |
|
|
|
86248a3ad1
|
Kafka: fix create topic
|
2021-08-13 11:09:01 +03:00 |
|
diana-vahomskaya
|
5e22019a28
|
fix context delete models: dbtenant, dbtariff from BackupsContext
|
2021-08-12 18:18:01 +03:00 |
|
|
|
560b622a29
|
Merge branch 'develop' into release/1.0.0
|
2021-08-12 15:06:16 +03:00 |
|
|
|
9aafaa21ea
|
Merge pull request #319 from ONLYOFFICE/feature/log
Feature/log
|
2021-08-12 15:00:53 +03:00 |
|
|
|
163e73ef4a
|
Personal: optimization
|
2021-08-12 14:00:05 +03:00 |
|
|
|
87b7e171de
|
ApiSystem: fix
|
2021-08-11 21:32:43 +03:00 |
|
|
|
fff54bd9dc
|
Kafka: create before assign
|
2021-08-11 21:15:37 +03:00 |
|
|
|
e92c41d919
|
Merge branch 'develop' into release/1.0.0
|
2021-08-10 18:55:25 +03:00 |
|
|
|
1d4cabe5b9
|
MessagesRepository: optimization
|
2021-08-10 17:57:20 +03:00 |
|
|
|
57493d1018
|
Logger: singletone
|
2021-08-10 17:56:59 +03:00 |
|
|
|
643b7b66dc
|
Optimization: removed autofac ILifetimeScope
|
2021-08-10 17:56:38 +03:00 |
|
|
|
39f77c5352
|
Backup: fix
|
2021-08-10 11:36:07 +03:00 |
|
|
|
af18e175dc
|
Merge branch 'develop' into release/1.0.0
|
2021-08-10 11:13:17 +03:00 |
|
|
|
546c1872a3
|
Added asp logging
|
2021-08-08 16:19:54 +03:00 |
|
|
|
16469eb138
|
Api: added ConfigureNLogLogging
|
2021-08-08 15:56:54 +03:00 |
|
|
|
672de09a90
|
NLog: up to 4.7.10
|
2021-08-08 15:55:27 +03:00 |
|
|
|
44847c1e8f
|
backend: change TargetFramework from netstandard2.1 to net5.0
|
2021-08-06 18:37:22 +03:00 |
|
|
|
90bb8a139a
|
UserManager: fix for personal
|
2021-08-06 17:30:51 +03:00 |
|
|
|
5687e6bca2
|
Merge branch 'develop' into release/1.0.0
|
2021-08-05 19:11:02 +03:00 |
|
diana-vahomskaya
|
fee6900f19
|
update migrations ASC.Web.Api.Tests
|
2021-08-04 14:23:21 +03:00 |
|
|
|
e86124cbdd
|
Elastic: fixed search by content
|
2021-08-04 13:08:12 +03:00 |
|
diana-vahomskaya
|
eaa449db1f
|
Updated migrations for ASC.Core.Common
|
2021-08-04 00:41:33 +03:00 |
|
Vashchuk Nikita
|
b70c2e6f09
|
fix
|
2021-08-03 19:26:28 +03:00 |
|
diana-vahomskaya
|
af84cd6532
|
fix Context
|
2021-08-03 17:11:53 +03:00 |
|
|
|
c2bd00506c
|
fix Bug 51447
|
2021-08-03 17:05:49 +03:00 |
|
diana-vahomskaya
|
bcfddd88d7
|
fix context
|
2021-08-02 17:49:36 +03:00 |
|
|
|
a0b34c5cc9
|
Webhook: fix
|
2021-07-31 20:12:41 +03:00 |
|
Vashchuk Nikita
|
3c8fadc28d
|
modified WebhooksMiddleware
|
2021-07-29 15:39:22 +03:00 |
|
Vashchuk Nikita
|
e3d5aa50e7
|
fix
|
2021-07-29 14:04:42 +03:00 |
|
Vashchuk Nikita
|
b913cdc813
|
Added WebhooksIdentifier.cs
|
2021-07-28 18:16:56 +03:00 |
|
Vashchuk Nikita
|
afdd1ab982
|
Added CustomMiddleware(WebhooksMiddleware.cs)
|
2021-07-28 13:10:14 +03:00 |
|
diana-vahomskaya
|
34c4161f08
|
Update migrations, fix Context with repetitive Models
|
2021-07-27 19:26:56 +03:00 |
|
diana-vahomskaya
|
3131c27d26
|
Merge remote-tracking branch 'remotes/origin/feature/wizard/migration' into develop
|
2021-07-27 17:39:29 +03:00 |
|
|
|
6fbdaf0d31
|
Calendar: post-merge fixes
|
2021-07-27 16:09:30 +03:00 |
|
|
|
f1668a3b43
|
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
|
2021-07-27 12:43:01 +03:00 |
|
Vashchuk Nikita
|
81299cc766
|
fix
|
2021-07-26 20:07:00 +03:00 |
|
Vashchuk Nikita
|
8a51dee296
|
modified DbWorker(Lazy), Sender. Added BuildQueueService and WorkerService.cs.
|
2021-07-26 20:03:55 +03:00 |
|
diana-vahomskaya
|
7f763cb7ff
|
fix test library from Newtonsoft.Json to System.Text.Json. Added new object to serialization
|
2021-07-25 22:14:30 +03:00 |
|
|
|
d821f9a2af
|
TimeZone: fix
|
2021-07-22 22:40:37 +03:00 |
|
|
|
913c67a818
|
Elastic: fixed create scope
|
2021-07-22 12:11:39 +03:00 |
|
|
|
8c78fa4a17
|
Feed: fix TenantManager
|
2021-07-22 11:56:52 +03:00 |
|
diana-vahomskaya
|
8be7427764
|
added test to webstudioDbContext Data = Completed:false
|
2021-07-22 01:38:31 +03:00 |
|
diana-vahomskaya
|
17a0a6bb9d
|
fix test for wizard
|
2021-07-21 15:44:20 +03:00 |
|
diana-vahomskaya
|
e1c9c17ecb
|
fix BaseApiTests
|
2021-07-20 13:35:19 +03:00 |
|
diana-vahomskaya
|
0785140ca5
|
fix tests
|
2021-07-20 13:24:19 +03:00 |
|
diana-vahomskaya
|
81d8324afb
|
ASC.Web.Api Tests added
|
2021-07-19 15:12:40 +03:00 |
|
|
|
1268a436ca
|
Startup: fix load products
|
2021-07-16 11:56:14 +03:00 |
|
|
|
d88741962c
|
EF: optimize server version check
|
2021-07-16 11:48:30 +03:00 |
|
Vashchuk Nikita
|
faabf5aae7
|
Updated Publisher, BackgroundService(integration kafka)
|
2021-07-15 18:45:17 +03:00 |
|
|
|
2d75554b0d
|
DbContext: optimization
|
2021-07-15 13:07:47 +03:00 |
|
|
|
b184ad7898
|
Log: fix configuring
|
2021-07-14 11:00:59 +03:00 |
|
|
|
ad57feecd8
|
Log: fix configuring
|
2021-07-13 21:17:18 +03:00 |
|
|
|
8388a4e306
|
Merge branch 'develop' into feature/personal
|
2021-07-12 10:56:30 +03:00 |
|
|
|
7e6e25274f
|
Api: fix confirm
|
2021-07-10 20:27:15 +03:00 |
|
Vashchuk Nikita
|
2dcf6b8225
|
Added WebhookHostedService, modified Publisher and Sender
|
2021-07-08 20:32:59 +03:00 |
|
diana-vahomskaya
|
e02e833d31
|
fixed data to open wizard if magration true
|
2021-07-07 17:29:27 +03:00 |
|
|
|
a31dc583c1
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
|
2021-07-02 16:26:45 +03:00 |
|
|
|
b6b1c72769
|
core: added new ThenBy linq extension. crm: fixed sql
|
2021-06-30 19:08:41 +03:00 |
|
Vashchuk Nikita
|
5305ad1018
|
Added models, DbWorker, publisher, sender.
|
2021-06-29 11:40:20 +03:00 |
|
|
|
fbcdba3b17
|
Merge branch 'develop' into feature/personal
|
2021-06-25 11:10:49 +03:00 |
|
|
|
37a676cb5a
|
Tenant: removed Public, PublicVisibleProducts
|
2021-06-24 15:55:12 +03:00 |
|
|
|
a23b23de3c
|
Startup: added ability to skip load products and consumers
|
2021-06-24 11:15:20 +03:00 |
|
|
|
d41f81e1cd
|
Merge branch 'develop' into feature/remove_binary_formatter
|
2021-06-23 20:27:10 +03:00 |
|
|
|
d59f9a2aa2
|
fixed urls
|
2021-06-23 20:12:50 +03:00 |
|
|
|
0e6078f9e2
|
Merge branch 'develop' into feature/ClearEvents
# Conflicts:
# ASC.Web.sln
|
2021-06-23 17:15:56 +03:00 |
|
|
|
20d1f9a738
|
merge from develop
|
2021-06-23 16:10:46 +03:00 |
|
|
|
85574630cb
|
Merge branch 'develop' into feature/ClearEvents
|
2021-06-23 15:30:55 +03:00 |
|
|
|
c18adc50dc
|
ClearEvents: fixed log and launch
|
2021-06-23 15:25:17 +03:00 |
|
|
|
7fc9a35b49
|
Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1
|
2021-06-23 14:37:03 +03:00 |
|
|
|
3788bab48e
|
HealthCheck: fix Studio
|
2021-06-22 19:55:47 +03:00 |
|
|
|
d8abde6d88
|
SSoAuth: fix buid and run
|
2021-06-22 19:44:09 +03:00 |
|
|
|
912501a2f4
|
Healthcheck: fix apisystem
|
2021-06-22 19:09:24 +03:00 |
|
|
|
4a4cab5352
|
Files: FileHelper decorator
|
2021-06-18 23:31:46 +03:00 |
|
|
|
00cc15fbf5
|
Merge branch 'develop' into feature/ClearEvents
|
2021-06-18 12:21:54 +03:00 |
|
|
|
d0b813cc71
|
update packages
|
2021-06-18 12:11:25 +03:00 |
|
|
|
d3113fdc2e
|
Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1
|
2021-06-18 11:32:55 +03:00 |
|
|
|
3d3a8a2d6a
|
Merge branch 'develop' into feature/remove_binary_formatter
|
2021-06-18 10:49:07 +03:00 |
|
|
|
6118e95028
|
Merge branch 'develop' into feature/personal
|
2021-06-17 14:25:09 +03:00 |
|
|
|
8fc9bef6c6
|
Core: fix cache
|
2021-06-16 22:25:02 +03:00 |
|
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
|
|
53ee0ef484
|
fixed warnings
|
2021-06-16 18:00:27 +03:00 |
|
|
|
e314f6ff1c
|
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
|
2021-06-16 17:02:46 +03:00 |
|
|
|
5fcbdbd7dd
|
added health checks
|
2021-06-16 16:54:36 +03:00 |
|
|
|
73547f421e
|
Common: install newtonsoft
|
2021-06-15 16:44:53 +03:00 |
|
|
|
65378cc089
|
Merge branch 'develop' into feature/personal
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
|
2021-06-15 11:49:39 +03:00 |
|
|
|
a66e3afa92
|
Web: Tests: Commented "Save empty 'EN' keys to not found files"
|
2021-06-11 18:18:38 +03:00 |
|
