IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
16,387 Commits 38 Branches 22 Tags 359 MiB
099d7049e3
Commit Graph

537 Commits

Author SHA1 Message Date
Alexey Bannov
986d1d49e6 refactoring: ICacheNotify<T> map to MemoryCacheNotify by default then RedisConfiguration is null 2022-01-13 14:24:14 +03:00
SuhorukovAnton
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
SuhorukovAnton
3ff7aeca3b analizators/U2U1015 2022-01-12 13:27:06 +03:00
SuhorukovAnton
610c45fed3 analizators/U2U1009 2022-01-12 12:56:00 +03:00
Alexey Bannov
efb51c613f refactoring *.proto files according to https://bit.ly/3KcZ0Ef 2022-01-11 19:28:48 +03:00
SuhorukovAnton
50c0596eff analizators/U2U1009 2022-01-11 18:37:19 +03:00
SuhorukovAnton
c85c2e6f26 analizators/U2U1007 2022-01-11 18:37:10 +03:00
SuhorukovAnton
d9619e1151 analizators/U2U1006 2022-01-10 18:13:54 +03:00
SuhorukovAnton
6273539207 analizators/s2583 2021-12-30 14:03:50 +03:00
AlexeySafronov
bedfad1ec5 Merge branch 'master' into develop 
# Conflicts:
#	common/ASC.Core.Common/Caching/CachedUserService.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/DialogsStore.js
#	products/ASC.Files/Client/src/store/FilesActionsStore.js
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Tfa/TfaManager.cs
 2021-12-28 18:21:44 +03:00
Alexey Bannov
dcc7986a90 map ICacheNotify<> to RedisCache<> 2021-12-23 18:27:58 +03:00
Alexey Bannov
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +03:00
pavelbannov
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03:00
pavelbannov
fbdb776d69 fix 2021-11-29 14:34:35 +03:00
pavelbannov
85316c9d63 Moved from 45122194 2021-11-29 14:11:03 +03:00
SuhorukovAnton
384e012c5f net 6: remove TryUseWindowsService 2021-11-25 16:48:08 +03:00
pavelbannov
58d84912dd fix 2021-11-25 11:23:35 +03:00
pavelbannov
13e13f2303 Net: fix requests 2021-11-24 22:34:39 +03:00
pavelbannov
b74e4ccfd1 Removed unused dependencies. Fixed tests 2021-11-24 12:39:39 +03:00
pavelbannov
59c88e2006 up to 6.0.0 2021-11-23 17:56:27 +03:00
pavelbannov
8ca88e4620 Merge branch 'develop' into feature/net6 
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Common/ASC.Common.csproj
#	products/ASC.CRM/BackgroundTasks/ASC.CRM.BackgroundTasks.csproj
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Server/ASC.Files.csproj
#	web/ASC.Web.HealthChecks.UI/ASC.Web.HealthChecks.UI.csproj
 2021-11-23 16:40:50 +03:00
SuhorukovAnton
2cba76f838 backup: add "backupFileUpload.ashx" 2021-11-19 12:43:54 +03:00
pavelbannov
cc35174d16 moved from 043e301 2021-11-16 20:40:15 +03:00
AlexeySafronov
8cc08045b7 Merge branch 'master' into develop 
# Conflicts:
#	packages/asc-web-common/components/PageLayout/sub-components/section-header.js
#	packages/asc-web-components/combobox/index.js
#	packages/asc-web-components/table-container/StyledTableContainer.js
#	packages/asc-web-components/table-container/TableGroupMenu.js
#	packages/asc-web-components/table-container/TableHeader.js
#	products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
 2021-11-01 13:54:40 +03:00
pavelbannov
1882f9db43 Fixed settings issue 2021-10-29 17:21:51 +03:00
pavelbannov
b15bc7b5cf WebHook: fix service 2021-10-29 13:23:37 +03:00
pavelbannov
26511d9fb7 Merge branch 'develop' into feature/webhooks 
# Conflicts:
#	ASC.Tests.sln
 2021-10-29 13:18:57 +03:00
Alexey Bannov
08205c2780 setup Kestrel for ApiSystem 2021-10-27 20:03:59 +03:00
Alexey Bannov
0215599566 merge from develop 2021-10-27 19:37:12 +03:00
Alexey Bannov
957aa8bd81 fixed started services 2021-10-26 20:09:19 +03:00
pavelbannov
b1134d239c Merge branch 'develop' into feature/auto-migrations 
# Conflicts:
#	common/ASC.Core.Common/EF/Context/UserDbContext.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210309093101_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20210803210910_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/20211012145324_AccountLinkContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/AccountLinkContextMySql/MySqlAccountLinkContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210309093934_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20210803211510_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/20211012145326_DbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/DbContextMySql/MySqlDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210309094059_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20210803211718_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/20211012145328_FeedDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FeedDbContextMySql/MySqlFeedDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210309094212_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20210803211941_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210309094321_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20210803212237_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/20211012145332_MailDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MailDbContextMySql/MySqlMailDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20210803212546_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/MySqlMessagesContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210309094710_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20210803212728_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/20211012145336_NotifyDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/NotifyDbContextMySql/MySqlNotifyDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210309094839_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20210803212948_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/20211012145338_ResourceDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/ResourceDbContextMySql/MySqlResourceDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210309095003_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20210803213120_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/20211012145340_TelegramDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TelegramDbContextMySql/MySqlTelegramDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210803213311_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20211012145342_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/MySqlTenantDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210309095256_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20210803213502_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210309095409_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20210803213656_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20211012145344_VoipDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210309100343_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20210803213819_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20211012145346_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/MySqlWebstudioDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210309125119_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20210804103345_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
 2021-10-25 20:52:13 +03:00
pavelbannov
403388fbf1 Added solution filter 
Removed unused services
replaced sh with bat
start service from source
 2021-10-25 14:29:36 +03:00
MaksimChegulov
c02e5867d7 Storage: fix conflict namespace 2021-10-22 19:51:51 +03:00
SuhorukovAnton
30277d4fb3 net6: bugfix 2021-10-22 17:20:40 +03:00
SuhorukovAnton
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
pavelbannov
dd8f77f827 Merge branch 'develop' into feature/wizard/migration 2021-10-22 11:44:21 +03:00
SuhorukovAnton
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
SuhorukovAnton
f6f317ec42 net6: refactoring and bugfix 2021-10-21 16:23:26 +03:00
pavelbannov
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
pavelbannov
9f12c95828 Merge branch 'feature/webhooks' of github.com:ONLYOFFICE/AppServer into feature/webhooks 2021-10-19 15:25:53 +03:00
SuhorukovAnton
735a9b60cf net6: warning CA1416 
also remove unnecessary usings
 2021-10-13 11:07:03 +03:00
SuhorukovAnton
ae9a3187bc net6: warning SYSLIB0014 2021-10-12 13:14:33 +03:00
Tatiana Lopaeva
01879779cd Merge branch 'develop' into feature/backup 2021-10-04 15:21:45 +03:00
SuhorukovAnton
0f833ae1de net6: warning SYSLIB0020 2021-10-01 13:26:36 +03:00
pavelbannov
1bc64ce5ae Files: check state before get stream 2021-09-30 09:51:38 +03:00
pavelbannov
315665e87a BuildAndDeploy 2021-09-23 20:58:39 +03:00
pavelbannov
f4feb48d2c fix dependencies 2021-09-22 19:51:06 +03:00
Tatiana Lopaeva
aa6c02b190 Merge branch 'develop' into feature/backup 
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Controllers/BackupController.cs
#	packages/asc-web-common/api/settings/index.js
#	packages/asc-web-common/components/PrivateRoute/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	products/ASC.Files/Client/public/locales/en/SelectFile.json
#	products/ASC.Files/Client/public/locales/ru/SelectFile.json
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/webpack.config.js
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Client/src/Shell.jsx
 2021-09-20 16:26:34 +03:00
pavelbannov
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
pavelbannov
d099326e7f Merge branch 'develop' into feature/backup.core 
# Conflicts:
#	common/services/ASC.Data.Backup/Program.cs
 2021-09-05 12:50:05 +03:00
pavelbannov
9cb01be544 Elastic: removed unused isInit 2021-09-03 18:05:05 +03:00
pavelbannov
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
SuhorukovAnton
c5b135afbe backup.core: remove waste 2021-09-02 16:11:41 +03:00
SuhorukovAnton
8171563965 backup.core: move backup.core 2021-09-02 15:41:54 +03:00
SuhorukovAnton
d8654444c6 backup.core: fix 2021-08-31 16:59:32 +03:00
SuhorukovAnton
115d752582 backup.core: fix 2021-08-31 15:43:40 +03:00
SuhorukovAnton
a812971c07 Merge branch 'develop' into feature/backup.core 2021-08-31 13:55:47 +03:00
SuhorukovAnton
4b3cb1b4fb backup.core: first version 2021-08-31 12:40:28 +03:00
pavelbannov
f62209d88e Merge branch 'develop' into feature/webhooks 2021-08-30 19:18:18 +03:00
pavelbannov
a84bddad3c fix 2021-08-30 19:17:57 +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
45d221a109 Split webhooks into service and core 2021-08-26 21:43:41 +03:00
pavelbannov
b791586252 net6 2021-08-25 18:26:13 +03:00
Vashchuk Nikita
9f0e41b880 Merge branch 'develop' into feature/webhooks 2021-08-23 12:36:01 +03:00
pavelbannov
e5faa90adb removed nuget warnings 2021-08-20 16:53:27 +03:00
pavelbannov
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
diana-vahomskaya
5e22019a28 fix context delete models: dbtenant, dbtariff from BackupsContext 2021-08-12 18:18:01 +03:00
Alexey Bannov
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log 
Feature/log
 2021-08-12 15:00:53 +03:00
pavelbannov
87b7e171de ApiSystem: fix 2021-08-11 21:32:43 +03:00
pavelbannov
643b7b66dc Optimization: removed autofac ILifetimeScope 2021-08-10 17:56:38 +03:00
pavelbannov
39f77c5352 Backup: fix 2021-08-10 11:36:07 +03:00
pavelbannov
546c1872a3 Added asp logging 2021-08-08 16:19:54 +03:00
pavelbannov
672de09a90 NLog: up to 4.7.10 2021-08-08 15:55:27 +03:00
Alexey Bannov
44847c1e8f backend: change TargetFramework from netstandard2.1 to net5.0 2021-08-06 18:37:22 +03:00
pavelbannov
e86124cbdd Elastic: fixed search by content 2021-08-04 13:08:12 +03:00
diana-vahomskaya
af84cd6532 fix Context 2021-08-03 17:11:53 +03:00
diana-vahomskaya
bcfddd88d7 fix context 2021-08-02 17:49:36 +03:00
pavelbannov
a0b34c5cc9 Webhook: fix 2021-07-31 20:12:41 +03:00
NikolayRechkin
6fbdaf0d31 Calendar: post-merge fixes 2021-07-27 16:09:30 +03:00
NikolayRechkin
f1668a3b43 Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar 2021-07-27 12:43:01 +03:00
pavelbannov
913c67a818 Elastic: fixed create scope 2021-07-22 12:11:39 +03:00
pavelbannov
8c78fa4a17 Feed: fix TenantManager 2021-07-22 11:56:52 +03:00
pavelbannov
2d75554b0d DbContext: optimization 2021-07-15 13:07:47 +03:00
pavelbannov
b184ad7898 Log: fix configuring 2021-07-14 11:00:59 +03:00
pavelbannov
ad57feecd8 Log: fix configuring 2021-07-13 21:17:18 +03:00
SuhorukovAnton
d04484a2eb backup: add api "enablerestore" 2021-06-30 16:33:49 +03:00
TatianaLopaeva
db7954ee31 Merge branch 'develop' into feature/backup 2021-06-30 15:54:45 +03:00
pavelbannov
d59f9a2aa2 fixed urls 2021-06-23 20:12:50 +03:00
pavelbannov
0e6078f9e2 Merge branch 'develop' into feature/ClearEvents 
# Conflicts:
#	ASC.Web.sln
 2021-06-23 17:15:56 +03:00
Alexey Bannov
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
pavelbannov
c18adc50dc ClearEvents: fixed log and launch 2021-06-23 15:25:17 +03:00
pavelbannov
d8abde6d88 SSoAuth: fix buid and run 2021-06-22 19:44:09 +03:00
pavelbannov
912501a2f4 Healthcheck: fix apisystem 2021-06-22 19:09:24 +03:00
TatianaLopaeva
f340924612 Merge branch 'feature/backup' of github.com:ONLYOFFICE/AppServer into feature/backup 2021-06-18 20:19:56 +03:00
TatianaLopaeva
ae17671043 Merge branch 'develop' into feature/backup 
# Conflicts:
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/store/SettingsSetupStore.js
 2021-06-18 18:08:38 +03:00
SuhorukovAnton
00cc15fbf5 Merge branch 'develop' into feature/ClearEvents 2021-06-18 12:21:54 +03:00
SuhorukovAnton
b6b88b2506 bug fix: exception when call "getbackuphistory" 2021-06-17 16:48:20 +03:00