Commit Graph

892 Commits

Author SHA1 Message Date
df96629834 Core: fixed user cache 2022-08-31 21:06:26 +03:00
ff8e3c38e9 removed unnecessary 2022-08-25 13:54:11 +03:00
9523560b16 Push: fix api 2022-08-24 14:26:45 +03:00
ae49029f91 Push: fix api 2022-08-24 13:21:18 +03:00
ed41675476 Firebase: optimization 2022-08-24 12:34:30 +03:00
5967f4db97 Merge branch 'feature/push' of https://github.com/ONLYOFFICE/DocSpace into feature/push 2022-08-24 00:11:05 +03:00
d282aa74f7 Push: fixed message sending function 2022-08-24 00:10:37 +03:00
8f248f6ac2 Push: fix 2022-08-23 23:35:26 +03:00
632d7fbc41 Firebase: model 2022-08-23 20:03:02 +03:00
1ae7d3b11d Api: push controller. Removed projects 2022-08-23 18:03:00 +03:00
26d493f498 Push: fix 2022-08-23 14:28:42 +03:00
20dcd59616 Merge branch 'develop' into feature/push 2022-08-23 13:24:36 +03:00
971d4960c1 Push: fix 2022-08-23 13:23:00 +03:00
7f38657ce6 Push: global usings 2022-08-23 13:10:37 +03:00
c8e4ea7cec Push: Newtonsoft.Json -> System.Text.Json 2022-08-23 12:05:09 +03:00
1c7d7fee77 Push: fix 2022-08-23 10:42:49 +03:00
b761071b7e Merge branch 'develop' into feature/webhook-fix 2022-08-22 14:15:14 +03:00
585a9f8d00 Webhooks: fix 2022-08-18 22:06:51 +03:00
5b8374daa0 refactoring 2022-08-18 19:00:22 +03:00
ce5009d0c6 Push: fixes 2022-08-15 14:27:54 +03:00
46caff0b0c Push: post merge fixes 2022-08-15 01:00:11 +03:00
020fa7dcda Merge branch 'develop' into feature/push 2022-08-11 17:15:37 +03:00
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
9df9195cff suppress warning 2022-08-01 13:41:33 +03:00
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
9d69882cf3 removed BaseDbContext 2022-07-29 15:53:29 +03:00
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
997e20898a EF: added support of dbcotextpool 2022-07-27 20:12:08 +03:00
141257d3fc Postgre: fix 2022-07-25 14:26:58 +03:00
8ba9be1208 deleted commonfilesdbcontext 2022-07-25 14:14:03 +03:00
57f797ab24 Merge branch 'develop' into feature/migrations-fix 2022-07-25 12:59:19 +03:00
61ec4a18da migrations moved to external projects 2022-07-24 16:02:00 +03:00
Vashchuk Nikita
db9eaa3b08 fix 2022-07-22 23:09:16 +03:00
Vashchuk Nikita
b336eafa37 Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
2022-07-22 22:40:58 +03:00
Vashchuk Nikita
94ca41011b recreate migrations 2022-07-22 22:34:48 +03:00
Vashchuk Nikita
76cfe882a9 fix contexts 2022-07-22 22:33:19 +03:00
Vashchuk Nikita
8a1a8b809f fix contexts 2022-07-22 22:31:42 +03:00
a5f4435b17 fix notify 2022-07-20 22:06:33 +03:00
2c98ad88d8 fix 2022-07-20 19:25:59 +03:00
b98524532f Merge branch 'develop' into feature/migrations-fix
# Conflicts:
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
2022-07-19 16:04:29 +03:00
a2037eb91d fix build 2022-07-18 18:30:08 +03:00
d94904b6af removed voip 2022-07-18 12:24:12 +03:00
d8980cc3a7 fix 57917 2022-07-14 20:00:43 +03:00
Vashchuk Nikita
6507c4b999 Merge branch 'develop' into feature/migrations-fix
# Conflicts:
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	web/ASC.Web.Core/GlobalUsings.cs
2022-07-14 11:56:07 +03:00
595cfcc2d2 fixed loginevent 2022-07-13 15:15:13 +03:00
ed7ef58b53 Api: fixed loginevent 2022-07-13 14:21:25 +03:00
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +03:00
fd986320f2 Api: fixed maildomainsettings 2022-07-12 11:47:05 +03:00
Vashchuk Nikita
5cfb69ae48 recreated all migrations 2022-07-11 18:33:57 +03:00