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
ac09d3691d
Web: People: fix translations
2021-11-18 19:03:24 +03:00
e0f297bf0a
Web: People: add translations
2021-11-16 18:24:02 +03:00
cd21a4013d
Web: Restored missing translations
2021-11-13 19:15:50 +03:00
2c6e0d45bc
Web: Fix wrong braces of variables inside translation files
2021-11-13 19:07:48 +03:00
c7c7267a9a
Test: Added new WrongTranslationVariablesTest and fix it's issues
2021-11-13 19:03:10 +03:00
623313e4be
Web: Restored missing 'ru' translations
2021-11-12 21:14:44 +03:00
1c8f091dce
Web: Fix DublicatesByContentTest translation issues
2021-11-12 20:12:33 +03:00
d8cf12f9d7
translations
2021-11-12 19:00:01 +03:00
deffb0c901
Merge branch 'release/1.0.0' into bugfix/fixed-styles-selcted-row
2021-10-06 21:01:53 +03:00
55cb1e875e
Web: fixed header height
2021-10-06 12:22:28 +03:00
f2913de45e
Web: People: Fixed translation.
2021-10-05 12:57:22 +03:00
61bf6e3483
Web: People: Added translations.
2021-10-05 12:17:55 +03:00
4531d38e6f
Web: Removed duplicates
2021-09-24 21:18:50 +03:00
f6bafac273
Web: People: delete useless translate keys
2021-09-13 16:18:08 +03:00
f06e3c076b
Fix Bug 52282 - Client.Files. When grabbing the left mouse button, page elements go beyond their boundaries
2021-09-13 12:54:59 +03:00
a66e14c954
Fix bug 52324: <b> tag in toast
2021-09-02 13:09:35 +03:00
e6efbb45b1
Web: People: added new translations, moved translations to Common.json
2021-07-29 16:09:56 +03:00
075d9232ec
Web: People: moved translation "Name" to Common.json
2021-07-16 13:23:52 +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
2a44887b22
Web: hid temp loaders
2021-07-02 14:28:11 +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
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
Artem Tarasov
3db9b30e5e
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
2021-06-08 17:58:29 +03:00
93ba9c5940
Web: People: change trans on t
2021-06-08 16:09:51 +03:00
18cdf1dc95
Web: People: fixed translations
2021-06-08 15:29:44 +03:00
65936fb856
Web: People: fixed translations
2021-06-08 15:25:26 +03:00
6a06707d18
Web: People: fixed translations
2021-06-08 15:19:49 +03:00
71564c7348
Web: People: deleted duplicate key
2021-06-08 13:35:31 +03:00
Artem Tarasov
acd4a3893c
Web: added rule to webpack.config for woff, woff2
2021-06-06 23:39:52 +03:00
d01ef10cc5
Web: NavMenu/PageLayout: Was done:
...
- fixed loaders: two rectangle loader combined into one
- fixed loaders at index.html: two rectangle loader combined into one
- hide NavItem component
- hide click on Headline component
- fixed article padding style for desktop
- added new logo.
2021-06-04 14:42:21 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth
2021-06-02 23:57:00 +03:00
33ccfa550b
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# products/ASC.People/Client/public/locales/en/Translations.json
# products/ASC.People/Client/public/locales/ru/Translations.json
2021-06-02 11:53:29 +03:00
c4a89a9e50
Web: People: fixed translation of "Birthdate", duplicated translation of "Birthdate" moved to a common file
2021-06-02 11:49:35 +03:00
Artem Tarasov
5df2788783
Web: added new translation key "SuccessDeletePersonalData" for "delete-personal-data" in context options
2021-06-02 11:36:23 +03:00
Artem Tarasov
883130c002
Web: added new translation key "ChangePhoneInstructionSent" for ChangePhoneDialog
2021-06-02 11:23:02 +03:00
23e1083be7
Web: Removed empty translations keys
2021-06-01 13:49:37 +03:00
de98856728
Web: Tests: Added new 'sk' translations;
2021-06-01 11:21:39 +03:00
8e532bc8b9
Web: Tests: Added new 'ro' translations;
2021-06-01 11:20:14 +03:00
3d62da4422
Web: Tests: Added new 'pt-BR' translations;
2021-06-01 11:19:13 +03:00
c5a5072aa7
Web: Tests: Added new 'lo' translations;
2021-06-01 11:17:19 +03:00
8eb62d8079
Web: Tests: Added new 'it' translations;
2021-06-01 11:15:24 +03:00
a0fc465678
Web: Tests: Added new 'fr' translations;
2021-06-01 11:13:50 +03:00
e3b5ac774a
Web: Tests: Added new 'de' translations;
2021-06-01 10:56:47 +03:00
7beccd192b
Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue)
2021-05-31 20:33:12 +03:00
e2b9561d7b
Web: Rewritten all json translation files with sorting of properties alphabetically
2021-05-31 18:34:15 +03:00
f78742ac39
Web: Fix UselessModuleTranslationKeysTest issues
2021-05-31 17:35:25 +03:00
6b56b539c5
Web: Update EN language
2021-05-31 17:10:34 +03:00
a454c6a210
Web: People: commentary changes
2021-05-30 22:40:27 +03:00
b88ad2480d
Web: People: fixed by layouts
2021-05-30 17:50:52 +03:00
