bedfad1ec5
Merge branch 'master' into develop
...
# Conflicts:
# common/ASC.Core.Common/Caching/CachedUserService.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20211012145330_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20211012145331_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Client/src/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/store/DialogsStore.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Server/DocStore
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/Tfa/TfaManager.cs
2021-12-28 18:21:44 +03:00
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
