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

358 Commits

Author SHA1 Message Date
SuhorukovAnton
ca658e4b02 analizators/s1905 2022-01-21 16:23:25 +03:00
SuhorukovAnton
143f0a5dda Analizators/s1854 2022-01-21 16:22:56 +03:00
SuhorukovAnton
c05d9fe6bc analizators/s1450 2022-01-21 16:15:29 +03:00
SuhorukovAnton
fb65d3a09d analizators/1481 2022-01-21 16:15:15 +03:00
SuhorukovAnton
473259657e analizators/s1118 2022-01-21 13:47:56 +03:00
SuhorukovAnton
bf3b0395a5 analizators/s1116 2022-01-21 11:04:08 +03:00
SuhorukovAnton
5f78b37e25 analizators/U2U1000 2022-01-20 12:28:48 +03:00
SuhorukovAnton
20b60958a8 analizators/U2U1022 2022-01-19 13:24:11 +03:00
SuhorukovAnton
1403afbc16 analizators/U2U1209 2022-01-19 11:59:14 +03:00
SuhorukovAnton
78047d3b93 analizators/U2U1210 2022-01-18 18:29:46 +03:00
SuhorukovAnton
6c5792583a analizators/U2U1209 2022-01-18 17:43:46 +03:00
SuhorukovAnton
acd5b83026 analiztators/U2U1206 2022-01-18 17:00:28 +03:00
SuhorukovAnton
84638feaf0 analizators/U2U1202 2022-01-18 16:54:24 +03:00
SuhorukovAnton
b9884e6b81 Analizators/U2U1107 2022-01-14 16:32:06 +03:00
SuhorukovAnton
4bf841581f Analizators/U2U1104 2022-01-14 16:12:37 +03:00
SuhorukovAnton
9bc8584184 analizators/U2U1103 2022-01-13 15:53:57 +03:00
SuhorukovAnton
4155f911c0 analizators/U2U1025 2022-01-13 14:19:39 +03:00
SuhorukovAnton
6961f38593 analizators/U2U1023 2022-01-12 15:34:58 +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
a671732da5 analizators/SCS0005 2022-01-10 12:24:21 +03:00
Alexey Bannov
6d250efffa add *.dll for support redis + update Grpc.* dll 2021-12-23 16:17:31 +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
0771a54c47 Optimization 2021-12-09 20:23:06 +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
SuhorukovAnton
fde636c586 net 6: update packages 2021-11-25 16:41:24 +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
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
Tatiana Lopaeva
8ba2f0c694 Merge branch 'develop' into feature/backup 
# Conflicts:
#	packages/asc-web-common/api/settings/index.js
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
 2021-10-25 11:02:42 +03:00
MaksimChegulov
c02e5867d7 Storage: fix conflict namespace 2021-10-22 19:51:51 +03:00
SuhorukovAnton
e5e4a89e5b Merge branch 'develop' into feature/net6 2021-10-22 16:10:37 +03:00
Vashchuk Nikita
4ef5b4c8e5 Added async in Asc.Files.Core(Dao) 2021-10-21 20:59:05 +03:00
SuhorukovAnton
e310d5e655 net6: httpClient: add using 2021-10-21 17:56:31 +03:00
Alexey Bannov
803a8f3baa fixed bug 53156: removed constructor without HttpContextAccessor parameter. 2021-10-14 18:36:31 +03:00
Alexey Bannov
a324b8b9b9 fixed bug 52923 for s3 storage 2021-10-13 16:23:54 +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
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
1e77063d32 fix Bug 51866 2021-09-05 22:59:14 +03:00
pavelbannov
211224ca1a Storage: fix S3 2021-09-02 23:49:59 +03:00
pavelbannov
a84bddad3c fix 2021-08-30 19:17:57 +03:00
pavelbannov
b791586252 net6 2021-08-25 18:26:13 +03:00
pavelbannov
cf87addaa3 Security: added new method 2021-08-18 17:04:16 +03:00
pavelbannov
5bf9bfae27 Files: optimization 2021-08-13 18:59:17 +03:00
AlexeySafronov
e92c41d919 Merge branch 'develop' into release/1.0.0 2021-08-10 18:55:25 +03:00
pavelbannov
643b7b66dc Optimization: removed autofac ILifetimeScope 2021-08-10 17:56:38 +03:00
pavelbannov
c2bd00506c fix Bug 51447 2021-08-03 17:05:49 +03:00
TatianaLopaeva
db7954ee31 Merge branch 'develop' into feature/backup 2021-06-30 15:54:45 +03:00
pavelbannov
4a4cab5352 Files: FileHelper decorator 2021-06-18 23:31:46 +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
pavelbannov
3d3a8a2d6a Merge branch 'develop' into feature/remove_binary_formatter 2021-06-18 10:49:07 +03:00
pavelbannov
53ee0ef484 fixed warnings 2021-06-16 18:00:27 +03:00
SuhorukovAnton
a82efce2a1 add fileHelper 2021-06-10 17:53:06 +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
50f0bef484 remove unnecessary using 2021-06-07 13:56:24 +03:00
SuhorukovAnton
fd485e06e4 remove_binary_formatter 2021-06-07 13:54:17 +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
pavelbannov
d134398167 Storage: fix resolve 2021-06-02 16:28:05 +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
c8c5b49d1c Files: thumbnails. 2e37dcd0 2021-05-30 21:52:32 +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
a1c4e0f568 Merge branch 'develop' into feature/thirdparty_for_two_frameworks 2021-05-21 12:27:54 +03:00
pavelbannov
b9c52c526e Fixed DistributedTask 2021-05-18 21:24:22 +03:00
SuhorukovAnton
ec56ae33a3 packages for rackspace and openstack 2021-05-18 12:01:34 +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
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
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
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
bfa73ec5c2 moved from 2e37dcd0 2020-12-28 16:22:08 +03:00
pavelbannov
0fae06b2bf fix storage 2020-12-22 15:51:04 +03:00
pavelbannov
d39c2524c3 Files: refactoring 2020-12-04 13:52:07 +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
f71d59df53 TenantQuotaController: optimization 2020-11-24 13:56:24 +03:00
pavelbannov
b487adb9fc Refactoting & optimization 2020-11-24 13:15:11 +03:00
pavelbannov
eb6b54482e fix warnings 2020-11-17 13:47:17 +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
049e8f63e9 Refactoring: scope. 2020-10-29 11:13:51 +03:00
pavelbannov
3256a3dbc7 DI: fix 2020-10-28 23:02:03 +03:00
pavelbannov
51f1f92307 Scope: refactoring. 2020-10-28 15:26:27 +03:00
pavelbannov
af99020de0 Scope: refactoring. Encryption 2020-10-26 17:23:23 +03:00
pavelbannov
367c93fd91 Refactoring: scope 2020-10-22 20:57:18 +03:00
pavelbannov
1d2f65ba12 Refactoring: scope 2020-10-20 23:10:17 +03:00
pavelbannov
bff9629389 Scope: refactoring 2020-10-20 16:24:46 +03:00
pavelbannov
830c73a134 Scope: refactoring 2020-10-19 18:53:15 +03:00
pavelbannov
a4eb45f1ab Scope: refactoring 2020-10-18 19:03:14 +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
SuhorukovAnton
ab84f48a86 remove-wq: refactoring 2020-10-14 17:26:18 +03:00
SuhorukovAnton
2e4f612f93 remove-wq: fix encryption 2020-10-13 17:28:10 +03:00
pavelbannov
c622be89a3 revert discard 2020-10-12 22:39:23 +03:00
pavelbannov
f6f65f5968 fix 2020-10-12 20:40:14 +03:00
pavelbannov
5e14bbb8cc fix 2020-10-12 20:20:19 +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
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
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
pavelbannov
e4acc15773 removed WorkerQueue, ProgressQueue 2020-09-29 16:02:47 +03:00
SuhorukovAnton
1da0de1200 fix-messages: IDE0065 2020-09-29 13:28:03 +03:00
SuhorukovAnton
2d34d70a4e fix-messages: IDE0051 and IDE0052 2020-09-29 11:57:37 +03:00
SuhorukovAnton
29ec562a78 fix-messages: IDE0038 2020-09-28 18:21:29 +03:00
SuhorukovAnton
bc98087599 fix-messages: IDE0018 2020-09-28 17:25:40 +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
144dde2699 Encryption: fix notify 2020-09-18 20:57:51 +03:00
SuhorukovAnton
7d3bb9e9a8 encryption: add api start 2020-09-17 16:56:12 +03:00
SuhorukovAnton
7fae3bf83a encryption: upload crypt 2020-09-16 17:03:33 +03:00
pavelbannov
54cf80dafa Encrypt: fix 2020-09-16 16:32:46 +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
SuhorukovAnton
13edcd6a1a Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-15 11:26:43 +03:00
SuhorukovAnton
5916705391 enctyption: fixbug 2020-09-15 11:24:48 +03:00
SuhorukovAnton
eb18133e4b encryption: bugfix 2020-09-14 13:32:20 +03:00
pavelbannov
7c9df6c3c4 Moved from v10.5.2-saas 2020-09-11 17:16:59 +03:00
pavelbannov
15b34875d3 Moved from v10.5.2-saas 2020-09-11 17:12:35 +03:00
pavelbannov
f89af33b5b fix unhandled exception 2020-09-10 13:39:26 +03:00
pavelbannov
cc9e0e1374 Merge branch 'master' into feature/scope 
# Conflicts:
#	web/ASC.Web.Core/Notify/NotifyConfiguration.cs
 2020-09-09 18:18:34 +03:00
SuhorukovAnton
5aeaa0ee98 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-09 13:45:21 +03:00
SuhorukovAnton
88646b2d2f default-value-module: fix 2020-09-09 13:38:43 +03:00
SuhorukovAnton
3875f9f4b0 default-value-module: fix 2020-09-09 13:36:53 +03:00
SuhorukovAnton
2378c3746e default-value-module: fix 2020-09-09 13:25:50 +03:00
SuhorukovAnton
0f7901628b default-value-module: fix 2020-09-09 13:25:13 +03:00
SuhorukovAnton
ce27032fbb default-value-module: first version 2020-09-09 12:31:57 +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
SuhorukovAnton
bd3c14c7ec encryption: fix 2020-09-07 18:04:26 +03:00
SuhorukovAnton
2d3f183567 Merge branch 'master' into feature/ASC.Data.Storage.Encryption 2020-09-07 17:00:48 +03:00
SuhorukovAnton
80198032a4 scope: refactoring 2020-09-07 15:01:15 +03:00
pavelbannov
8e3e73c746 Scope: fix 2020-09-04 13:10:19 +03:00