IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
25,591 Commits 38 Branches 22 Tags 359 MiB
7f1d946269
Commit Graph

2652 Commits

Author SHA1 Message Date
Alexey Bannov
ea2f03331b refactoring 2022-08-09 19:13:07 +03:00
Nikolay Rechkin
bfe43ebe96 SSO: fix login 2022-08-09 16:53:22 +03:00
pavelbannov
baaec9dcef Merge branch 'develop' into feature/async-fix 
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
 2022-08-09 16:27:35 +03:00
Alexey Bannov
6db28a8a86 warm up service: added logs 2022-08-09 12:51:32 +03:00
Alexey Bannov
5f69b6bc0c warm up services 2022-08-09 10:28:44 +03:00
Alexey Bannov
f496771391 warm up services 2022-08-09 09:49:05 +03:00
Nikolay Rechkin
562eb6144d SSO: fix login 2022-08-09 01:26:27 +03:00
Alexey Bannov
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
pavelbannov
9ce72036ec fix 2022-08-08 18:32:46 +03:00
pavelbannov
d26eee0424 Async: fix webhook 2022-08-05 18:47:33 +03:00
Nikolay Rechkin
59160afcdc SSO: fix template path 2022-08-05 17:29:17 +03:00
pavelbannov
92fa19ec82 Webhook: fix iasyncenumerable 2022-08-04 18:59:21 +03:00
Alexey Safronov
26b79aa67b Added install-state.gz to .gitignore 2022-08-03 17:22:10 +03:00
pavelbannov
bb80d28945 Merge branch 'develop' into feature/async-fix 
# Conflicts:
#	products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/EF/FilesDbContext.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.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/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
 2022-08-02 17:03:50 +03:00
Pavel Bannov
9d3bc076b9
Merge pull request #747 from ONLYOFFICE/feature/fix-api 
Feature/fix api
 2022-08-02 11:59:47 +03:00
SuhorukovAnton
a4ea50c760 split AuditReportCreator 2022-08-01 17:23:50 +03:00
Alexey Safronov
7000cd55f6 Merge branch 'develop' into refactoring/client 2022-08-01 15:59:18 +03:00
Alexey Safronov
07e8e49579 Web: Fix Frontend.Translations.Tests run 2022-08-01 15:55:39 +03:00
SuhorukovAnton
58d3407729 fix 2022-08-01 13:58:14 +03:00
pavelbannov
ceae4ff07d packages updated 2022-08-01 13:58:12 +03:00
SuhorukovAnton
3c3234b6c2 Merge branch 'develop' into feature/fix-api 2022-08-01 13:51:05 +03:00
SuhorukovAnton
4559942c30 fix confrim links 2022-08-01 13:50:31 +03:00
pavelbannov
9df9195cff suppress warning 2022-08-01 13:41:33 +03:00
Alexey Safronov
ef48119187 Update .yarn/install-state.gz 2022-07-29 22:38:54 +03:00
Alexey Safronov
1ae3cce198 ASC.WebDav: Upgrade yarn to v3.2.2 2022-07-29 22:28:13 +03:00
Alexey Safronov
5237c5ae98 ASC.UrlShortener: Upgrade yarn to v3.2.2 2022-07-29 22:26:54 +03:00
Alexey Safronov
50ed43af17 ASC.SsoAuth: Upgrade yarn to v3.2.2 2022-07-29 22:25:53 +03:00
Alexey Safronov
b2454b35ce ASC.Socket.IO: Upgrade yarn to v3.2.2 2022-07-29 22:24:09 +03:00
pavelbannov
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
SuhorukovAnton
615448319a fix mapper 2022-07-29 18:39:57 +03:00
pavelbannov
9d69882cf3 removed BaseDbContext 2022-07-29 15:53:29 +03:00
SuhorukovAnton
6fd385e026 Merge branch 'develop' into feature/docspace-backup 2022-07-29 11:13:42 +03:00
pavelbannov
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
pavelbannov
8d89d8e8f2 Common: added dbcontext pool 2022-07-28 15:29:03 +03:00
Alexey Bannov
998366ab6f EventBus: fixed ProtobufSerializer 2022-07-27 20:24:18 +03:00
pavelbannov
997e20898a EF: added support of dbcotextpool 2022-07-27 20:12:08 +03:00
SuhorukovAnton
2c4d415a35 fix restore 2022-07-27 17:07:02 +03:00
SuhorukovAnton
a8ee357ae8 fix 2022-07-27 15:39:53 +03:00
pavelbannov
33769036d5 fix 2022-07-26 14:53:36 +03:00
pavelbannov
3d22992b7d Migrations: rename 2022-07-26 14:52:53 +03:00
pavelbannov
824232c01a fix 2022-07-25 19:31:37 +03:00
pavelbannov
17a15852a8 fix 2022-07-25 17:36:52 +03:00
pavelbannov
b1ae889f75 fix 2022-07-25 17:29:46 +03:00
pavelbannov
1d12faaa60 AutoMigrationCreator separated in two projects 2022-07-25 16:57:16 +03:00
SuhorukovAnton
09f3b29fe9 backup s3 2022-07-25 16:13:36 +03:00
pavelbannov
141257d3fc Postgre: fix 2022-07-25 14:26:58 +03:00
pavelbannov
8ba9be1208 deleted commonfilesdbcontext 2022-07-25 14:14:03 +03:00
pavelbannov
8acb550b08 files helpers moved to ASC.Files.Core 2022-07-25 14:03:31 +03:00
pavelbannov
57f797ab24 Merge branch 'develop' into feature/migrations-fix 2022-07-25 12:59:19 +03:00
pavelbannov
61ec4a18da migrations moved to external projects 2022-07-24 16:02:00 +03:00
Vashchuk Nikita
db9eaa3b08 fix 2022-07-22 23:09:16 +03:00
Vashchuk Nikita
b336eafa37 Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
 2022-07-22 22:40:58 +03:00
Vashchuk Nikita
94ca41011b recreate migrations 2022-07-22 22:34:48 +03:00
Vashchuk Nikita
d1f0d5403c modified AutoMigrationCreator 2022-07-22 22:34:12 +03:00
Vashchuk Nikita
76cfe882a9 fix contexts 2022-07-22 22:33:19 +03:00
Vashchuk Nikita
8a1a8b809f fix contexts 2022-07-22 22:31:42 +03:00
pavelbannov
bbc26cca4e fix 2022-07-22 18:30:44 +03:00
pavelbannov
5762bf1b04 Files: openedit method extended 2022-07-22 17:54:14 +03:00
pavelbannov
68907f79eb fix build 2022-07-22 11:54:42 +03:00
pavelbannov
5021a7c95e fix logs 2022-07-21 17:21:56 +03:00
pavelbannov
a5f4435b17 fix notify 2022-07-20 22:06:33 +03:00
pavelbannov
2c98ad88d8 fix 2022-07-20 19:25:59 +03:00
pavelbannov
b98524532f Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
#	common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
 2022-07-19 16:04:29 +03:00
pavelbannov
40a5fb35df fixed audit/login/last 2022-07-19 14:59:36 +03:00
pavelbannov
a2037eb91d fix build 2022-07-18 18:30:08 +03:00
pavelbannov
3bde5f83c9 removed ASC.Thumbnails.Svc 
fix ASC.Data.Storage.Encryption
fixed ASC.Projects
 2022-07-18 14:25:25 +03:00
pavelbannov
ccbac1d3fa consolidated packages 2022-07-18 13:50:05 +03:00
pavelbannov
d94904b6af removed voip 2022-07-18 12:24:12 +03:00
pavelbannov
e2b1e48fa9 removed voip service 2022-07-15 18:46:52 +03:00
Vashchuk Nikita
3d814ac78c small fix 2022-07-15 15:17:06 +03:00
Vashchuk Nikita
a9c60af9b7 small fix 2022-07-15 15:15:25 +03:00
Vashchuk Nikita
47d6e0ca1d moved connectionString to config and added functionality for entering connectionString from console 2022-07-15 14:53:21 +03:00
Vashchuk Nikita
e78be607ce small fix 2022-07-15 13:36:58 +03:00
Vashchuk Nikita
aa162790a7 Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix 
# Conflicts:
#	common/Tools/AutoMigrationCreator/AutoMigrationCreator.csproj
#	common/Tools/AutoMigrationCreator/Program.cs
#	common/Tools/AutoMigrationCreator/Utils/Options.cs
 2022-07-15 13:35:56 +03:00
Vashchuk Nikita
56e52f807b modified argsParser 2022-07-15 13:33:34 +03:00
pavelbannov
b72f441029 AutoMigrationCreator: fixed project type 2022-07-15 13:14:09 +03:00
pavelbannov
317a72898a refactoring 2022-07-15 12:48:15 +03:00
pavelbannov
d8980cc3a7 fix 57917 2022-07-14 20:00:43 +03:00
Vashchuk Nikita
6507c4b999 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	web/ASC.Web.Core/GlobalUsings.cs
 2022-07-14 11:56:07 +03:00
pavelbannov
2aec92c2e0 fix 2022-07-13 18:15:29 +03:00
pavelbannov
595cfcc2d2 fixed loginevent 2022-07-13 15:15:13 +03:00
pavelbannov
ed7ef58b53 Api: fixed loginevent 2022-07-13 14:21:25 +03:00
pavelbannov
04603f1314 Merge branch 'develop' into bugfix/Bug53348 2022-07-13 13:42:24 +03:00
pavelbannov
c1be6ecb61 Settings: ignore id 2022-07-12 15:33:46 +03:00
pavelbannov
c9f7e95d5c fixed iprestrictions method 2022-07-12 12:06:38 +03:00
pavelbannov
fd986320f2 Api: fixed maildomainsettings 2022-07-12 11:47:05 +03:00
Vashchuk Nikita
5cfb69ae48 recreated all migrations 2022-07-11 18:33:57 +03:00
Vashchuk Nikita
bc0ad53e8f changed int type to tinyint(1) for bool 2022-07-11 18:31:00 +03:00
SuhorukovAnton
70a8100235 Bug 53348 - Client.Account termination. Account deletion confirmation page when following an invalid link. 2022-07-11 15:58:13 +03:00
Vashchuk Nikita
f13263c75a fix contexts after merge 2022-07-11 15:43:06 +03:00
Vashchuk Nikita
ab5279ae4c fix Backup Context 2022-07-11 13:37:20 +03:00
Vashchuk Nikita
e49d082fa3 Merge branch 'develop' into feature/migrations-fix 
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Messaging/EventMessage.cs
#	common/ASC.Core.Common/Messaging/LoginEvent.cs
#	common/ASC.Core.Common/Messaging/MessageTarget.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
#	common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Resource.Manager/ResourceData.cs
#	common/services/ASC.AuditTrail/GlobalUsings.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	web/ASC.Web.Api/GlobalUsings.cs
 2022-07-11 13:28:49 +03:00
Vashchuk Nikita
dcd6faf781 fix for merge 2022-07-11 12:29:45 +03:00
Vashchuk Nikita
4628769136 fix Contexts, 
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
 2022-07-08 14:24:18 +03:00
Vashchuk Nikita
841dd52eac fix AutoMigrationCreator 2022-07-08 14:19:13 +03:00
pavelbannov
7af929fee8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2022-07-07 17:41:41 +03:00
Nikolay Rechkin
cac16ace79 Push: api 2022-07-07 14:46:35 +03:00
pavelbannov
baa72db316 removed referencies 2022-07-06 18:47:16 +03:00
SuhorukovAnton
aeac8613a8 Merge branch 'develop' into features/enum_generator 2022-07-05 17:22:43 +03:00
Vashchuk Nikita
5f7b346334 added functionality for applying migrations 2022-07-05 17:20:36 +03:00
SuhorukovAnton
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
Nikolay Rechkin
273854bf84 Push: fix FirebaseHelper 2022-07-05 15:55:46 +03:00
pavelbannov
468d0d569e EmployeeDtoHelper: user cache 2022-07-05 12:55:19 +03:00
pavelbannov
191e66a238 Notify: fix warning 2022-07-04 16:55:11 +03:00
pavelbannov
02653c3568 fix payment 2022-07-04 14:54:24 +03:00
Maria-Sukhova
fb09f62881 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-04 11:39:38 +03:00
Maria-Sukhova
0f901bf6e3 added hy-AM 2022-07-04 11:38:57 +03:00
pavelbannov
5d4715e674 fix 2022-07-01 17:37:09 +03:00
pavelbannov
a289f9594a modified LdapNotifyHelper to BackgroundService 2022-07-01 14:49:59 +03:00
Vashchuk Nikita
bdbd6bd65e Recreating and fixing migrations 2022-07-01 14:27:28 +03:00
Vashchuk Nikita
5a0acc8eaa Renaming folders for contexts and models 2022-07-01 14:23:07 +03:00
Vashchuk Nikita
71d7638340 added CustomMySqlMigrationsSqlGenerator 2022-07-01 13:57:40 +03:00
pavelbannov
329ec57aa2 Merge branch 'develop' into feature/LDAP-new 2022-07-01 13:15:52 +03:00
pavelbannov
7e34e45371 ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
pavelbannov
45cd9434f4 fix Bug 57888 2022-06-30 19:41:17 +03:00
pavelbannov
f24fc8e19e fix 2022-06-30 17:12:49 +03:00
pavelbannov
74d238bde8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Common/Logging/Log.cs
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Backup.Core/BackupResource.Designer.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
#	products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
#	products/ASC.Files/Core/Core/Compress/CompressToZip.cs
#	products/ASC.Files/Core/Core/Compress/ICompress.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
 2022-06-30 16:13:31 +03:00
pavelbannov
630250b439 fix tests 2022-06-30 12:07:30 +03:00
pavelbannov
75be0827d7 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 
# Conflicts:
#	products/ASC.Files/Service/GlobalUsings.cs
 2022-06-29 20:01:27 +03:00
pavelbannov
35ab5a3531 fix order 2022-06-29 19:43:29 +03:00
Alexey Bannov
d78509993f fixed Bug 53280 2022-06-29 18:40:35 +03:00
pavelbannov
5f6851253f fix bug 57725 2022-06-29 15:10:56 +03:00
pavelbannov
9e05dc641a notify: temp logs 2022-06-28 23:32:33 +03:00
Alexey Bannov
e483177f24 fixed: Bug 57693 2022-06-28 19:42:13 +03:00
SuhorukovAnton
fa815c6254 fix order endpoints 2022-06-28 15:53:06 +03:00
pavelbannov
f9f73f733f fixed log path 2022-06-28 15:50:13 +03:00
SuhorukovAnton
83bb63ff0c remove waste 2022-06-28 15:33:22 +03:00
SuhorukovAnton
d1063df40c Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-28 15:32:06 +03:00
pavelbannov
e17f49e344 Merge branch 'develop' into feature/LDAP-new 
# Conflicts:
#	ASC.Web.sln
#	common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/GlobalUsings.cs
 2022-06-28 14:30:40 +03:00
pavelbannov
dd52a695e5 fix build 2022-06-27 23:18:23 +03:00
pavelbannov
6d98440200 az resources 2022-06-27 14:00:23 +03:00
Nikolay Rechkin
14404198c2 Push: fixed a sender sink 2022-06-27 13:36:38 +03:00
pavelbannov
4ad4c34b34 fix 2022-06-24 16:23:56 +03:00
pavelbannov
fef096b0a5 fix generating thumbnails for video 2022-06-24 16:22:52 +03:00
pavelbannov
c9eaeed719 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 
# Conflicts:
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
 2022-06-23 12:09:13 +03:00
pavelbannov
5bcbae5711 fix 2022-06-23 11:48:31 +03:00
Vashchuk Nikita
470c5a4d41 added migrations for backup 2022-06-23 11:34:53 +03:00
Alexey Bannov
f2da6fc55c
Merge pull request #693 from ONLYOFFICE/feature/docspace 
Feature/docspace
 2022-06-22 11:55:36 +04:00
MaksimChegulov
aad8a92b4c RoomInvite replaced by LinkInvite 2022-06-21 20:33:05 +03:00
MaksimChegulov
5e491a6849 Common: fix 2022-06-21 20:32:29 +03:00
pavelbannov
5aef5524f1 fix Bug 57641 2022-06-21 18:19:55 +03:00
Vashchuk Nikita
37031d9e3f fix backup context 2022-06-21 17:12:00 +03:00
SuhorukovAnton
1aadf26fe2 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 17:05:04 +03:00
Alexey Bannov
b78feb8ae9 refactoring 2022-06-21 12:57:20 +03:00
SuhorukovAnton
0a27a98511 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-21 10:52:53 +03:00
Alexey Bannov
03e756277b fixed warnings 2022-06-20 17:01:59 +03:00
MaksimChegulov
e68ac70005 Merge branch 'develop' into feature/docspace 2022-06-20 12:15:08 +03:00
pavelbannov
e2cee2c2fc Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.FederatedLogin/OAuth20Token.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/ASC.Resource.Manager/Program.cs
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	config/appsettings.json
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
#	products/ASC.Files/Core/Core/ThumbnailSettings.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
#	products/ASC.Files/Core/Model/SessionModel.cs
#	products/ASC.Files/Core/Services/DocumentService/Configuration.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileUploader.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/DocStore
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	products/ASC.People/Server/ASC.People.csproj
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/Resource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
#	web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
 2022-06-19 22:44:48 +03:00
pavelbannov
72b0a81f51 fix 2022-06-17 20:51:01 +03:00
pavelbannov
8ea04bcc81 Merge branch 'develop' into feature/12.0 
# Conflicts:
#	common/ASC.MessagingSystem/Data/MessagesRepository.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
 2022-06-17 19:19:00 +03:00
pavelbannov
945e9d8efe moved from ddf515b8 2022-06-17 18:46:16 +03:00
SuhorukovAnton
29d3bb3fee Merge branch 'develop' into feature/get-thumbnail-from-thirdparty 2022-06-17 13:18:03 +03:00
MaksimChegulov
0fbe11ed1c Merge branch 'develop' into feature/docspace 2022-06-17 10:26:51 +03:00
pavelbannov
b62ba1d729 fix tests 2022-06-17 10:17:17 +03:00
MaksimChegulov
dad4b12985 Files: refactor 2022-06-16 18:35:54 +03:00
MaksimChegulov
39e7b28005 Files: refactor 2022-06-16 18:26:53 +03:00
pavelbannov
56ece27e1b moved from ddf515b8 2022-06-16 17:16:46 +03:00
Nikolay Rechkin
f59460405f Push: push sender 2022-06-16 16:07:49 +03:00
pavelbannov
c9fb0d3dac moved from ddf515b8 2022-06-16 11:13:53 +03:00
Nikolay Rechkin
1e47bf9bf3 Push: configuration 2022-06-15 17:25:23 +03:00
Vashchuk Nikita
c1097acbb8 fix static, braces, log 2022-06-15 15:39:37 +03:00
pavelbannov
f3f3ed96ae moved from ddf515b8 2022-06-15 12:46:21 +03:00
Nikolay Rechkin
34bc4e143c Push: helper, dao 2022-06-15 12:01:07 +03:00
pavelbannov
35bebe49f9 moved from ddf515b8 2022-06-14 11:11:41 +03:00
MaksimChegulov
4682001699 People: fix System.NullReferenceException 2022-06-10 22:28:50 +03:00
Alexey Safronov
6624a7e7f6 Web: Translations: Added new excludes for DublicatesFilesByMD5HashTest 2022-06-10 12:33:17 +03:00
pavelbannov
46ba74cc6f moved from ddf515b8 2022-06-09 20:33:08 +03:00
Alexey Bannov
a3fec128b5 log: fixed character case 2022-06-09 19:37:59 +03:00
pavelbannov
a9b826f8f5 moved from ddf515b8 2022-06-09 18:36:57 +03:00
pavelbannov
9edcce8858 moved from ddf515b8 2022-06-09 15:11:45 +03:00
Alexey Bannov
7b1ea58cdf fileconverter: moved timer to separete worker service 2022-06-08 17:25:25 +03:00
MaksimChegulov
b693779ea1 Merge branch 'develop' into feature/docspace-pin 2022-06-08 16:38:16 +03:00
pavelbannov
02b4031ba0 fix Bug 57463 2022-06-08 12:53:33 +03:00
Vashchuk Nikita
8410299051 modified logging 2022-06-08 12:42:49 +03:00
pavelbannov
cbd73be90b moved from ddf515b8 2022-06-08 12:02:40 +03:00
pavelbannov
c1d152becc moved from ddf515b8 2022-06-07 21:00:08 +03:00
pavelbannov
8c56de7a26 moved from ddf515b8 2022-06-05 18:44:37 +03:00
Maria-Sukhova
cd4540eaee update spellcheck-excludes.json 2022-06-03 16:32:35 +03:00
SuhorukovAnton
a0729a8084 thumbnail: first version 
add from google and dropbox
 2022-06-03 10:41:05 +03:00
MaksimChegulov
57df81aa76 Files: added logo audit, fix 2022-06-03 01:27:56 +03:00
pavelbannov
b6e82bd7c9 moved from ddf515b8 2022-06-02 19:24:28 +03:00
Maria-Sukhova
9bc7e84eab update spellcheck-excludes.json 2022-06-02 18:41:24 +03:00
pavelbannov
6b2ba0d4ed moved from ddf515b8 2022-06-02 15:42:45 +03:00
Maria-Sukhova
a8f8ebdd48 update spellcheck-excludes.json 2022-06-02 13:20:53 +03:00
pavelbannov
34370cf6e2 fix socketio 2022-06-01 20:24:50 +03:00
pavelbannov
a861268e4f moved from ddf515b8 2022-06-01 17:07:08 +03:00
Alexey Bannov
3ebd67f444 merge from develop 2022-06-01 14:44:30 +03:00
Maria-Sukhova
460d9e4ad5 update spellcheck-excludes.json 2022-05-31 18:36:08 +03:00
SuhorukovAnton
cc4f8a15b0 unified config style 2022-05-31 16:04:24 +03:00
pavelbannov
fc94f2f445 moved from ddf515b8 2022-05-30 19:13:50 +03:00
Maria-Sukhova
30b89d1ae0 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-05-30 17:18:53 +03:00
Maria-Sukhova
df35cef4a6 update spellcheck-excludes.json 2022-05-30 17:17:38 +03:00
Alexey Safronov
bfdae07b28 Web: Translations: SpellCheck: Added support of additional dictionaries: lo_LA 2022-05-30 16:44:41 +03:00
Alexey Safronov
d7967854d9 Web: Translations: SpellCheck: Added support of additional dictionaries: fi_FI 2022-05-30 15:45:31 +03:00
SuhorukovAnton
e4a8c11602 Merge branch 'develop' into feature/LDAP-new 2022-05-30 14:20:46 +03:00
Maria-Sukhova
883391eff0 update spellcheck-excludes.json 2022-05-27 17:25:53 +03:00
Maria-Sukhova
0208f8f39d update spellcheck-excludes.json 2022-05-27 16:13:35 +03:00
Maria-Sukhova
b0e8fd14dc update spellcheck-excludes.json 2022-05-27 14:07:53 +03:00
pavelbannov
3f217af868 fix 57264 2022-05-26 22:00:09 +03:00
Maria-Sukhova
918449e650 update spellcheck-excludes.json 2022-05-26 19:21:10 +03:00
Maria-Sukhova
2b076f1c50 update spellcheck-excludes.json 2022-05-26 14:59:22 +03:00
Maria-Sukhova
4946e04390 update spellcheck-excludes.json 2022-05-26 13:23:43 +03:00
Maria-Sukhova
9342b4e651 update spellcheck-excludes.json 2022-05-26 13:16:12 +03:00
pavelbannov
e7886aff2c Log: refactoring 2022-05-26 12:01:54 +03:00
Maria-Sukhova
6ad9a334ac update spellcheck-excludes.json 2022-05-25 18:39:04 +03:00
Maria-Sukhova
83e6b48501 update spellcheck-excludes.json 2022-05-25 17:51:13 +03:00
Alexey Bannov
e01858d2e8 merge from develop 2022-05-25 16:58:31 +03:00
Alexey Bannov
e6d7979e92 dbcontext: EnableRetryOnFailure for MySQL provider 2022-05-25 16:55:38 +03:00
MaksimChegulov
664e718fa0 Files: added custom tags audit 2022-05-25 15:34:38 +03:00
pavelbannov
a66c03aa86 Merge branch 'develop' into feature/logger-refactoring 
# Conflicts:
#	common/ASC.Common/Caching/AscCache.cs
#	common/ASC.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Notify/Telegram/TelegramHelper.cs
#	common/ASC.Data.Backup.Core/Service/ProgressItems/RestoreProgressItem.cs
#	common/ASC.Data.Storage/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/GlobalUsings.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/IntegrationEvents/EventHandling/BackupDeleteScheldureRequestedIntegrationEventHandler.cs
#	common/services/ASC.Data.Backup.BackgroundTasks/Services/BackupSchedulerService.cs
#	common/services/ASC.Notify/GlobalUsings.cs
#	common/services/ASC.Notify/IntegrationEvents/EventHandling/NotifyInvokeSendMethodRequestedIntegrationEventHandler.cs
#	common/services/ASC.Notify/Services/NotifySenderService.cs
#	common/services/ASC.TelegramService/GlobalUsings.cs
#	common/services/ASC.TelegramService/TelegramHandler.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/GlobalUsings.cs
#	products/ASC.Files/Service/Thumbnail/IntegrationEvents/EventHandling/ThumbnailRequestedIntegrationEventHandler.cs
#	products/ASC.People/Server/Api/UserController.cs
#	web/ASC.Web.Api/Api/Settings/StorageController.cs
 2022-05-24 23:13:57 +03:00
pavelbannov
b525696b03 fix usings 2022-05-24 18:41:28 +03:00
Maria-Sukhova
1936498713 update spellcheck-excludes.json 2022-05-24 18:40:49 +03:00
Maria-Sukhova
a84cf572e4 update spellcheck-excludes.json 2022-05-24 18:27:49 +03:00
pavelbannov
02570e12cf Merge branch 'develop' into feature/cluster-services 2022-05-24 17:24:25 +03:00
Maria-Sukhova
344d46ddae update spellcheck-excludes.json 2022-05-24 16:01:12 +03:00
Maria-Sukhova
6e401cb7f9 update spellcheck-excludes.json 2022-05-24 14:59:50 +03:00
Nikita
1d2521c399 fix 2022-05-24 12:59:04 +03:00
SuhorukovAnton
4507ca6549 update nlog 2022-05-24 10:41:07 +03:00
Nikita
55a702bd2a fix 2022-05-23 23:44:45 +03:00
Alexey Bannov
2a673036ff encryption service: migrate from ICacheNotify to RabbitMQ 2022-05-23 22:06:22 +03:00
Alexey Safronov
4adc4ce5b6 Web: Translations: Added new SingleKeyFilesTest 2022-05-23 21:34:14 +03:00
Alexey Safronov
dade86cb3e Web: Translations: Commented annoying TranslationsEncodingTest (too many false alarms) 2022-05-23 21:33:05 +03:00
pavelbannov
13ad4381f7 Api: removed CustomHttpMethodAttribute 
added AllowNotPaymentAttribute
 2022-05-23 18:48:23 +03:00
Maria-Sukhova
5510a18e58 update spellcheck-excludes.json 2022-05-23 18:19:26 +03:00
Maria-Sukhova
78423fc7ca update spellcheck-excludes.json 2022-05-23 18:09:47 +03:00
Nikita
a7b9b77613 fix 2022-05-23 16:38:05 +03:00
Alexey Bannov
79b713804e telegram: refactoring 2022-05-23 12:21:04 +03:00
SuhorukovAnton
91c4e454c5 add loggers 2022-05-20 18:24:41 +03:00
SuhorukovAnton
a585a425bc fix 2022-05-20 17:02:09 +03:00
SuhorukovAnton
75da995099 Merge branch 'develop' into feature/logger-refactoring 2022-05-20 17:01:51 +03:00
Pavel Bannov
f5baafdfa2
Merge pull request #649 from ONLYOFFICE/feature/logger-Feed.Aggregator 
Feature/logger feed.aggregator
 2022-05-20 16:21:18 +03:00
Pavel Bannov
cc807b3ba0
Merge pull request #647 from ONLYOFFICE/feature/logger-Data.Backup.Core 
Feature/logger data.backup.core
 2022-05-20 16:20:39 +03:00
Pavel Bannov
ac9b82dba4
Merge pull request #645 from ONLYOFFICE/feature/logger-ClearEvents 
Feature/logger clear events
 2022-05-20 16:18:59 +03:00
SuhorukovAnton
3911d4837b fix 2022-05-20 16:07:47 +03:00
SuhorukovAnton
a47c33f950 fix 2022-05-20 15:53:38 +03:00
SuhorukovAnton
7bc2d18b79 fix 2022-05-20 15:47:32 +03:00
Pavel Bannov
cb525d4929
Merge pull request #654 from ONLYOFFICE/feature/logger-MessagingSystem 
logger-MessagingSystem
 2022-05-19 17:20:04 +03:00
Pavel Bannov
d6eed4b8d7
Merge pull request #644 from ONLYOFFICE/feature/logger-AuditTrail 
Feature/logger audit trail
 2022-05-19 15:57:06 +03:00
Pavel Bannov
0096efcd04
Merge pull request #657 from ONLYOFFICE/feature/logger-TelegramService 
Feature/logger telegram service
 2022-05-19 15:54:30 +03:00
Pavel Bannov
d9da7c8773
Merge pull request #643 from ONLYOFFICE/feature/logger-Api.Core 
logger-Api.Core
 2022-05-19 15:49:36 +03:00
Pavel Bannov
f94409cc7c
Merge pull request #655 from ONLYOFFICE/feature/logger-Notify 
logger-Notify
 2022-05-19 14:47:16 +03:00
Pavel Bannov
8d25b80ce0
Merge pull request #653 from ONLYOFFICE/feature/logger-IPSecurity 
Feature/logger ip security
 2022-05-19 14:07:52 +03:00
Pavel Bannov
e602d183ab
Merge pull request #646 from ONLYOFFICE/feature/logger-Data.Backup.BackgroundTasks 
Feature/logger data.backup.background tasks
 2022-05-19 13:41:57 +03:00
Pavel Bannov
f0fc4cce50
Merge pull request #648 from ONLYOFFICE/feature/logger-EventBus.RabbitMQ 
Feature/logger event bus.rabbit mq
 2022-05-19 13:24:25 +03:00
Alexey Bannov
cff4f0188b migrate from MemoryCache.Default to IMemoryCache 2022-05-18 19:07:09 +03:00
Nikita
bb23b167a0 fix 2022-05-18 14:32:42 +03:00
Nikita
b1ad63cdac fix 2022-05-18 13:54:13 +03:00
Nikita
77e435ede3 fix 2022-05-18 13:50:39 +03:00
Nikita
b76b97af89 Merge branch 'develop' into feature/LDAP-new 2022-05-18 13:38:00 +03:00
Nikita
6451ac6329 fix 2022-05-18 13:36:35 +03:00