6cbd02b71c
Merge branch 'hotfix/v1.1.1' into feature/socket-io
...
# Conflicts:
# products/ASC.Files/Client/webpack.config.js
# products/ASC.Files/Server/DocStore
# yarn.lock
2022-01-10 11:06:32 +03:00
5c97e7ed63
Web: Socket.IO: Changed logger settings
2021-12-30 15:55:00 +03:00
f8035967b5
Web: Socket: Changed room settings
2021-12-30 15:54:23 +03:00
febf172875
Merge branch 'master' into hotfix/v1.1.1
...
# Conflicts:
# lerna.json
# packages/asc-web-common/package.json
# packages/asc-web-components/avatar-editor/index.js
# packages/asc-web-components/avatar-editor/sub-components/avatar-editor-body.js
# packages/asc-web-components/main-button/index.js
# 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/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/AsideView.js
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
# products/ASC.Projects/Client/package.json
# web/ASC.Web.Client/package.json
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Login/package.json
2021-12-28 13:35:02 +03:00
657961c334
Web: Socket: Implemented "stop editing" + refactoring
2021-12-24 20:58:38 +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
cb14095a51
Web: Socket.IO: Update yarn.lock
2021-12-21 13:37:03 +03:00
dfb8f79374
Web: Socket.IO: Added support of "authorization" header
2021-12-21 13:36:37 +03:00
62ffa5889b
Web: Socket.IO: added winston logger, remover unused code, updated packages
2021-12-20 17:49:15 +03:00
99e37d960d
Web: Socket.IO: Refactoring work with socket.io
2021-12-20 15:38:08 +03:00
b2cb05b983
Web: Socket: updated redis packages
2021-12-16 17:18:09 +03:00
46386a6f6c
Web: Tests: Added new DublicatesFilesByMD5HashTest() test
2021-12-16 15:53:58 +03:00
9736c9ded8
Web: Socket: added redis, fixed editorCreateCopy
2021-12-16 15:28:01 +03:00
bb31f7d574
Web: Files: refactoring socket code
2021-12-15 12:32:38 +03:00
62e4dbbb40
Web: Socket: removed request, co libs, added axios
2021-12-14 12:56:01 +03:00
17d2c04533
fix Bug 53455
2021-12-13 19:23:05 +03:00
7bab795feb
Web: Tests: Added new TranslationsEncodingTest()
2021-12-13 13:18:13 +03:00
d230a40e8e
Web: Socket: fixed cookies
2021-12-10 14:20:51 +03:00
9aff9d8f30
Web: Socket: added tests, added getting port from config
2021-12-09 17:38:57 +03:00
ed41326acc
Web: socket-io, first version
2021-12-09 15:50:50 +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
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
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
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
1882f9db43
Fixed settings issue
2021-10-29 17:21:51 +03:00
a69df29e7d
Services: fix httpContextAccessor
2021-10-28 13:23:26 +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
