IlyaSobolev/DocSpace-client
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,746 Commits 40 Branches 22 Tags 420 MiB
430ac26e48
Commit Graph

775 Commits

Author SHA1 Message Date
Alexey Bannov
7e13b3a031 backup: refactoring 2022-01-19 19:25:10 +03:00
SuhorukovAnton
f0dbdded9f analizators/s2692 2022-01-19 18:29:04 +03:00
SuhorukovAnton
f2e33fa4aa analizators/s2365 2022-01-19 18:16:59 +03:00
SuhorukovAnton
cbab9c4524 analizators/s2178 2022-01-19 17:16:34 +03:00
SuhorukovAnton
547b78b72f analizators/2178 2022-01-19 16:36:03 +03:00
SuhorukovAnton
a30b276711 analizators/U2U1015 2022-01-19 13:00:16 +03:00
SuhorukovAnton
fbb50e676e analizators/U2U1202 2022-01-19 12:51:30 +03:00
SuhorukovAnton
1403afbc16 analizators/U2U1209 2022-01-19 11:59:14 +03:00
Alexey Bannov
07ebea5db8 backup: refactoring 2022-01-18 19:04:35 +03:00
SuhorukovAnton
6c5792583a analizators/U2U1209 2022-01-18 17:43:46 +03:00
SuhorukovAnton
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
SuhorukovAnton
36c26bc803 analizators/U2U1117 2022-01-18 15:40:28 +03:00
Alexey Bannov
d3c1dfde9f backup: refactoring 2022-01-18 09:59:49 +03:00
Alexey Safronov
1a8d88345a Merge branch 'hotfix/v1.1.1' into feature/socket-io 
# Conflicts:
#	products/ASC.Files/Client/src/store/FilesStore.js
#	yarn.lock
 2022-01-17 19:02:40 +03:00
Alexey Bannov
ee8cb969bf backup: refactoring 2022-01-17 18:03:28 +03:00
Alexey Bannov
a9da66f2b5 backup: refactoring 2022-01-17 14:15:46 +03:00
SuhorukovAnton
e63684774f analizators/U2U1115 2022-01-17 11:28:39 +03:00
SuhorukovAnton
cec441c996 analizators/U2U1113 2022-01-17 11:23:40 +03:00
SuhorukovAnton
0ee1a35424 analizators/U2U1115 2022-01-17 11:22:52 +03:00
SuhorukovAnton
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
pavelbannov
a66272af1a Elastic: fix ping 2022-01-14 15:20:44 +03:00
Alexey Bannov
0796169d76 refactoring 2022-01-14 10:42:43 +03:00
Alexey Bannov
48897308d7 refactoring 2022-01-13 22:17:56 +03:00
pavelbannov
6b883bcd60 Merge branch 'develop' into feature/support-elasticache 2022-01-13 18:16:43 +03:00
SuhorukovAnton
9bc8584184 analizators/U2U1103 2022-01-13 15:53:57 +03:00
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
Vashchuk Nikita
c74da79ba2 Merge branch 'develop' into feature/async 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
 2022-01-12 22:07:21 +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
AlexeySafronov
078e870f71 Web: Socket.IO: Fix reboot, logging, + refactoring (replaced WebSocketSharp to SocketIOClient) 2022-01-11 19:09:44 +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
AlexeySafronov
6cbd02b71c Merge branch 'hotfix/v1.1.1' into feature/socket-io 
# Conflicts:
#	products/ASC.Files/Client/webpack.config.js
#	products/ASC.Files/Server/DocStore
#	yarn.lock
 2022-01-10 11:06:32 +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
Vashchuk Nikita
0876c22f6f spreading async in Files 2021-12-28 18:15:29 +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
AlexeySafronov
99e37d960d Web: Socket.IO: Refactoring work with socket.io 2021-12-20 15:38:08 +03:00
pavelbannov
7b0707ba16 Merge branch 'develop' into feature/async 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
 2021-12-17 10:48:44 +03:00
pavelbannov
c87a831b89 Files: optimization 2021-12-08 13:14:44 +03:00
pavelbannov
d181d43b36 Merge branch 'develop' into feature/async 
# Conflicts:
#	common/services/ASC.Data.Backup/ASC.Data.Backup.csproj
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Server/ASC.Files.csproj
 2021-12-02 12:02:50 +03:00
Vashchuk Nikita
0d4af58ada fix 2021-11-30 16:03:23 +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
Vashchuk Nikita
35ceaf7997 Merge branch 'develop' into feature/async 2021-11-22 11:30:38 +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
Vashchuk Nikita
43e2a65081 Spreading async in Files 2021-11-15 14:31:47 +03:00
Vashchuk Nikita
999f50f4ae added Linq.Async to ASC.Files.Core 2021-11-02 15:12:28 +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
35caf0dc4a fix 2021-08-27 12:29:45 +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
Vashchuk Nikita
1896457adb added asynchrony to FileDao 2021-08-26 15:32:44 +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
pavelbannov
01639a56cc RazorCompileOnBuild:false< 
GenerateMvcApplicationPartsAssemblyAttributes:false
 2021-06-16 20:08:26 +03:00
pavelbannov
53ee0ef484 fixed warnings 2021-06-16 18:00:27 +03:00
Alexey Bannov
5fcbdbd7dd added health checks 2021-06-16 16:54:36 +03:00
pavelbannov
fc9d626bcc UrlShortenerService: fix log 2021-06-11 11:44:10 +03:00
TatianaLopaeva
0663ed7f16 Merge branch 'develop' into feature/backup 
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
 2021-06-10 11:56:32 +03:00
pavelbannov
8d80955686 Thumbnail: fix 2021-06-09 15:04:29 +03:00
TatianaLopaeva
6db87a3907 Backup: Fixed after merge. 2021-06-08 15:32:28 +03:00
TatianaLopaeva
3ef16948fc Merge branch 'develop' into feature/backup 
# Conflicts:
#	common/services/ASC.Data.Backup/Core/NotifyHelper.cs
#	products/ASC.Files/Client/public/locales/en/OperationsPanel.json
#	products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
 2021-06-08 15:03:49 +03:00
SuhorukovAnton
c5fe4a9989 Merge branch 'develop' into feature/ClearEvents 2021-06-08 12:17:36 +03:00
SuhorukovAnton
860b682594 replace "DeleteOldEvents" in new service 2021-06-04 14:10:37 +03:00
pavelbannov
944966b67b WebSocker: repair service 2021-06-03 16:13:22 +03:00
pavelbannov
43de25b62a Merge branch 'develop' into feature/remove-unused-dep 
# Conflicts:
#	common/ASC.Data.Storage/ASC.Data.Storage.csproj
#	common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
 2021-06-03 12:52:21 +03:00
Pavel Bannov
ceb19659f3
Merge pull request #264 from ONLYOFFICE/feature/thirdparty_for_two_frameworks 
Feature/thirdparty for two frameworks
 2021-06-03 12:19:27 +03:00
pavelbannov
3635905167 Backup: fixed link 2021-06-02 17:02:19 +03:00
pavelbannov
d741e91e96 Backup: fixed notify 2021-06-02 15:00:36 +03:00
pavelbannov
36bc5a4172 Backup: fix 2021-06-02 12:58:46 +03:00
pavelbannov
e9c5ca41ae fix 2021-06-02 11:26:58 +03:00
SuhorukovAnton
7fd550dfe8 Merge branch 'develop' into feature/thirdparty_for_two_frameworks 2021-06-01 17:49:10 +03:00
pavelbannov
76d8ebb459 Tests moved to separate projects. 
Removed unused dependepcies
 2021-06-01 12:21:51 +03:00
pavelbannov
d3fb9f8384 fix 2021-05-31 14:08:13 +03:00
pavelbannov
570ede7bba Merge branch 'develop' into feature/11.5.2 
# Conflicts:
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2021-05-31 13:32:51 +03:00
pavelbannov
0be4e07865 SsoAuth: 2e37dcd0 2021-05-31 11:35:42 +03:00
pavelbannov
527a650601 WebStudio: resources 2021-05-27 21:30:15 +03:00
pavelbannov
bda786f844 WebStudio: moved from 08a01422 2021-05-27 20:13:24 +03:00
pavelbannov
f6fbe33814 Web.Core: moved from 08a01422 2021-05-24 20:41:31 +03:00
pavelbannov
90c67cac13 ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422 2021-05-24 13:26:13 +03:00
pavelbannov
1b730233c9 ElasticSearch: moved from 08a01422 2021-05-23 19:11:25 +03:00
pavelbannov
c1b7ea5a9a Storage: moved from 08a01422 2021-05-21 16:26:42 +03:00
SuhorukovAnton
02da2a15d1 websocket for only net standart 2021-05-21 13:31:28 +03:00
pavelbannov
5d94113e23 Backup: fix 2021-05-19 11:31:50 +03:00
Vashchuk Nikita
7c676374b3 fix Calendar & Radicale 2021-05-19 11:17:04 +03:00
Vashchuk Nikita
82abf11109 Merge branch 'develop' into feature/calendar 
# Conflicts:
#	ASC.Web.sln
#	config/autofac.products.json
#	config/nginx/onlyoffice.conf
#	products/ASC.Calendar/Server/ASC.Calendar.csproj
#	products/ASC.Calendar/Server/Controllers/CalendarController.cs
#	products/ASC.Calendar/Server/Program.cs
#	products/ASC.Calendar/Server/Properties/launchSettings.json
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.Designer.cs
#	products/ASC.Calendar/Server/Resources/CalendarAddonResource.resx
#	products/ASC.Calendar/Server/Startup.cs
 2021-05-18 13:24:02 +03:00
Vashchuk Nikita
94047ab0a1 Fix Calendar 2021-05-17 21:35:23 +03:00
pavelbannov
8a3db93d0d Backup: moved from 08a01422 2021-05-17 21:27:39 +03:00
pavelbannov
a5c6ba5dcc Common, db: moved from 08a01422 2021-05-17 14:35:00 +03:00
pavelbannov
d01db1eed6 Merge branch 'feature/remove-wq' of github.com:ONLYOFFICE/AppServer into feature/remove-wq 
# Conflicts:
#	common/ASC.Data.Storage/Encryption/EncryptionOperation.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceNotifier.cs
#	common/ASC.Data.Storage/Encryption/EncryptionWorker.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/services/ASC.Data.Backup/BackupAjaxHandler.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2021-05-13 11:57:40 +03:00
pavelbannov
6867ded281 Merge branch 'develop' into feature/remove-wq 
# Conflicts:
#	common/ASC.Common/DIHelper.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/QueueWorker.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
#	common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
 2021-05-13 11:23:44 +03:00
Vashchuk Nikita
bf41c21c4e Add Radicale 2021-05-11 18:05:46 +03:00
pavelbannov
0c7cbb6c99 removed unused newtonsoft.json 2021-05-06 12:20:37 +03:00
Alexey Bannov
0dbadc6394 from Microsoft.NET.Sdk.Web to Microsoft.NET.Sdk for ClassLibrary Projects 2021-04-30 18:42:10 +03:00
Alexey Bannov
2d8b085d02 add support WindowsService/systemd for IHostBuilder 
listen unix socket if it setup for Kestrel Web Server
 2021-04-23 16:54:39 +03:00
Alexey Bannov
5f2998af87 refactoring launchSettings.json. added 'WSL 2 : Ubuntu 20.04' profile 2021-04-16 19:33:26 +03:00
Alexey Bannov
3aae413e12 replace Path.Combine to CrossPlatform.PathCombine 2021-04-16 16:26:26 +03:00
pavelbannov
18a2c0a53d Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
#	common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
#	common/ASC.Core.Common/EF/Model/DbipLocation.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
#	common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
#	common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
#	common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
#	common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResData.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
#	common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
#	common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
#	common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
#	common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
#	products/ASC.Files/Core/Core/EF/DbFilesTag.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
 2021-03-25 21:50:09 +03:00
pavelbannov
f0e227731f Fixed loading products, lazy loading webitemmanager 2021-01-26 12:29:50 +03:00
pavelbannov
f8be896241 Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	common/ASC.Common/ASC.Common.csproj
#	common/ASC.Core.Common/ASC.Core.Common.csproj
#	common/ASC.Core.Common/EF/Context/BaseDbContext.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
 2021-01-22 16:34:40 +03:00
pavelbannov
ae69a9559e Files: removed temp 2021-01-13 12:41:29 +03:00
pavelbannov
f6ca373137 MemoryCache -> IMemoryCache 2021-01-12 20:51:14 +03:00
pavelbannov
fa7c2bf9f1 Merge branch 'develop' into feature/asc-files-tests 2020-12-29 18:37:28 +03:00
pavelbannov
0ae7f84de6 SocketIO: fix 2020-12-28 16:47:59 +03:00
pavelbannov
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
pavelbannov
1675896294 Merge branch 'develop' into feature/dotnet5 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/IFileStorageService.cs
 2020-12-04 11:59:10 +03:00
pavelbannov
40546da35d fix create file 2020-11-26 20:30:57 +03:00
pavelbannov
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
pavelbannov
71b6f71fd7 Files: fix dispose 2020-11-20 15:49:57 +03:00
pavelbannov
1623241d8a Code cleanup 2020-11-17 13:00:01 +03:00
pavelbannov
75fce656f0 Merge branch 'develop' into feature/dotnet5 2020-11-17 11:31:14 +03:00
pavelbannov
a66f99f574 net5.0 2020-11-15 18:55:57 +03:00
pavelbannov
68483bc979 Merge branch 'develop' into refactoring/scope 
# Conflicts:
#	common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Startup.cs
 2020-11-13 16:03:17 +03:00
SuhorukovAnton
44e565ca37 x-www-form-urlencoded: add models 2020-11-10 13:41:32 +03:00
SuhorukovAnton
855c5bc92b x-www-form-urlencoded: first version 2020-11-06 12:03:49 +03:00
pavelbannov
79ea471098 Merge branch 'develop' into refactoring/scope 
# Conflicts:
#	common/ASC.Api.Core/Core/BaseStartup.cs
#	common/ASC.Core.Common/BaseCommonLinkUtility.cs
#	common/services/ASC.ApiSystem/Startup.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Startup.cs
#	common/services/ASC.Data.Storage.Migration/Program.cs
#	common/services/ASC.Notify/NotifyServiceLauncher.cs
#	common/services/ASC.Notify/Program.cs
#	common/services/ASC.Socket.IO.Svc/Program.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Thumbnails.Svc/Program.cs
#	common/services/ASC.UrlShortener.Svc/Program.cs
#	products/ASC.Files/Core/Configuration/ProductEntryPoint.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Program.cs
#	products/ASC.People/Server/Startup.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Startup.cs
#	web/ASC.Web.Studio/Startup.cs
 2020-11-04 15:22:43 +03:00
pavelbannov
790d2fc934 Restore: fix 2020-11-03 16:02:54 +03:00
pavelbannov
450184f51c Merge branch 'develop' into feature/connect-controlPanel 2020-11-03 11:48:52 +03:00
pavelbannov
7e828b5643 Autofac: fix 2020-11-02 19:27:08 +03:00
pavelbannov
c9a32c05dc Merge branch 'develop' into feature/connect-controlPanel 
# Conflicts:
#	web/ASC.Web.Api/Controllers/PortalController.cs
 2020-11-02 13:56:52 +03:00
pavelbannov
4056ea888a Notify: fix urls 2020-10-30 17:57:31 +03:00
SuhorukovAnton
c1701500fa connect-controlPanel: fix backup 2020-10-30 13:03:19 +03:00
pavelbannov
496d908f6d Notify: fix 2020-10-30 10:23:35 +03:00
pavelbannov
43beaf6f6b Refactoring: scope 2020-10-29 17:30:08 +03:00
pavelbannov
049e8f63e9 Refactoring: scope. 2020-10-29 11:13:51 +03:00
pavelbannov
3256a3dbc7 DI: fix 2020-10-28 23:02:03 +03:00
SuhorukovAnton
c94b0ee340 connect-controlPanel: fix branding, backup and restore 2020-10-28 16:21:24 +03:00
pavelbannov
51f1f92307 Scope: refactoring. 2020-10-28 15:26:27 +03:00
pavelbannov
e9a9b320e8 Scope: refactoring. Notify, People 2020-10-27 18:34:22 +03:00
pavelbannov
75bbe888cd Scope: refactoring. Migration, ASC.Files.Service 2020-10-26 19:38:23 +03:00
pavelbannov
af99020de0 Scope: refactoring. Encryption 2020-10-26 17:23:23 +03:00
pavelbannov
035a98b878 Refactoring: scope. Backup 2020-10-26 16:38:21 +03:00
SuhorukovAnton
03ae9171b6 connect-controlPanel: fix multitenancy 2020-10-23 10:42:28 +03:00
pavelbannov
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +03:00
pavelbannov
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +03:00
pavelbannov
24a594b74c SocketIO: disable ping 2020-10-20 12:33:38 +03:00
pavelbannov
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
pavelbannov
3a29e9970f Merge branch 'develop' into refactoring/scope 
# Conflicts:
#	products/ASC.Files/Server/Startup.cs
 2020-10-18 22:52:24 +03:00
pavelbannov
181ac04fd8 DI: register fix 2020-10-18 19:34:30 +03:00
pavelbannov
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +03:00
pavelbannov
18ef6e7cb6 Merge branch 'master' into feature/files 
# Conflicts:
#	products/ASC.Files/Core/Core/FileStorageService.cs
 2020-10-16 16:57:21 +03:00
pavelbannov
5eed00dd28 Removed sq bugs and code smells 2020-10-16 16:21:59 +03:00
pavelbannov
e6be6f5072 References updated 2020-10-16 10:27:44 +03:00
pavelbannov
f69281a07d References updated 2020-10-15 21:30:16 +03:00
pavelbannov
0405989167 LoginEvents: fix 2020-10-15 11:04:06 +03:00
SuhorukovAnton
ab84f48a86 remove-wq: refactoring 2020-10-14 17:26:18 +03:00
pavelbannov
7a535d9654 Audit: public resources 2020-10-14 17:15:30 +03:00
pavelbannov
c1b046f954 Audit: resources. refactoring 2020-10-14 16:58:53 +03:00
pavelbannov
aa28276de7 AuditTrail: resource 2020-10-14 16:43:51 +03:00
pavelbannov
bdcfcd697b Audit: fix 2020-10-14 16:27:12 +03:00
pavelbannov
4a0a683c68 fix 2020-10-14 12:11:04 +03:00
pavelbannov
f252ef2a7f Merge branch 'master' into features/ASC.AuditTrail 
# Conflicts:
#	ASC.Web.sln
 2020-10-13 18:17:59 +03:00
SuhorukovAnton
2e4f612f93 remove-wq: fix encryption 2020-10-13 17:28:10 +03:00
pavelbannov
668cb3e893 Merge branch 'master' into feature/files 2020-10-13 15:27:31 +03:00
pavelbannov
9968873305 Merge branch 'master' into feature/fix_API_return 
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2020-10-13 13:33:24 +03:00
pavelbannov
02f39a9c71 Merge branch 'master' into feature/files 
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/WebstudioDbContextMySql/20201006101804_WebstudioDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/Npgsql/WebstudioDbContextNpgsql/20200929102646_WebstudioDbContextNpgsql.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	web/ASC.Web.Core/Files/FileUtility.cs
 2020-10-13 12:52:28 +03:00
pavelbannov
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
pavelbannov
a8b838b4ce fix 2020-10-12 22:12:03 +03:00
pavelbannov
43b9c33979 fix formating 2020-10-12 19:23:15 +03:00
pavelbannov
36034bf97a fix warnings 2020-10-12 16:52:31 +03:00
SuhorukovAnton
370400e4c0 fix_API_return: first version 2020-10-09 13:05:48 +03:00
SuhorukovAnton
10a55a2a76 ASC.AuditTrail: fix 2020-10-06 16:03:51 +03:00
SuhorukovAnton
d247223f86 ASC.AuditTrail: fix 2020-10-06 15:12:57 +03:00
SuhorukovAnton
8fb13f633c ASC.AuditTrail 2020-10-06 14:24:12 +03:00
SuhorukovAnton
d145bcf076 ASC.AuditTrail: first version 2020-10-06 10:06:05 +03:00
pavelbannov
3f5b8b77c4 DistributedTaskQueue: refactoring 2020-10-02 10:19:02 +03:00
SuhorukovAnton
cb2e656e21 fix-messages: IDE0066 2020-10-01 10:57:35 +03:00
SuhorukovAnton
edbc0f247c fix-messages: IDE0022 2020-09-30 17:47:42 +03:00
pavelbannov
3741f3a5d1 Encryption: DistributedQueue 2020-09-30 15:23:35 +03:00
SuhorukovAnton
ba1ed22345 fix-messages: IDE0058 2020-09-30 14:50:39 +03:00
pavelbannov
90e61ba082 Added DistributedTaskProgress 2020-09-30 13:54:49 +03:00
pavelbannov
e4d4db6563 Merge branch 'master' into feature/remove-wq 
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Common/Threading/Progress/ProgressBase.cs
#	common/ASC.Common/Threading/Progress/ProgressQueue.cs
#	common/ASC.Common/Threading/Workers/WorkerQueue.cs
#	common/ASC.Data.Reassigns/ReassignProgressItem.cs
#	common/ASC.Data.Reassigns/RemoveProgressItem.cs
#	common/ASC.Data.Storage/StaticUploader.cs
#	common/ASC.Data.Storage/StorageUploader.cs
#	common/services/ASC.Data.Backup/BackupServiceLauncher.cs
#	common/services/ASC.Data.Backup/Service/BackupService.cs
#	common/services/ASC.Data.Backup/Service/BackupWorker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
 2020-09-29 19:46:40 +03:00
SuhorukovAnton
9d5a9dd769 fix-messages: IDE1005 2020-09-29 14:58:00 +03:00
SuhorukovAnton
4e1bc262b9 fix-messages: IDE0075 2020-09-29 14:53:02 +03:00
SuhorukovAnton
9b6ccc19f0 fix-messages: IDE0074 2020-09-29 14:51:34 +03:00
SuhorukovAnton
a055c71610 fix-messages: IDE0070 2020-09-29 14:32:30 +03:00
SuhorukovAnton
1da0de1200 fix-messages: IDE0065 2020-09-29 13:28:03 +03:00
SuhorukovAnton
754ac38e3e fix-messages: IDE0074 2020-09-29 12:18:16 +03:00
SuhorukovAnton
135a845eaf fix-messages: IDE0063 2020-09-29 12:16:07 +03:00
SuhorukovAnton
b7cc10c13a fix-messages: IDE0054 2020-09-29 12:03:37 +03:00
SuhorukovAnton
2d34d70a4e fix-messages: IDE0051 and IDE0052 2020-09-29 11:57:37 +03:00
SuhorukovAnton
d866eccade fix-messages: IDE0044 2020-09-28 18:42:03 +03:00
SuhorukovAnton
de64bcca88 fix-messages: IDE0020 2020-09-28 17:45:05 +03:00
SuhorukovAnton
1d7f54ca22 fix-messages: IDE0019 2020-09-28 17:39:13 +03:00
SuhorukovAnton
bde6f8ab49 fix-messages: IDE0031 2020-09-28 17:33:41 +03:00
SuhorukovAnton
bc98087599 fix-messages: IDE0018 2020-09-28 17:25:40 +03:00
SuhorukovAnton
ba07caf1c8 fix-messages: IDE0017 2020-09-28 17:22:46 +03:00
pavelbannov
2c1d473314 Merge branch 'master' into feature/files 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
 2020-09-28 12:29:33 +03:00
pavelbannov
0dbae1adfd Merge branch 'master' into feature/files 2020-09-28 11:32:13 +03:00
SuhorukovAnton
c455419113 Telegram: fix Kafka 2020-09-25 14:13:43 +03:00
SuhorukovAnton
693e35ac57 add ASC.TelegramService 2020-09-24 17:30:27 +03:00
pavelbannov
a085e8ef38 Merge branch 'master' into feature/release-11.0.0 
# Conflicts:
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/Utility/TenantExtra.cs
 2020-09-23 14:00:24 +03:00
pavelbannov
6f5cc4a447 Api: fix 2020-09-23 13:55:39 +03:00
pavelbannov
0000129b3b Merge branch 'master' into feature/release-11.0.0 
# Conflicts:
#	common/ASC.Core.Common/Context/WorkContext.cs
#	common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
#	common/ASC.Core.Common/Tenants/TenantQuota.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/Encryption/Crypt.cs
#	common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
#	common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
#	common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
#	common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
#	common/ASC.Data.Storage/Encryption/ICrypt.cs
#	common/ASC.Data.Storage/Encryption/IEncryptionService.cs
#	common/ASC.Data.Storage/Encryption/IMetadata.cs
#	common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
#	common/ASC.Data.Storage/Encryption/Metadata.cs
#	common/ASC.Data.Storage/Encryption/StreamWrapper.cs
#	config/storage.json
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
 2020-09-20 20:17:12 +03:00
pavelbannov
50ff5a94a4 Encryption: fix port 2020-09-18 21:15:50 +03:00
pavelbannov
144dde2699 Encryption: fix notify 2020-09-18 20:57:51 +03:00
SuhorukovAnton
cb365ba75f encryption: add api-metods getProgress and getSettings 2020-09-18 13:02:20 +03:00
pavelbannov
a35a79c96a moved from release/11 4414f77b 2020-09-18 10:59:23 +03:00
SuhorukovAnton
7d3bb9e9a8 encryption: add api start 2020-09-17 16:56:12 +03:00
pavelbannov
d883ef441f Api: moved from release/11 4414f77b 2020-09-17 15:04:28 +03:00
pavelbannov
54cf80dafa Encrypt: fix 2020-09-16 16:32:46 +03:00
pavelbannov
94a5079503 Encryption: notify fix 2020-09-16 13:50:53 +03:00
SuhorukovAnton
bb7c283145 enctyption: remove bug 2020-09-16 11:10:16 +03:00
SuhorukovAnton
8e0ebceb36 encryption: copyright 2020-09-16 10:54:52 +03:00
pavelbannov
dc6b0d2c6c ASC.Data.Storage moved from release/11 4414f77b 2020-09-15 18:16:37 +03:00
TatianaLopaeva
a3adea3c27 Merge branch 'master' into feature/files 
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
 2020-09-15 17:39:34 +03:00
SuhorukovAnton
13edcd6a1a Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-15 11:26:43 +03:00
SuhorukovAnton
8ed470113d encryption: fix 2020-09-15 10:00:07 +03:00
SuhorukovAnton
505cb447cd encryption: fix 2020-09-14 17:36:57 +03:00
SuhorukovAnton
a3e52d3f3d ecnryption: test version 2020-09-14 17:16:30 +03:00
SuhorukovAnton
eb18133e4b encryption: bugfix 2020-09-14 13:32:20 +03:00
pavelbannov
15b34875d3 Moved from v10.5.2-saas 2020-09-11 17:12:35 +03:00
pavelbannov
23b2a310a0 Merge branch 'master' into feature/files 2020-09-10 12:35:55 +03:00
SuhorukovAnton
1752b9a4ba encryption: fix 2020-09-09 12:03:21 +03:00
SuhorukovAnton
89daf213c5 encryption: fix 2020-09-08 15:07:59 +03:00
SuhorukovAnton
3d79f7c484 encryption: fix 2020-09-08 11:26:05 +03:00