Artem Tarasov
6b954d45f5
Merge branch 'develop' into feature/doceditor-ssr
...
# Conflicts:
# web/ASC.Web.Editor/webpack.config.js
2022-01-11 14:11:47 +03:00
Artem Tarasov
7fc992c9f4
Web: DocEditor: applied RectDOM.hydration() instead of ReactDOM.render()
2022-01-11 12:59:03 +03:00
Artem Tarasov
c7121997f3
Web: DocEditor: webpack.config.js is split into separate files
2022-01-11 12:57:07 +03:00
9d43cb07ba
Files: fix after merge
2021-12-28 18:40:42 +03:00
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
14783ee105
Merge pull request #485 from ONLYOFFICE/release/v1.1.0
...
Release/v1.1.0
2021-12-27 20:39:18 +03:00
5e088d3ba8
Jenkins: fix build
2021-12-23 21:54:42 +03:00
44b227ba98
NLog: maxArchiveDays
2021-12-23 21:49:02 +03:00
dc3c7b5e30
Fix Bug 54679 - Client.Profile. Failed to execute 'toDataURL' on 'HTMLCanvasElement': Tainted canvases may not be exported
2021-12-23 16:48:54 +03:00
dc7b2675f3
Web: Files: Store: Fixed bug with displaying "Save as oform" at Favorite/Recent folders
2021-12-23 16:29:21 +03:00
2ff6a871a3
Merge pull request #484 from ONLYOFFICE/feature/translate-1.1.0
...
Feature/translate 1.1.0
2021-12-23 15:52:21 +03:00
57d1d50f57
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
2021-12-23 14:02:16 +03:00
440811e931
Web: Added convertLanguage for compatibility
2021-12-23 14:01:08 +03:00
31f03a430b
Config: Restored old languages
2021-12-23 14:00:08 +03:00
c899f4db3a
Web: People: Fix selectedLanguage == undefined
2021-12-23 13:10:35 +03:00
3bf412166d
Web: Settings: Commented old redux actions
2021-12-23 13:09:38 +03:00
33026385e2
Web: Tests: Added new excludes to spellcheck-excludes.json
2021-12-23 11:36:59 +03:00
919092e6c6
Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0
2021-12-23 11:28:50 +03:00
3c26c6cdfd
edit az, vi, uk
2021-12-23 11:24:00 +03:00
ab931e40ef
edit bg, az
2021-12-23 11:23:25 +03:00
9e24c182c9
edit ko
2021-12-23 11:22:48 +03:00
cd56b02c8e
Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0
2021-12-22 19:10:45 +03:00
e28744d69a
Web:Tests: fix culture change before test start
2021-12-23 00:09:49 +08:00
a785eb2692
Web: Tests: Added spellcheck-excludes.json and opportunity to skip some spell check issues
2021-12-22 18:17:22 +03:00
48aa091786
Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0
2021-12-22 18:12:12 +03:00
86e965d779
Web: Fix translations
2021-12-22 18:12:04 +03:00
4688fcce41
Merge branch 'feature/translate-1.1.0' of github.com:ONLYOFFICE/AppServer into feature/translate-1.1.0
2021-12-22 18:48:41 +08:00
b63d7d02f4
Web:Tests: close process when tests done
2021-12-22 18:45:53 +08:00
868332bb83
Web:Tests: add ability to ignore different cultures
2021-12-22 16:46:45 +08:00
b9d7141862
Web: rename e2e.test.bat to run.e2e.test.bat and translation.test.bat to run.e2e.translations.tests.bat
2021-12-22 16:42:37 +08:00
1d49c9dc51
Web: Client: Fixed spelling errors
2021-12-21 20:25:59 +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
15f412e1a8
Web:Files:Tests: update codecept config
2021-12-21 18:24:28 +08:00
ff7b6fc432
Web: init e2e tests
2021-12-21 15:59:11 +08:00
656fa2df89
edit translations
2021-12-17 10:14:40 +03:00
8fc08b8e61
Merge pull request #482 from ONLYOFFICE/feature/optimization
...
Feature/optimization
2021-12-16 18:34:00 +03:00
70bfe70563
Merge branch 'develop' into feature/optimization
2021-12-16 18:14:54 +03:00
156fbada6d
edit translations bg
2021-12-16 17:13:44 +03:00
39b30c607c
Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0
2021-12-16 15:59:23 +03:00
93cbab055c
edit lo
2021-12-16 15:59:02 +03:00
7d4a87dd81
Merge branch 'feature/translate-1.1.0' of https://github.com/ONLYOFFICE/AppServer into feature/translate-1.1.0
2021-12-16 15:54:07 +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
a62fe009df
edit vi
2021-12-16 15:30:20 +03:00
780df07ae3
Web: Files: EmptyContainer: Added create form template button at empty root folder screen
2021-12-15 23:19:49 +03:00
28bc76b396
Web: Files: Delete translation key CreateWithEmptyTitle
2021-12-15 23:03:28 +03:00
6d84bd5f04
Merge branch 'release/v1.1.0' into feature/translate-1.1.0
2021-12-15 17:22:17 +03:00