Commit Graph

30850 Commits

Author SHA1 Message Date
79d074689a Merge branch 'release/rc-v1.2.0' into bugfix/ssr-translations 2023-02-03 17:54:09 +03:00
Timofey Boyko
d83c9520dc Web:Login: fix 2023-02-03 17:51:44 +03:00
Timofey Boyko
81dbf9c840 Web:Editor: update work with translation files 2023-02-03 17:49:28 +03:00
Timofey Boyko
7d1aa41ebb Web:Editor: add new alias, add additionalPath at beforeBuild function and remove file loader for json file for server 2023-02-03 17:48:59 +03:00
Viktor Fomin
ca601dc231 Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-03 17:27:15 +03:00
Viktor Fomin
d507702150 Client: Wizard: add license input 2023-02-03 17:27:07 +03:00
Viktor Fomin
af1c429b16 Components: Themes: fix 2023-02-03 17:25:13 +03:00
Timofey Boyko
d4314b6601 Web:Login: commit new autoGeneratedTranslations 2023-02-03 17:16:32 +03:00
Timofey Boyko
69c2390895 Web:Login:Client: fix helpers for work with translations files 2023-02-03 17:16:01 +03:00
Timofey Boyko
2502557c58 Web:Login:Server: send only en and current lang locales to client 2023-02-03 17:15:17 +03:00
Timofey Boyko
e8cdfd6213 Web:Login:Server:i18n: import locales as resources 2023-02-03 17:14:54 +03:00
Timofey Boyko
500d1fe09b Web:Login: remove file loader for json file for server 2023-02-03 17:14:20 +03:00
Timofey Boyko
bc3cf59630 Web:Login: add additional path for beforeBuild script 2023-02-03 17:14:02 +03:00
Timofey Boyko
dcb1f29306 Web:Login: add new alias CLIENT_PUBLIC_DIR 2023-02-03 17:13:29 +03:00
Timofey Boyko
c3461b61e8 Web:Common:Utils: add logic for work with additionalPath for beforeBuild function 2023-02-03 17:13:03 +03:00
1759f7c564 Merge branch 'release/rc-v1.2.0' into bugfix/mediaviewer-primary-loading 2023-02-03 16:49:46 +03:00
ba0ff963cb Update FilesStore.js 2023-02-03 16:36:32 +03:00
Viktor Fomin
0c6986f593 Client: Wizard: use constants 2023-02-03 15:44:35 +03:00
Viktor Fomin
9623c3a322 Client: add constants 2023-02-03 15:44:22 +03:00
Viktor Fomin
fe1cbda2f2 Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-03 14:53:23 +03:00
Timofey Boyko
7fff409f0f Web:Login:Server: add function for changed currentLanguage to correct currentLanguage 2023-02-03 14:22:08 +03:00
6fcb5eb605 Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-03 10:55:17 +03:00
Timofey Boyko
62f4db9cd1 Merge branch 'release/rc-v1.2.0' of https://github.com/ONLYOFFICE/DocSpace into release/rc-v1.2.0 2023-02-03 10:29:07 +03:00
Timofey Boyko
7f61aa85ca Web:Client: fix src={false} for files 2023-02-03 10:28:43 +03:00
480962405a files.service: fixed 2023-02-03 10:06:10 +03:00
Viktor Fomin
38608bb394 Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-02 23:27:55 +03:00
Viktor Fomin
0d354d1ce6 Merge branch 'bugifx/wizard' of https://github.com/ONLYOFFICE/DocSpace into bugifx/wizard 2023-02-02 23:27:35 +03:00
Viktor Fomin
fad0655c97 Wizard: Client: fix 2023-02-02 23:27:28 +03:00
406bbd81cc thumbnail: refactoring. replace concurrentdictionary to channel 2023-02-02 22:33:18 +03:00
b87d5f0687 nginx: fixed cache_control header 2023-02-02 22:20:55 +03:00
Elyor Djalilov
65ac7c9405 add autoGeneratedTranslations 2023-02-02 20:59:16 +05:00
5bd5cb42ce
Merge pull request #1165 from ONLYOFFICE/feature/fonts-static-versioned
Feature/fonts static versioned
2023-02-02 18:07:48 +03:00
961b0ad613 Merge branch 'release/rc-v1.2.0' into feature/fonts-static-versioned 2023-02-02 17:46:41 +03:00
0723606fd6
Merge pull request #1163 from ONLYOFFICE/feature/translations-static-versioned
Feature/translations static versioned
2023-02-02 17:45:14 +03:00
Timofey Boyko
0dc3228702 Add cache for locales files 2023-02-02 17:27:00 +03:00
Viktor Fomin
5a8db3cab7 Client: Wizard: fix 2023-02-02 17:11:28 +03:00
Timofey Boyko
9f0d2b62cb Web: fix regexp for json locales 2023-02-02 17:09:26 +03:00
Timofey Boyko
9e67aadbe9 Web: delete useless code 2023-02-02 17:07:41 +03:00
de95953b14 Web: Fix OS path separator split 2023-02-02 16:50:45 +03:00
Timofey Boyko
b19f7f37bf Merge branch 'release/rc-v1.2.0' into feature/fonts-static-versioned 2023-02-02 15:19:27 +03:00
Timofey Boyko
c0f7335c7c Change nginx config for work with asset emit 2023-02-02 15:17:25 +03:00
Timofey Boyko
2f532533de Web:Editor: delete useless code 2023-02-02 15:16:58 +03:00
Timofey Boyko
70f319160c Web:Editor: add asset/resource type for woff2 format and disable emit files, also change asset path 2023-02-02 15:16:31 +03:00
Timofey Boyko
4bd1483718 Web:Login:Template: change fonts import 2023-02-02 15:15:17 +03:00
Timofey Boyko
27b7723cb2 Web:Login:Client: delete useless code 2023-02-02 15:14:57 +03:00
Timofey Boyko
9b07ea2b61 Web:Login: add asset/resource type for woff2 format and disable emit files, also change asset path 2023-02-02 15:14:23 +03:00
Timofey Boyko
92f59e31b5 Web:Client: add asset/resource type for woff2 format and disable emit files 2023-02-02 15:12:19 +03:00
Timofey Boyko
3a3cedde88 Web:Common: update import for fonts 2023-02-02 15:10:54 +03:00
4fc8278000 Merge branch 'release/rc-v1.2.0' into bugifx/wizard 2023-02-02 14:17:20 +03:00
409366d807 Merge branch 'release/rc-v1.2.0' into feature/translations-static-versioned 2023-02-02 14:12:03 +03:00