|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +03:00 |
|
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +03:00 |
|
|
|
5988855b61
|
Fix License
|
2020-07-08 18:30:23 +03:00 |
|
SuhorukovAnton
|
8b5ab8c9a4
|
api-defaultvalue: delete DataContracts
|
2020-07-08 13:10:09 +03:00 |
|
SuhorukovAnton
|
9d069de30a
|
general-startup: transform GeneralStartup to BaseStartup
|
2020-07-07 23:00:39 +03:00 |
|
SuhorukovAnton
|
00558dd95f
|
general-startup: fix
|
2020-07-06 10:56:17 +03:00 |
|
SuhorukovAnton
|
71d90ebfa2
|
general-startup: fix
|
2020-07-03 18:57:59 +03:00 |
|
SuhorukovAnton
|
2f5491f1ba
|
general-startup: first version
|
2020-07-03 14:47:27 +03:00 |
|
|
|
461fc55f22
|
Merge pull request #45 from ONLYOFFICE/feature/backup
Feature/backup
|
2020-06-28 16:23:36 +03:00 |
|
|
|
eafafef8df
|
Thumb: fix
|
2020-06-26 11:02:21 +03:00 |
|
|
|
29a0e752bb
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
# web/ASC.Web.Api/Controllers/PortalController.cs
|
2020-06-25 19:21:42 +03:00 |
|
|
|
23945aeb24
|
Api: backup removed
|
2020-06-25 16:25:03 +03:00 |
|
|
|
b01b3d85f8
|
Backup: fix
|
2020-06-25 16:10:28 +03:00 |
|
|
|
d53b11967a
|
Merge branch 'master' into feature/backup
|
2020-06-25 15:37:53 +03:00 |
|
|
|
1871959768
|
fix
|
2020-06-25 15:17:22 +03:00 |
|
|
|
2fe2c2167b
|
Merge branch 'master' into feature/thumbnails
# Conflicts:
# ASC.Web.sln
|
2020-06-25 15:01:38 +03:00 |
|
|
|
d14313c6c1
|
References updated
|
2020-06-25 14:38:34 +03:00 |
|
SuhorukovAnton
|
e21d99e361
|
Thumbnails: fix
|
2020-06-23 14:19:12 +03:00 |
|
SuhorukovAnton
|
cce4d5fa7a
|
Thumbnails: delete unnecessary
|
2020-06-23 14:14:13 +03:00 |
|
SuhorukovAnton
|
4e839c9b11
|
Backup: transfer to ASC.Data.Backup
|
2020-06-23 13:48:36 +03:00 |
|
SuhorukovAnton
|
6f4bd59c6d
|
Thumbnails: refactoring
|
2020-06-21 14:45:31 +03:00 |
|
SuhorukovAnton
|
103de233e9
|
Thumbnails: fix
|
2020-06-17 14:00:28 +03:00 |
|
SuhorukovAnton
|
5fbe80d32a
|
Thumbnails: first version
|
2020-06-16 14:55:46 +03:00 |
|
|
|
9276bfd384
|
Backup: fix
|
2020-06-15 18:33:53 +03:00 |
|
SuhorukovAnton
|
ab6588d99b
|
Backup: bagfix and refactoring
|
2020-06-10 15:35:10 +03:00 |
|
|
|
3c66bbb607
|
Merge branch 'master' into feature/backup
|
2020-06-09 10:48:07 +03:00 |
|
|
|
635ff124fb
|
Json: fixed enum
|
2020-06-05 14:05:42 +03:00 |
|
|
|
f59be0f44b
|
Merge branch 'master' into feature/backup
|
2020-06-04 17:12:34 +03:00 |
|
|
|
b569245076
|
rever logger
|
2020-06-04 16:47:27 +03:00 |
|
|
|
b55cc7c697
|
Startup: added command line
|
2020-06-04 16:26:31 +03:00 |
|
|
|
794486f335
|
Notify: temp log
|
2020-06-04 16:04:17 +03:00 |
|
|
|
4ea72a0e65
|
Merge branch 'master' into feature/backup
# Conflicts:
# ASC.Web.sln
|
2020-06-04 14:39:40 +03:00 |
|
SuhorukovAnton
|
26f2107590
|
Backup: refactoring
|
2020-06-04 13:47:22 +03:00 |
|
|
|
a14049e88f
|
Settings: fixed GetSupportedCultures
|
2020-06-03 18:51:01 +03:00 |
|
SuhorukovAnton
|
89368aed8b
|
Backup: refactoring
|
2020-06-03 12:15:05 +03:00 |
|
|
|
a1778b5cdf
|
Packages updated
|
2020-06-01 14:36:23 +03:00 |
|
SuhorukovAnton
|
9655101d2b
|
Backup: add DIHelper's methods and fix startup
|
2020-05-28 16:28:51 +03:00 |
|
|
|
e7ecaefa3c
|
Added JsonStringEnumConverter
|
2020-05-27 16:19:58 +03:00 |
|
|
|
ecd66902a0
|
Merge branch 'master' into feature/system-json
|
2020-05-18 14:16:03 +03:00 |
|
|
|
550b0dd20e
|
Sln: packages updated
|
2020-05-18 10:27:22 +03:00 |
|
|
|
3a747ef8e4
|
Merge branch 'master' into feature/system-json
# Conflicts:
# common/ASC.Api.Core/Core/ApiContext.cs
# common/ASC.Api.Core/Core/ApiDateTime.cs
# common/ASC.Api.Core/Model/EmployeeWraper.cs
# common/ASC.Api.Core/Model/EmployeeWraperFull.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# products/ASC.People/Server/Models/GroupWrapperFull.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Api/Models/BuildVersion.cs
|
2020-05-07 10:28:20 +03:00 |
|
|
|
44ec45ebb6
|
Merge branch 'master' into feature/elastic
# Conflicts:
# common/ASC.Common/Security/Cryptography/InstanceCrypto.cs
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/Caching/CachedQuotaService.cs
# common/ASC.Core.Common/Caching/CachedTenantService.cs
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Context/Impl/AuthManager.cs
# common/ASC.Core.Common/Context/Impl/CoreConfiguration.cs
# common/ASC.Core.Common/Context/Impl/TenantManager.cs
# common/ASC.Core.Common/Context/SecurityContext.cs
# common/ASC.Core.Common/Data/DbSettingsManager.cs
# common/ASC.Core.Common/Tenants/TenantUtil.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.IPSecurity/IPSecurity.cs
# common/services/ASC.Studio.Notify/Program.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/CookiesManager.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
|
2020-02-25 11:24:45 +03:00 |
|
|
|
9db8b26985
|
Replaced NewtonsoftJson with System.Text.Json
|
2020-02-21 16:19:32 +03:00 |
|
|
|
bc6e1d5e9e
|
updated dependecies
|
2020-02-21 11:13:01 +03:00 |
|
|
|
c5dbf8c859
|
Removed unused dependencies
|
2020-02-20 17:57:48 +03:00 |
|
|
|
a5280a1694
|
Added DIHelper
|
2020-02-17 11:58:14 +03:00 |
|
|
|
8c2b39406f
|
Merge branch 'master' into feature/merge
|
2020-02-03 14:29:41 +03:00 |
|
|
|
f017d9cc23
|
fix from review
|
2020-02-03 13:48:06 +03:00 |
|
|
|
acde301b26
|
Merge branch 'master' into feature/merge
|
2020-01-31 10:59:00 +03:00 |
|
|
|
4ea450720b
|
moved from hotfix/10.5.2
|
2020-01-22 10:53:16 +03:00 |
|
