28e1c652d9
analizators/s4456
2021-12-28 16:39:44 +03:00
c3321206bd
analizators/s4487
2021-12-28 16:08:11 +03:00
0a786bbfa3
analizators/s4830
2021-12-28 15:00:48 +03:00
eb02c96697
microsoft recomended store the System.Guid type as string type in protobuf format
2021-12-23 18:29:35 +03:00
dcc7986a90
map ICacheNotify<> to RedisCache<>
2021-12-23 18:27:58 +03:00
6d250efffa
add *.dll for support redis + update Grpc.* dll
2021-12-23 16:17:31 +03:00
33026385e2
Web: Tests: Added new excludes to spellcheck-excludes.json
2021-12-23 11:36:59 +03:00
a785eb2692
Web: Tests: Added spellcheck-excludes.json and opportunity to skip some spell check issues
2021-12-22 18:17:22 +03:00
05f5358fb9
Web: Tests: Fix some false alarms on SpellCheckTest
2021-12-21 20:18:37 +03:00
33f9485230
Web: Tests: Skip some hashes for DublicatesFilesByMD5HashTest
2021-12-21 17:05:24 +03:00
4274e3a581
Web: Tests:
...
+ Added new SpellCheckTest() and submodule (common/Tests/Frontend.Translations.Tests/dictionaries)
+ Split tests on categories FastRunning|LongRunning
+ Added new build/run.translations.spellcheck.test.bat
2021-12-21 16:59:04 +03:00
649e1b420a
Web: Tests: Added Md5Hash property
2021-12-21 16:12:37 +03:00
70bfe70563
Merge branch 'develop' into feature/optimization
2021-12-16 18:14:54 +03:00
46386a6f6c
Web: Tests: Added new DublicatesFilesByMD5HashTest() test
2021-12-16 15:53:58 +03:00
fb3bfba1bd
Files: optimization
2021-12-16 15:49:35 +03:00
04ccfb2caa
Webhooks: fix empty result
2021-12-14 15:51:03 +03:00
b42fd9c03f
Merge branch 'develop' into feature/reworked-user-service
2021-12-13 17:40:40 +03:00
7bab795feb
Web: Tests: Added new TranslationsEncodingTest()
2021-12-13 13:18:13 +03:00
0771a54c47
Optimization
2021-12-09 20:23:06 +03:00
0bd39bfc19
Core: optimization
2021-12-08 22:18:04 +03:00
c87a831b89
Files: optimization
2021-12-08 13:14:44 +03:00
1ef04fd3d1
Web: Tests: Fix formatting
2021-12-03 12:15:21 +03:00
1ea835b0bf
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
2021-12-01 12:05:51 +03:00
197a360f45
Files: fixed files_convert data
2021-11-30 14:35:43 +03:00
5dff970a42
AutoMigrationCreator: add new ef core dependencies
2021-11-30 13:32:16 +03:00
6f41a7f028
AutoMigrationCreator: net6
2021-11-30 12:02:20 +03:00
b2c123d6f4
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
2021-11-30 11:46:22 +03:00
1ab4e0e0b0
Web: Tests: Fix MidpointRounding
2021-11-29 16:07:04 +03:00
ab4bcdfac5
Web: Tests: Speed up tests (replaced SetUp to OneTimeSetUp) + Added new ParseJsonTest
2021-11-29 15:53:46 +03:00
fbdb776d69
fix
2021-11-29 14:34:35 +03:00
85316c9d63
Moved from 45122194
2021-11-29 14:11:03 +03:00
043dd3d180
net6: bugfix encrypt
2021-11-26 13:53:06 +03:00
384e012c5f
net 6: remove TryUseWindowsService
2021-11-25 16:48:08 +03:00
fde636c586
net 6: update packages
2021-11-25 16:41:24 +03:00
58d84912dd
fix
2021-11-25 11:23:35 +03:00
13e13f2303
Net: fix requests
2021-11-24 22:34:39 +03:00
b74e4ccfd1
Removed unused dependencies. Fixed tests
2021-11-24 12:39:39 +03:00
59c88e2006
up to 6.0.0
2021-11-23 17:56:27 +03:00
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
6ccda4d68d
UserManager: revert cache
2021-11-23 15:25:34 +03:00
197ce829b4
Merge branch 'develop' into feature/reworked-user-service
2021-11-23 15:01:23 +03:00
51d6f72862
Web: Files: Fix translation
2021-11-22 14:58:06 +03:00
5e9ad53f6f
Web: Tests: Fix key 'ns' issues
2021-11-22 11:19:52 +03:00
f675415228
Merge branch 'master' into release/v1.1.0
...
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# packages/browserslist-config-asc/package.json
# packages/debug-info/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/public/locales/en/SelectFile.json
# products/ASC.Files/Client/public/locales/en/SelectFolder.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/createUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Login/package.json
2021-11-21 14:26:20 +03:00
d31ea87211
Merge branch 'master' into develop
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/sub-components/section-body.js
# packages/asc-web-components/table-container/TableHeaderCell.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Client/src/store/UploadDataStore.js
2021-11-21 13:57:55 +03:00
cc35174d16
moved from 043e301
2021-11-16 20:40:15 +03:00
c7c7267a9a
Test: Added new WrongTranslationVariablesTest and fix it's issues
2021-11-13 19:03:10 +03:00
0192c3265b
Billing: fix
2021-11-12 15:33:03 +03:00
bf80a38df0
Tests: Fix NotFoundKeysTest for "Home:EmptyFolderHeader" and "Home:ContainsSpecCharacter"
2021-11-08 15:52:16 +03:00
90199126c7
Tests: Skip Banner.js (translations from firebase) from NotFoundKeysTest
2021-11-08 15:46:15 +03:00
1bc93172d3
OAuth: fix
2021-11-02 20:39:30 +03:00
aa79ef2c9d
Merge branch 'hotfix/v1.0.1' into feature/desktop-login
2021-11-02 14:03:26 +03:00
49c820b779
Merge branch 'develop' into feature/reworked-user-service
2021-11-02 13:07:07 +03:00
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
3b7f02339b
Webhooks: fix
2021-10-29 20:02:45 +03:00
1882f9db43
Fixed settings issue
2021-10-29 17:21:51 +03:00
b15bc7b5cf
WebHook: fix service
2021-10-29 13:23:37 +03:00
26511d9fb7
Merge branch 'develop' into feature/webhooks
...
# Conflicts:
# ASC.Tests.sln
2021-10-29 13:18:57 +03:00
8c7815d9a5
Merge pull request #427 from ONLYOFFICE/feature/sc
...
Feature/sc
2021-10-28 18:49:01 +03:00
40dc6a8e86
fix loading products
2021-10-28 16:07:14 +03:00
3acecdc9ad
Migration: fix warnings
2021-10-28 16:04:36 +03:00
a69df29e7d
Services: fix httpContextAccessor
2021-10-28 13:23:26 +03:00
08205c2780
setup Kestrel for ApiSystem
2021-10-27 20:03:59 +03:00
0215599566
merge from develop
2021-10-27 19:37:12 +03:00
627642e838
fix warning
2021-10-27 12:33:39 +03:00
399377ff43
Merge branch 'develop' into feature/dbcontextmanager-optimization
2021-10-26 22:05:41 +03:00
957aa8bd81
fixed started services
2021-10-26 20:09:19 +03:00
cb8bc701ec
fix migrations
2021-10-26 16:14:40 +03:00
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
403388fbf1
Added solution filter
...
Removed unused services
replaced sh with bat
start service from source
2021-10-25 14:29:36 +03:00
4b2f7242fc
Tools: refactor
2021-10-22 20:05:40 +03:00
b4069a7281
Tools: remove
2021-10-22 20:05:28 +03:00
55a28d2d83
Tools: add references
2021-10-22 20:05:11 +03:00
61068e6110
Tools: refactor
2021-10-22 20:04:26 +03:00
54803deaed
Tools: add project info model
2021-10-22 20:03:59 +03:00
5592db68ed
Tools: add search for several projects
2021-10-22 20:03:32 +03:00
cbc07325ca
Tools: refactor
2021-10-22 20:02:47 +03:00
c8055f879e
Tools: replace constant assembly name with mutable
2021-10-22 20:02:19 +03:00
5334e97313
add solution parser
2021-10-22 19:57:33 +03:00
c02e5867d7
Storage: fix conflict namespace
2021-10-22 19:51:51 +03:00
30277d4fb3
net6: bugfix
2021-10-22 17:20:40 +03:00
e5e4a89e5b
Merge branch 'develop' into feature/net6
2021-10-22 16:10:37 +03:00
018c1939ab
replace type name with type
2021-10-22 13:08:09 +03:00
5eab8516f8
EF: removed unused class
2021-10-22 12:30:06 +03:00
36db823276
removed unused class
2021-10-22 11:54:45 +03:00
dd8f77f827
Merge branch 'develop' into feature/wizard/migration
2021-10-22 11:44:21 +03:00
e310d5e655
net6: httpClient: add using
2021-10-21 17:56:31 +03:00
f6f317ec42
net6: refactoring and bugfix
2021-10-21 16:23:26 +03:00
ed8487e99f
Webhook: format
2021-10-19 19:53:28 +03:00
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
9f12c95828
Merge branch 'feature/webhooks' of github.com:ONLYOFFICE/AppServer into feature/webhooks
2021-10-19 15:25:53 +03:00
4bd4954ad4
Merge branch 'release/1.0.0' into feature/desktop-login
2021-10-19 13:10:47 +03:00
9dd28a144d
Web: Fixed callback pages, added login callback for desktop client
2021-10-19 10:31:34 +03:00
fb7922f579
Thirdparty: login. Desktop
2021-10-15 11:34:34 +03:00
803a8f3baa
fixed bug 53156: removed constructor without HttpContextAccessor parameter.
2021-10-14 18:36:31 +03:00
a324b8b9b9
fixed bug 52923 for s3 storage
2021-10-13 16:23:54 +03:00
735a9b60cf
net6: warning CA1416
...
also remove unnecessary usings
2021-10-13 11:07:03 +03:00
66d126410c
Login: added desktop param
2021-10-13 10:25:19 +03:00
f5a25b80be
update migrations
2021-10-12 17:54:11 +03:00
0fb10454ca
refactor
2021-10-12 17:51:36 +03:00
24f658754f
refactor
2021-10-12 17:51:13 +03:00
4c972a48c2
changed last migration searching logic
2021-10-12 17:50:42 +03:00
9db8371344
add contexts search for all providers
2021-10-12 17:48:33 +03:00
1a7021d6c4
move to directories
2021-10-12 17:45:12 +03:00
a19dfef1ab
update postgresql migrations
2021-10-12 13:25:56 +03:00
55da5e7c54
add postgresql model configuring
2021-10-12 13:24:19 +03:00
1ddbb41052
rename Postgre to PostgreSql
2021-10-12 13:23:20 +03:00
ae9a3187bc
net6: warning SYSLIB0014
2021-10-12 13:14:33 +03:00
b483025437
add provider name property
2021-10-12 12:43:49 +03:00
9541b9e6b4
optimization migration
2021-10-12 12:04:24 +03:00
94c81d11d1
add generation migration name logic
2021-10-11 17:34:11 +03:00
494a201a0b
cosmetic changes
2021-10-11 17:25:25 +03:00
243a2cb55f
update migration
2021-10-11 17:24:15 +03:00
8b4d793d78
remove unnecessary HasData
2021-10-11 17:23:39 +03:00
0066585554
replace DateTime.Now to fixed DateTime
2021-10-11 17:23:02 +03:00
73624e0aed
add auto migration creator
2021-10-07 12:52:35 +03:00
8ced3a052a
change access modificator
2021-10-07 12:51:29 +03:00
040f3065c5
fix
2021-10-07 12:51:10 +03:00
6cc771bb87
fix
2021-10-07 12:50:57 +03:00
814fe65535
fix
2021-10-07 12:49:55 +03:00
05b2c63543
net6: warning SYSLIB0013
2021-10-07 12:05:32 +03:00
1ac44d3c92
net6: warning SYSLIB0021
2021-10-07 12:03:13 +03:00
7a380542aa
net6: warning SYSLIB0023
2021-10-07 12:00:26 +03:00
498a896322
fix Bug 50254
2021-10-05 22:28:07 +03:00
8409b10705
net6: warning SYSLIB0022
2021-10-01 13:34:47 +03:00
0f833ae1de
net6: warning SYSLIB0020
2021-10-01 13:26:36 +03:00
24224a7437
Files: fix rename folders. fix favorites
2021-09-30 21:26:01 +03:00
1bc64ce5ae
Files: check state before get stream
2021-09-30 09:51:38 +03:00
6c5d0d8940
add GetUserGroupRef
2021-09-28 20:32:22 +03:00
1c4d1efa83
fix
2021-09-28 20:30:02 +03:00
82cb6ddb6a
add scoped caching, remove unnecessary
2021-09-28 20:29:25 +03:00
2bd3a5764d
add method GetUserGroupRef, change return type
2021-09-28 20:26:16 +03:00
d27160cf98
Fix mobile app requests
2021-09-28 14:41:35 +03:00
511cea560b
add scoped caching
2021-09-27 19:59:09 +03:00
a0e39d0112
add ScopeCache
2021-09-27 19:54:01 +03:00
e755d2eda8
renamed providers to lowercase
2021-09-24 17:36:46 +03:00
90bb2ef44a
fixed bearer
2021-09-24 12:08:10 +03:00
315665e87a
BuildAndDeploy
2021-09-23 20:58:39 +03:00
f4feb48d2c
fix dependencies
2021-09-22 19:51:06 +03:00
d32f555706
ResManager: fix
2021-09-17 16:46:24 +03:00
diana-vahomskaya
a5e1609dac
two methods
2021-09-16 11:25:17 +03:00
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
ec66a65d38
User: fix request
2021-09-10 17:00:26 +03:00
2e20b4958d
fix CookieAuthHandler
2021-09-08 13:16:58 +03:00
51d905abc6
Cookie: logout after failed auth
2021-09-07 22:58:01 +03:00
5a5bb8fb25
Merge branch 'develop' into release/1.0.0
2021-09-05 22:59:31 +03:00
1e77063d32
fix Bug 51866
2021-09-05 22:59:14 +03:00
d099326e7f
Merge branch 'develop' into feature/backup.core
...
# Conflicts:
# common/services/ASC.Data.Backup/Program.cs
2021-09-05 12:50:05 +03:00
ec7fcd34b3
Merge branch 'develop' into release/1.0.0
2021-09-03 18:07:09 +03:00
9cb01be544
Elastic: removed unused isInit
2021-09-03 18:05:05 +03:00
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
0970b1b420
Merge branch 'develop' into release/1.0.0
2021-09-02 23:50:18 +03:00
211224ca1a
Storage: fix S3
2021-09-02 23:49:59 +03:00
c5b135afbe
backup.core: remove waste
2021-09-02 16:11:41 +03:00
8171563965
backup.core: move backup.core
2021-09-02 15:41:54 +03:00
fa204303f5
Merge branch 'develop' into release/1.0.0
2021-09-01 16:08:41 +03:00
d8654444c6
backup.core: fix
2021-08-31 16:59:32 +03:00
115d752582
backup.core: fix
2021-08-31 15:43:40 +03:00
a812971c07
Merge branch 'develop' into feature/backup.core
2021-08-31 13:55:47 +03:00
4b3cb1b4fb
backup.core: first version
2021-08-31 12:40:28 +03:00
f62209d88e
Merge branch 'develop' into feature/webhooks
2021-08-30 19:18:18 +03:00
a84bddad3c
fix
2021-08-30 19:17:57 +03:00
2addb81adf
Quota: Price2 removed
2021-08-30 18:19:20 +03:00
Vashchuk Nikita
5e6bd9ee5f
fix
2021-08-27 18:33:21 +03:00
Vashchuk Nikita
0521d8af09
fix
2021-08-27 17:50:49 +03:00
Vashchuk Nikita
d66600b6c7
fix
2021-08-27 10:50:52 +03:00
Vashchuk Nikita
e5b40b3d0c
fix ASC.Webhooks.Tests
2021-08-27 00:15:47 +03:00
Vashchuk Nikita
45d221a109
Split webhooks into service and core
2021-08-26 21:43:41 +03:00
dd9e5e9b5d
Merge branch 'develop' into feature/webhooks
2021-08-26 15:17:53 +03:00
14e8c59b17
Merge branch 'develop' into release/1.0.0
2021-08-25 21:17:41 +03:00
b791586252
net6
2021-08-25 18:26:13 +03:00
Vashchuk Nikita
c41361bdd8
fix
2021-08-24 11:08:58 +03:00
a0f5c4231f
fixed run via vs
2021-08-23 15:55:19 +03:00
Vashchuk Nikita
c851641b6c
Merge remote-tracking branch 'remotes/origin/feature/webhooks' into feature/webhooks
2021-08-23 13:01:48 +03:00
Vashchuk Nikita
9f0e41b880
Merge branch 'develop' into feature/webhooks
2021-08-23 12:36:01 +03:00
a471a19dfd
Merge branch 'develop' into release/1.0.0
2021-08-23 11:50:35 +03:00
610e31ec3b
fixed equals
2021-08-20 19:04:55 +03:00
e5faa90adb
removed nuget warnings
2021-08-20 16:53:27 +03:00
9207238d8d
Merge branch 'develop' into release/1.0.0
2021-08-20 16:12:40 +03:00
9f83801f88
Nlog: optimization
2021-08-20 15:42:43 +03:00
91fd7615b3
Optimization
2021-08-20 10:52:52 +03:00
Vashchuk Nikita
3dc5ca5afc
Merge branch 'develop' into feature/webhooks
2021-08-19 15:58:57 +03:00
0745110a44
Test: fix
2021-08-19 15:58:25 +03:00
Vashchuk Nikita
66be58c759
fix
2021-08-19 15:56:14 +03:00
Vashchuk Nikita
e1c648e06a
Merge branch 'develop' into feature/webhooks
2021-08-19 13:49:16 +03:00
Vashchuk Nikita
5e72bcc224
fix
2021-08-19 13:17:54 +03:00
Vashchuk Nikita
2859d05ce3
fix
2021-08-19 12:25:43 +03:00
Vashchuk Nikita
7d4b22ca83
added tests, migrations
2021-08-19 12:11:26 +03:00
cf87addaa3
Security: added new method
2021-08-18 17:04:16 +03:00
diana-vahomskaya
945739fe44
fix test ASC.Web.Api.Tests
2021-08-16 15:20:41 +03:00
9f5c732501
Merge branch 'develop' into release/1.0.0
2021-08-16 11:08:09 +03:00
5bf9bfae27
Files: optimization
2021-08-13 18:59:17 +03:00
b23fe977cb
Kafka: fix
2021-08-13 17:05:11 +03:00
86248a3ad1
Kafka: fix create topic
2021-08-13 11:09:01 +03:00
diana-vahomskaya
5e22019a28
fix context delete models: dbtenant, dbtariff from BackupsContext
2021-08-12 18:18:01 +03:00
560b622a29
Merge branch 'develop' into release/1.0.0
2021-08-12 15:06:16 +03:00
9aafaa21ea
Merge pull request #319 from ONLYOFFICE/feature/log
...
Feature/log
2021-08-12 15:00:53 +03:00
163e73ef4a
Personal: optimization
2021-08-12 14:00:05 +03:00
87b7e171de
ApiSystem: fix
2021-08-11 21:32:43 +03:00
fff54bd9dc
Kafka: create before assign
2021-08-11 21:15:37 +03:00
e92c41d919
Merge branch 'develop' into release/1.0.0
2021-08-10 18:55:25 +03:00
1d4cabe5b9
MessagesRepository: optimization
2021-08-10 17:57:20 +03:00
57493d1018
Logger: singletone
2021-08-10 17:56:59 +03:00
643b7b66dc
Optimization: removed autofac ILifetimeScope
2021-08-10 17:56:38 +03:00
39f77c5352
Backup: fix
2021-08-10 11:36:07 +03:00
af18e175dc
Merge branch 'develop' into release/1.0.0
2021-08-10 11:13:17 +03:00
546c1872a3
Added asp logging
2021-08-08 16:19:54 +03:00
16469eb138
Api: added ConfigureNLogLogging
2021-08-08 15:56:54 +03:00
672de09a90
NLog: up to 4.7.10
2021-08-08 15:55:27 +03:00
44847c1e8f
backend: change TargetFramework from netstandard2.1 to net5.0
2021-08-06 18:37:22 +03:00
90bb8a139a
UserManager: fix for personal
2021-08-06 17:30:51 +03:00
5687e6bca2
Merge branch 'develop' into release/1.0.0
2021-08-05 19:11:02 +03:00
diana-vahomskaya
fee6900f19
update migrations ASC.Web.Api.Tests
2021-08-04 14:23:21 +03:00
e86124cbdd
Elastic: fixed search by content
2021-08-04 13:08:12 +03:00
diana-vahomskaya
eaa449db1f
Updated migrations for ASC.Core.Common
2021-08-04 00:41:33 +03:00
Vashchuk Nikita
b70c2e6f09
fix
2021-08-03 19:26:28 +03:00
diana-vahomskaya
af84cd6532
fix Context
2021-08-03 17:11:53 +03:00
c2bd00506c
fix Bug 51447
2021-08-03 17:05:49 +03:00
diana-vahomskaya
bcfddd88d7
fix context
2021-08-02 17:49:36 +03:00
a0b34c5cc9
Webhook: fix
2021-07-31 20:12:41 +03:00
Vashchuk Nikita
3c8fadc28d
modified WebhooksMiddleware
2021-07-29 15:39:22 +03:00
Vashchuk Nikita
e3d5aa50e7
fix
2021-07-29 14:04:42 +03:00
Vashchuk Nikita
b913cdc813
Added WebhooksIdentifier.cs
2021-07-28 18:16:56 +03:00
Vashchuk Nikita
afdd1ab982
Added CustomMiddleware(WebhooksMiddleware.cs)
2021-07-28 13:10:14 +03:00
diana-vahomskaya
34c4161f08
Update migrations, fix Context with repetitive Models
2021-07-27 19:26:56 +03:00
diana-vahomskaya
3131c27d26
Merge remote-tracking branch 'remotes/origin/feature/wizard/migration' into develop
2021-07-27 17:39:29 +03:00
6fbdaf0d31
Calendar: post-merge fixes
2021-07-27 16:09:30 +03:00
f1668a3b43
Merge remote-tracking branch 'remotes/origin/develop' into feature/calendar
2021-07-27 12:43:01 +03:00
Vashchuk Nikita
81299cc766
fix
2021-07-26 20:07:00 +03:00
Vashchuk Nikita
8a51dee296
modified DbWorker(Lazy), Sender. Added BuildQueueService and WorkerService.cs.
2021-07-26 20:03:55 +03:00
diana-vahomskaya
7f763cb7ff
fix test library from Newtonsoft.Json to System.Text.Json. Added new object to serialization
2021-07-25 22:14:30 +03:00
d821f9a2af
TimeZone: fix
2021-07-22 22:40:37 +03:00
913c67a818
Elastic: fixed create scope
2021-07-22 12:11:39 +03:00
8c78fa4a17
Feed: fix TenantManager
2021-07-22 11:56:52 +03:00
diana-vahomskaya
8be7427764
added test to webstudioDbContext Data = Completed:false
2021-07-22 01:38:31 +03:00
diana-vahomskaya
17a0a6bb9d
fix test for wizard
2021-07-21 15:44:20 +03:00
diana-vahomskaya
e1c9c17ecb
fix BaseApiTests
2021-07-20 13:35:19 +03:00
diana-vahomskaya
0785140ca5
fix tests
2021-07-20 13:24:19 +03:00
diana-vahomskaya
81d8324afb
ASC.Web.Api Tests added
2021-07-19 15:12:40 +03:00
1268a436ca
Startup: fix load products
2021-07-16 11:56:14 +03:00
d88741962c
EF: optimize server version check
2021-07-16 11:48:30 +03:00
Vashchuk Nikita
faabf5aae7
Updated Publisher, BackgroundService(integration kafka)
2021-07-15 18:45:17 +03:00
2d75554b0d
DbContext: optimization
2021-07-15 13:07:47 +03:00
b184ad7898
Log: fix configuring
2021-07-14 11:00:59 +03:00
ad57feecd8
Log: fix configuring
2021-07-13 21:17:18 +03:00
8388a4e306
Merge branch 'develop' into feature/personal
2021-07-12 10:56:30 +03:00
7e6e25274f
Api: fix confirm
2021-07-10 20:27:15 +03:00
Vashchuk Nikita
2dcf6b8225
Added WebhookHostedService, modified Publisher and Sender
2021-07-08 20:32:59 +03:00
diana-vahomskaya
e02e833d31
fixed data to open wizard if magration true
2021-07-07 17:29:27 +03:00
a31dc583c1
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/pages/Settings/index.js
2021-07-02 16:26:45 +03:00
b6b1c72769
core: added new ThenBy linq extension. crm: fixed sql
2021-06-30 19:08:41 +03:00
Vashchuk Nikita
5305ad1018
Added models, DbWorker, publisher, sender.
2021-06-29 11:40:20 +03:00
fbcdba3b17
Merge branch 'develop' into feature/personal
2021-06-25 11:10:49 +03:00
37a676cb5a
Tenant: removed Public, PublicVisibleProducts
2021-06-24 15:55:12 +03:00
a23b23de3c
Startup: added ability to skip load products and consumers
2021-06-24 11:15:20 +03:00
d41f81e1cd
Merge branch 'develop' into feature/remove_binary_formatter
2021-06-23 20:27:10 +03:00
d59f9a2aa2
fixed urls
2021-06-23 20:12:50 +03:00
0e6078f9e2
Merge branch 'develop' into feature/ClearEvents
...
# Conflicts:
# ASC.Web.sln
2021-06-23 17:15:56 +03:00
20d1f9a738
merge from develop
2021-06-23 16:10:46 +03:00
85574630cb
Merge branch 'develop' into feature/ClearEvents
2021-06-23 15:30:55 +03:00
c18adc50dc
ClearEvents: fixed log and launch
2021-06-23 15:25:17 +03:00
7fc9a35b49
Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1
2021-06-23 14:37:03 +03:00
3788bab48e
HealthCheck: fix Studio
2021-06-22 19:55:47 +03:00
d8abde6d88
SSoAuth: fix buid and run
2021-06-22 19:44:09 +03:00
912501a2f4
Healthcheck: fix apisystem
2021-06-22 19:09:24 +03:00
4a4cab5352
Files: FileHelper decorator
2021-06-18 23:31:46 +03:00
00cc15fbf5
Merge branch 'develop' into feature/ClearEvents
2021-06-18 12:21:54 +03:00
d0b813cc71
update packages
2021-06-18 12:11:25 +03:00
d3113fdc2e
Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1
2021-06-18 11:32:55 +03:00
3d3a8a2d6a
Merge branch 'develop' into feature/remove_binary_formatter
2021-06-18 10:49:07 +03:00
6118e95028
Merge branch 'develop' into feature/personal
2021-06-17 14:25:09 +03:00
8fc9bef6c6
Core: fix cache
2021-06-16 22:25:02 +03:00
01639a56cc
RazorCompileOnBuild:false<
...
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
53ee0ef484
fixed warnings
2021-06-16 18:00:27 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
...
Feature/crm migrate
2021-06-16 17:02:46 +03:00
5fcbdbd7dd
added health checks
2021-06-16 16:54:36 +03:00
73547f421e
Common: install newtonsoft
2021-06-15 16:44:53 +03:00
65378cc089
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.CRM/Client/public/index.html
# products/ASC.Calendar/Client/public/index.html
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/panels/UploadPanel/FileRow.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Mail/Client/public/index.html
# products/ASC.People/Client/public/index.html
# products/ASC.People/Client/src/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/public/index.html
2021-06-15 11:49:39 +03:00
a66e3afa92
Web: Tests: Commented "Save empty 'EN' keys to not found files"
2021-06-11 18:18:38 +03:00
bac090e180
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-11 13:11:08 +03:00
fc9d626bcc
UrlShortenerService: fix log
2021-06-11 11:44:10 +03:00
a82efce2a1
add fileHelper
2021-06-10 17:53:06 +03:00
8d80955686
Thumbnail: fix
2021-06-09 15:04:29 +03:00
c5fe4a9989
Merge branch 'develop' into feature/ClearEvents
2021-06-08 12:17:36 +03:00
b925943cb6
merge from develop
2021-06-07 17:23:25 +03:00
50f0bef484
remove unnecessary using
2021-06-07 13:56:24 +03:00
fd485e06e4
remove_binary_formatter
2021-06-07 13:54:17 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth
2021-06-07 11:54:06 +03:00
SuhorukovAnton
860b682594
replace "DeleteOldEvents" in new service
2021-06-04 14:10:37 +03:00
e8516f7b34
Merge branch 'develop' into feature/two-factor-auth
2021-06-03 20:27:57 +03:00
944966b67b
WebSocker: repair service
2021-06-03 16:13:22 +03:00
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
bcc9e6c34b
ResManager: additional feature
2021-06-03 12:48:25 +03:00
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
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth
2021-06-02 23:57:00 +03:00
2be10b8bd9
Settings: added personal settings
2021-06-02 19:13:47 +03:00
e43445cb2d
Config: Enabled personal mode in appsettings.json
2021-06-02 16:17:23 +03:00
0aa6a71ea8
Merge branch 'develop' into feature/translations
2021-06-02 14:05:43 +03:00
e9c5ca41ae
fix
2021-06-02 11:26:58 +03:00
