IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,559 Commits 38 Branches 22 Tags 359 MiB
febf172875
Commit Graph

112 Commits

Author SHA1 Message Date
AlexeySafronov
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
AlexeySafronov
86e965d779 Web: Fix translations 2021-12-22 18:12:04 +03:00
AlexeySafronov
1d49c9dc51 Web: Client: Fixed spelling errors 2021-12-21 20:25:59 +03:00
gectokot
1ea64c8701 Web: Studio: Homepage: Now displayName is used in greeting message 2021-12-14 11:14:08 +03:00
gectokot
8ee3ef5bd5 Web: Studio: Homepage: Changed logic for greeting message 2021-12-13 16:12:52 +03:00
gectokot
0a53e3bd7d Web: Studio: Homepage: Refactoring 2021-12-13 14:50:33 +03:00
gectokot
d32dc40034 Web: Studio: Fixes, refactoring 2021-12-10 17:22:03 +03:00
AlexeySafronov
623313e4be Web: Restored missing 'ru' translations 2021-11-12 21:14:44 +03:00
AlexeySafronov
5ff07a8293 Web: Fix UselessTranslationKeysTest translation issues 2021-11-12 20:46:04 +03:00
pavelbannov
d8cf12f9d7 translations 2021-11-12 19:00:01 +03:00
AlexeySafronov
cd897aa8f1 Web: About: Fix DublicatesByContentTest translation issue 2021-11-08 15:33:27 +03:00
Viktor Fomin
fb922f04d6 Web: Client: change About translations 2021-08-03 16:01:31 +03:00
Viktor Fomin
a3c5eea477 Web: Client: deleted unused translations key 2021-06-09 17:16:37 +03:00
Viktor Fomin
5ea562e996 Web: Client: fixed translations 2021-06-09 02:43:07 +03:00
Viktor Fomin
b7ce4a35e7 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/access-rights-admins 
# Conflicts:
#	products/ASC.Files/Server/DocStore
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/sub-components/admins.js
#	web/ASC.Web.Client/src/components/pages/Settings/index.js
 2021-06-09 00:23:12 +03:00
Viktor Fomin
d881c48b4b Web: Client: fixed translations 2021-06-08 15:20:03 +03:00
Viktor Fomin
ce35405190 Web: Client: deleted duplicate key 2021-06-03 20:25:35 +03:00
Viktor Fomin
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth 2021-06-02 23:57:00 +03:00
Viktor Fomin
43ff5210bf Web: Client: access portal page refactoring 2021-06-02 20:30:54 +03:00
Ilya Oleshko
11640e211c Web: Confirm : Added usage for translation key "ConfirmOwnerPortalSuccessMessage" 2021-06-02 11:33:26 +03:00
AlexeySafronov
e2b9561d7b Web: Rewritten all json translation files with sorting of properties alphabetically 2021-05-31 18:34:15 +03:00
Viktor Fomin
889c99243e Web: Client: added translations 2021-05-31 13:05:19 +03:00
Viktor Fomin
66f36bf0a6 Web: Client: added empty screen 2021-05-31 12:51:23 +03:00
Viktor Fomin
f0f6400563 Web: Client: commentary changes 2021-05-30 22:40:44 +03:00
gopienkonikita
12bcf816b5 Web: Client: added new translations keys 2021-05-28 12:09:10 +03:00
Artem Tarasov
102f26ed3c Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations 
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
 2021-05-27 11:58:53 +03:00
Artem Tarasov
46d80f7b34 Web: moved translation keys "ByFirstNameSorting", "ByLastNameSorting" to "static/locales/{lng}/Common.json" 2021-05-27 11:57:20 +03:00
Ilya Oleshko
b57da432bf Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common. 2021-05-27 11:50:11 +03:00
Artem Tarasov
a12ab6c970 Web: moved translationKeys "Error520Text", "ErrorInitWizardHeader" to "static/locales/{lng}/Common.json" 2021-05-26 18:30:57 +03:00
Artem Tarasov
d5ddeb4c42 Web: moved translation keys "AboutCompanyVersion", "Version" to "static/locales/{lng}/Common.json" 2021-05-26 17:58:05 +03:00
gopienkonikita
541b14c8fe Web: moved translationKeys "DisableUserButton", "NotFoundLanguage" 2021-05-26 16:40:02 +03:00
gopienkonikita
bf63128496 Web: moved translationKeys "LastName", "Language", "Mail" 2021-05-26 16:28:58 +03:00
gopienkonikita
2c5b95e352 Web: moved translationKeys "ProjectsProduct", "InviteLinkTitle", MoveConfirmationMessage" 2021-05-26 16:06:40 +03:00
gopienkonikita
252fef7ae3 Web: moved translationKeys "AboutCompanyTitle", "ClearButton", "CommunityProduct", "EmptyFieldError" 2021-05-26 14:36:58 +03:00
gopienkonikita
3c1e322406 Web: moved translationKeys "Profile", "RecoverErrorMessage" 2021-05-26 14:21:11 +03:00
gopienkonikita
49bf2618d2 Web: moved translationKeys "Enable", "ProviderLoginError", "ProviderNotConnected" 2021-05-26 13:35:11 +03:00
AlexeySafronov
4228b0a5dc Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
 2021-05-25 17:26:12 +03:00
AlexeySafronov
2452ec957d Web: Moved translationKeys "Enable" to "/static/locales/{lng}/Common.json" 2021-05-25 17:16:09 +03:00
Artem Tarasov
671f98519a Web: Moved translation Keys "ContinuteButton" to "/static/locales/{lng}/Common.json" 2021-05-25 12:49:56 +03:00
gopienkonikita
60679a5da7 Web: Moved translationKeys "Disabled", "Close" 2021-05-25 11:43:42 +03:00
AlexeySafronov
e01af3fd20 Web: Moved translationKeys "AdminSettings" to "/static/locales/{lng}/Common.json" 2021-05-24 19:47:26 +03:00
AlexeySafronov
a80890f7cc Web: Moved translationKeys "Guest" to "/static/locales/{lng}/Common.json" 2021-05-24 19:40:26 +03:00
AlexeySafronov
f94c19385f Web: Moved translationKeys "Settings" to "/static/locales/{lng}/Common.json" 2021-05-24 19:31:41 +03:00
AlexeySafronov
43e65a51d1 Web: Moved translationKeys "Next", "Previous", "PageOfTotalPage" and "CountPerPage" to "/static/locales/{lng}/Common.json" 2021-05-24 19:22:20 +03:00
AlexeySafronov
b8dd8b3048 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 
# Conflicts:
#	public/locales/de/Common.json
#	public/locales/en/Common.json
#	public/locales/ru/Common.json
 2021-05-24 19:07:46 +03:00
AlexeySafronov
1e954b15d7 Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json" 2021-05-24 19:05:29 +03:00
gopienkonikita
4e32c53567 Web: Moved translationKeys "About" to Common.json 2021-05-24 18:36:31 +03:00
gopienkonikita
b8edf32f87 Web: Moved translationKeys "User", "Warning" to Common.json 2021-05-24 17:55:14 +03:00
AlexeySafronov
c652209b49 Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations 2021-05-24 13:58:54 +03:00
Artem Tarasov
098e04891c Web: deleted "WhiteLabel" translation key 2021-05-22 01:31:50 +03:00