Artem Tarasov
81b778765f
Web: People: navigation profile fix
2021-06-11 14:04:26 +03:00
Artem Tarasov
74fba5c2de
Web: People: fixed loading Profile, ProfileAction, fixed navigation between them
2021-06-11 13:25:09 +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
c9012e3ba8
refactoring
2021-06-11 12:53:41 +03:00
864ef2ff64
Web: Files: changed the logic of opening the folder tree
2021-06-11 12:50:33 +03:00
a9e55b49ec
Web: Files: hid the display of folders for the recycle bin
2021-06-11 12:04:23 +03:00
d619ed1851
package version increment
2021-06-11 11:58:42 +03:00
052ea3b07f
package version increment
2021-06-11 10:36:13 +03:00
64b6c973b1
Web: Files: fixed conversion
2021-06-10 20:18:30 +03:00
a82efce2a1
add fileHelper
2021-06-10 17:53:06 +03:00
9bb8e9bd1d
Web: Files: fixed getConversationPercent
2021-06-10 17:33:50 +03:00
ed161258c3
Files: fix convert
2021-06-10 15:54:05 +03:00
7501e91ae3
Web: Client: Files: Fixed share option for not edited items
2021-06-10 14:19:26 +03:00
a47b94bd7f
Web: Files: removed useless uploadStatus, fixed upload bugs
2021-06-09 17:52:28 +03:00
fdc71ec359
Merge branch 'feature/restore-files-convertation' of github.com:ONLYOFFICE/AppServer into feature/restore-files-convertation
2021-06-09 15:02:44 +03:00
29733f0ace
Wen: Files: fixed upload panel style
2021-06-09 15:02:24 +03:00
59bab6a085
Web: Files: fixed conversion progress
2021-06-09 13:28:22 +03:00
d5989124f3
Web: Files: fixed conversion progress
2021-06-08 19:09:00 +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
Artem Tarasov
c25fa589a9
Web: People: deleted fonts with ext .woff, added hash to font name
2021-06-08 15:26:56 +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
83d4bfd7a3
Web: Files: added conversion for uploaded files
2021-06-08 14:24:47 +03:00
27e6226e66
Web: People: get backupCodes from tfa store
2021-06-08 14:19:55 +03:00
Artem Tarasov
67feed3cf9
Web: People: fix crash Profile
2021-06-08 14:01:19 +03:00
71564c7348
Web: People: deleted duplicate key
2021-06-08 13:35:31 +03:00
ffbbcc6ac2
Web: People: change trans on t
2021-06-08 13:34:41 +03:00
af6d7cd160
Web: People: fixed
2021-06-08 13:26:04 +03:00
Artem Tarasov
46a76abef3
Web: People: added withLoader to ProfileAction
2021-06-08 13:25:43 +03:00
Artem Tarasov
b32edbc3f5
Web: People: added wtihLoader to GroupAction header
2021-06-08 13:06:01 +03:00
Artem Tarasov
d0995aa9a9
Web: People: added withLoader to GroupAction
2021-06-08 13:01:16 +03:00
ffb5dace5d
Web: People: fixed
2021-06-08 12:28:51 +03:00
Artem Tarasov
5dc279b5a9
Web: People: added withLoader to Profile
2021-06-08 12:28:19 +03:00
Artem Tarasov
81b6ea3d02
Web: People: refactoring withLoader, applied for Home
2021-06-08 02:49:34 +03:00
Artem Tarasov
a317b02e2e
Web: People: added and applied LoadingStore
2021-06-08 01:22:28 +03:00
b8f7cb1b61
Web: Client: fixed sharing panel in editor
2021-06-07 18:21:02 +03:00
31423ddbc6
Web: Files: fixed upload panel visibility
2021-06-07 18:05:02 +03:00
b925943cb6
merge from develop
2021-06-07 17:23:25 +03:00
4d9c26545e
Web: Files: added conversion progress
2021-06-07 16:20:18 +03:00
Vladislav Makhov
789d96d21e
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-07 14:28:30 +03:00
Vladislav Makhov
b6fa346fc0
web: my profile: fix onBack navigation in updateUserForm
2021-06-07 14:28:14 +03:00
fd485e06e4
remove_binary_formatter
2021-06-07 13:54:17 +03:00
2d56421dd2
Web: Files: fixed mobx warnings
2021-06-07 13:52:01 +03:00
9a6f281a50
Web: Files: fixed conversion of files, added conversion loaders
2021-06-07 12:44:59 +03:00
54d5c658bd
Merge branch 'develop' into feature/two-factor-auth
2021-06-07 11:54:06 +03:00
Artem Tarasov
b3bccbb98d
Web: People: added usage setFirsLoad
2021-06-07 01:15:07 +03:00
Artem Tarasov
6d7361ecd0
Web: People: added HOC withLoader
2021-06-07 01:09:13 +03:00
Artem Tarasov
9f21862f51
Merge branch 'develop' into bugfix/fixed-styles
2021-06-07 00:24:19 +03:00
Artem Tarasov
fac8dafe1e
Web: Files: fixed width of unselected node in settings tree
2021-06-07 00:21:40 +03:00
Artem Tarasov
acd4a3893c
Web: added rule to webpack.config for woff, woff2
2021-06-06 23:39:52 +03:00
fc20a742a1
crm: refactoring
2021-06-04 19:27:44 +03:00
58e7e41cdd
crm: code cleanup
2021-06-04 17:38:42 +03:00
5754a9b753
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-04 14:43:10 +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
a4ee59974e
Web: People: Profile: Fixed displaying user information for "personal" setting
2021-06-04 12:47:37 +03:00
914b975ada
Web: Files: Store: Fixed files and folders actions for "personal" setting
2021-06-04 11:28:44 +03:00
Vladislav Makhov
da8503612e
web: files: private room: fix upload dialog
2021-06-04 11:23:00 +03:00
209f3b174c
Web: Files: added tReady to ConvertDialog
2021-06-03 17:29:06 +03:00
531233a9a8
Web: Files: added new translations, fixed conversion
2021-06-03 15:56:14 +03:00
c04dc44e36
crm: refacroting
2021-06-03 15:51:29 +03:00
Vladislav Makhov
a071470ff2
Merge branch 'feature/personal' of github.com:ONLYOFFICE/AppServer into feature/personal
2021-06-03 14:30:10 +03:00
Vladislav Makhov
e209f2c4b1
web: files: hide tp settings in personal
2021-06-03 14:29:54 +03:00
Vladislav Makhov
6f5c5d2524
web: files: move files setting fetching to store
2021-06-03 14:29:30 +03:00
62b57fa313
Web: Files: refactoring UploadDataStore
2021-06-03 14:23:25 +03:00
cefc4c417a
Web: Files: hide share button in upload panel
2021-06-03 12:53:08 +03:00
43de25b62a
Merge branch 'develop' into feature/remove-unused-dep
...
# Conflicts:
# common/ASC.Data.Storage/ASC.Data.Storage.csproj
# common/services/ASC.Socket.IO.Svc/ASC.Socket.IO.Svc.csproj
2021-06-03 12:52:21 +03:00
a7edb118ac
Web: Files: added conversion for upload action
2021-06-03 12:50:01 +03:00
e62d8c7ec9
Web: Files: sharing dialog for personal
2021-06-03 12:46:36 +03:00
Vladislav Makhov
bdaeb27fd1
web: files: filter options for personal
2021-06-03 11:01:19 +03:00
Vladislav Makhov
dbb6562b88
web: files: rename isPersonal to personal according to settings api key
2021-06-03 10:34:53 +03:00
Vladislav Makhov
30bb8e7e02
web: files: Can connect a third-party service only in My Documents, if personal mode
2021-06-03 08:22:42 +03:00
c6f85ef4ce
Merge branch 'develop' into feature/two-factor-auth
2021-06-02 23:57:00 +03:00
581df1cdcf
Web: Files: added update after converting the file
2021-06-02 18:41:15 +03:00
e75e048e49
crm: fixed build
2021-06-02 18:24:49 +03:00
Vladislav Makhov
e260207954
web: files: fix translate loading when open direct link
2021-06-02 17:14:53 +03:00
ce77c270de
Web: Files: added conversion progress for file
2021-06-02 16:56:27 +03:00
5e8751d9f1
Web: Files: added convert file icon, refactoring convert dialog
2021-06-02 16:03:46 +03:00
Artem Tarasov
d960ae6220
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
2021-06-02 15:09:03 +03:00
Artem Tarasov
fbab4041c9
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
# products/ASC.Files/Server/DocStore
2021-06-02 15:07:40 +03:00
4d44ccad12
Merge branch 'develop' into feature/restore-files-convertation
...
# Conflicts:
# products/ASC.Files/Client/src/store/UploadDataStore.js
2021-06-02 14:28:42 +03:00
bd299a718b
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-06-02 13:55:19 +03:00
62ac315c8d
Web: i18n: Replaced i18т config load: from "languageOnly" to "all" and added new utils function loadLanguagePath() + Refactoring
2021-06-02 13:55:11 +03:00
f9e53d038f
Web: People: fixed onDeletePersonalDataClick
2021-06-02 13:46:25 +03:00
d187b2767a
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-06-02 12:04:36 +03:00
60a7e84f60
Web: ProfileAction : Added locale usage for DateInput
2021-06-02 12:04:26 +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
cc338e62d0
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-06-02 11:23:47 +03:00
Artem Tarasov
883130c002
Web: added new translation key "ChangePhoneInstructionSent" for ChangePhoneDialog
2021-06-02 11:23:02 +03:00
929adc773a
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-06-02 10:59:15 +03:00
908310041f
Web: Added new translation for toasts ("EncryptingFile", "EncryptionKeysReload", "EncryptionFilePreparing")
2021-06-02 10:59:07 +03:00
ad12ac19c3
Web: Files: removed useless toast translations
2021-06-02 10:46:17 +03:00
Artem Tarasov
a38195d506
Merge branch 'develop' into bugfix/fixed-styles
...
# Conflicts:
# products/ASC.CRM/Client/src/custom.scss
# products/ASC.Calendar/Client/src/custom.scss
# products/ASC.Files/Server/DocStore
# products/ASC.Mail/Client/src/custom.scss
# products/ASC.People/Client/src/custom.scss
# products/ASC.Projects/Client/src/custom.scss
# web/ASC.Web.Client/src/custom.scss
# web/ASC.Web.Login/src/custom.scss
2021-06-02 10:23:08 +03:00
95dbfb8c5c
Merge branch 'develop' into feature/translations
2021-06-01 20:02:48 +03:00
23e1083be7
Web: Removed empty translations keys
2021-06-01 13:49:37 +03:00
76d8ebb459
Tests moved to separate projects.
...
Removed unused dependepcies
2021-06-01 12:21:51 +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
ce9f697d6e
Merge branch 'develop' into feature/restore-files-convertation
2021-06-01 10:52:07 +03:00
7beccd192b
Web: Added not found keys in 'de' language translation files (fix NotTranslatedKeysTest issue)
2021-05-31 20:33:12 +03:00
2018820472
Merge branch 'develop' into feature/crm-migrate
2021-05-31 19:37:51 +03:00
d7e3e71194
crm: removed DataContract attribute.
2021-05-31 19:37:00 +03:00
ccd30b7b90
crm: refactoring. used JsonPropertyName instead of DataMember
2021-05-31 19:14:59 +03:00
061b4e46e7
Web: Added not found 'de' language translation files (fix NotAllLanguageTranslatedTest issue)
2021-05-31 19:11:58 +03:00
e2b9561d7b
Web: Rewritten all json translation files with sorting of properties alphabetically
2021-05-31 18:34:15 +03:00
4cabbb7d52
Merge branch 'develop' into feature/11.5.2
2021-05-31 18:13:08 +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
afeec1942f
Files: fixed news request
2021-05-31 15:46:02 +03:00
0551bf6b98
Web: Files: moved convert dialog to store
2021-05-31 15:44:44 +03:00
570ede7bba
Merge branch 'develop' into feature/11.5.2
...
# Conflicts:
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
2021-05-31 13:32:51 +03:00
1a6d18fcdc
Files: fixed start docs
2021-05-31 12:37:13 +03:00
7026b19db0
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
2021-05-31 09:23:53 +03:00
a454c6a210
Web: People: commentary changes
2021-05-30 22:40:27 +03:00
c8c5b49d1c
Files: thumbnails. 2e37dcd0
2021-05-30 21:52:32 +03:00
b88ad2480d
Web: People: fixed by layouts
2021-05-30 17:50:52 +03:00
86b2d7547d
Web: People: commentary changes
2021-05-30 17:26:54 +03:00
74064fc76d
Merge branch 'develop' into feature/translations
2021-05-29 21:59:02 +03:00
72527ccded
Merge branch 'master' into develop
...
# Conflicts:
# lerna.json
# package.json
# packages/asc-web-common/package.json
# packages/asc-web-components/package.json
# products/ASC.CRM/Client/package.json
# products/ASC.Calendar/Client/package.json
# products/ASC.Files/Client/package.json
# products/ASC.Mail/Client/package.json
# products/ASC.People/Client/package.json
# 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-05-29 21:57:42 +03:00
d585c0a785
Web: Bumped version to 0.1.10
2021-05-29 21:26:13 +03:00
a9a7c0a4b7
crm: refactoring
2021-05-28 20:20:12 +03:00
401c8ca2e2
crm: migrate from newtonsoft to system.text.json
2021-05-28 18:18:55 +03:00
Artem Tarasov
a9a972dcaa
Web: Files: Thumbnails: fix after merge
2021-05-28 15:32:35 +03:00
Artem Tarasov
e7a7aed6ec
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# packages/asc-web-common/components/PageLayout/index.js
# products/ASC.Files/Client/src/Files.jsx
# products/ASC.Files/Client/src/HOCs/withFileActions.js
# products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContent.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/index.js
2021-05-28 15:30:39 +03:00
Artem Tarasov
215c933d9e
Web: added new translation keys "ProviderNotConnected", "Mail" to "static/locale/de/Common.json"
2021-05-28 13:28:40 +03:00
12bcf816b5
Web: Client: added new translations keys
2021-05-28 12:09:10 +03:00
d0bbcb8d5a
Files: moved from 08a01422
2021-05-28 11:22:35 +03:00
bda786f844
WebStudio: moved from 08a01422
2021-05-27 20:13:24 +03:00
3252372a77
Web: Files: fixed rename folder action
2021-05-27 16:16:30 +03:00
2cf57ece75
Web: Files: fixed files filter
2021-05-27 14:49:40 +03:00
e4f5da1f32
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-27 12:42:53 +03:00
f075863903
Web: Fixed FullDublicatesTest for "LblInviteAgain" translation key, key renamed for Article
2021-05-27 12:42:44 +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
3536be88c2
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-27 11:51:39 +03:00
00957a65ad
Web: moved translation keys "LblSelect", "EditUserDialogTitle", "Version"
2021-05-27 11:51:32 +03:00
b57da432bf
Web: Fixed FullDublicatesTest for "CopyEmailAndPassword" translation key, key moved to Common.
2021-05-27 11:50:11 +03:00
30cf4f8cde
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-27 11:14:31 +03:00
25ac98e272
Merge branch 'develop' into feature/translations
...
# Conflicts:
# products/ASC.Files/Client/public/locales/en/DeleteDialog.json
# products/ASC.Files/Client/public/locales/en/Home.json
# products/ASC.Files/Client/public/locales/ru/DeleteDialog.json
# products/ASC.Files/Client/public/locales/ru/Home.json
2021-05-27 11:13:41 +03:00
4321873f00
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-27 11:03:19 +03:00
178767a2b5
Web: Files: fixed translations
2021-05-27 11:03:12 +03:00
Artem Tarasov
95aa0153d6
Web: fixed ns
2021-05-27 11:00:13 +03:00
fe18e7e55c
Web: moved translation key "LblSelect"
2021-05-26 17:53:36 +03:00
151ffc7b26
Web: moved translation key "Active"
2021-05-26 17:46:09 +03:00
e437c7a035
Web: moved translationKeys "Size", "View", "Review"
2021-05-26 17:37:03 +03:00
3cb0ff476c
Files: resources
2021-05-26 17:23:48 +03:00
d8adef733c
ASC.Files: moved from 08a01422
2021-05-26 16:54:46 +03:00
364fc6bbeb
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-26 16:40:10 +03:00
541b14c8fe
Web: moved translationKeys "DisableUserButton", "NotFoundLanguage"
2021-05-26 16:40:02 +03:00
Artem Tarasov
e76939e84a
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-26 16:35:10 +03:00
Artem Tarasov
be2825c3cc
Web: fixed syntax in OperationsPanel.json
2021-05-26 16:34:49 +03:00
Artem Tarasov
55bbd5d28d
Web: moved translation key "Restore"
2021-05-26 16:32:33 +03:00
5293eadd27
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-26 16:29:05 +03:00
bf63128496
Web: moved translationKeys "LastName", "Language", "Mail"
2021-05-26 16:28:58 +03:00
2c5b95e352
Web: moved translationKeys "ProjectsProduct", "InviteLinkTitle", MoveConfirmationMessage"
2021-05-26 16:06:40 +03:00
Artem Tarasov
f902c4f79e
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# products/ASC.Files/Client/public/locales/de/Translations.json
# products/ASC.Files/Client/public/locales/en/Translations.json
# products/ASC.Files/Client/public/locales/ru/Translations.json
2021-05-26 15:45:18 +03:00
Artem Tarasov
202d50f891
Web: moved translationKey "Copy"
2021-05-26 15:42:54 +03:00
dc4872129b
Web: moved translationKeys "More", "Search", "AddFilter", "Comments"
2021-05-26 15:15:43 +03:00
563540528d
Web: moved translationKeys "MaleSexStatus", "maxSizeFileError", "orDropFileHereLabel"
2021-05-26 15:03:12 +03:00
f87b1f78f3
Web: moved translationKeys "Error", "ErrorUnknownFileImageType", "FemaleSexStatus", "LDAPLbl", "Location"
2021-05-26 14:55:33 +03:00
252fef7ae3
Web: moved translationKeys "AboutCompanyTitle", "ClearButton", "CommunityProduct", "EmptyFieldError"
2021-05-26 14:36:58 +03:00
3c1e322406
Web: moved translationKeys "Profile", "RecoverErrorMessage"
2021-05-26 14:21:11 +03:00
49bf2618d2
Web: moved translationKeys "Enable", "ProviderLoginError", "ProviderNotConnected"
2021-05-26 13:35:11 +03:00
5e6a7a8a20
Web: moved translationKeys "SendInviteAgain", "UploadingLabel", "DeleteOperation"
2021-05-26 13:16:51 +03:00
Artem Tarasov
03d9f482e7
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-26 12:36:39 +03:00
Artem Tarasov
5170f6d682
Web: moved translationKeys "Download", "DownloadButton" to "/static/locales/{lng}/Common.json"
2021-05-26 12:36:28 +03:00
761bf17625
Web: People: Moved translationKeys "SuccessChangeUserStatus", "NotBeUndone", "ReassignData"
2021-05-26 12:09:54 +03:00
Artem Tarasov
836b8e1467
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-26 11:45:45 +03:00
6159fb0b17
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# products/ASC.People/Client/public/locales/de/ProfileAction.json
# products/ASC.People/Client/public/locales/en/ProfileAction.json
# products/ASC.People/Client/public/locales/ru/ProfileAction.json
2021-05-26 11:45:16 +03:00
3eee928fae
Web: People: Moved translationKeys "SuccessSentInvitation", "SocialProfiles", "Sex", "selectNewPhotoLabel"
2021-05-26 11:44:37 +03:00
Artem Tarasov
98ee9062e8
Web: moved translation keys "SelectAll", "SelectAllLbl" to "/static/locales/{lng}/Common.json"
2021-05-26 11:44:36 +03:00
908ed811f4
Web: Files: Moved translationKeys "LinkText", "AddGroupsForSharingButton"
2021-05-26 11:28:02 +03:00
Artem Tarasov
a464ed15a8
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-26 11:19:51 +03:00
Artem Tarasov
e0fda9155a
Web: People: fixed duplicate translation key "EmailChangeButton", key moved to "@appserver/people/public/locales/{lng}/Translation.json"
2021-05-26 11:19:29 +03:00
fa3f537226
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-26 11:15:32 +03:00
35e336f748
Web: Files: Moved translationKeys "Account", "AddAccount", "ChangeOwner", "OwnerChange"
2021-05-26 11:15:25 +03:00
dc0507d17c
Web: Files: Moved translationKeys "Reconnect", "Login", "ConnectionUrl", "ConnectingAccount", "ConnectFolderTitle"
2021-05-26 11:03:07 +03:00
fbd4cf16fd
Web: Files: Moved translationKeys "Files", "DeleteSelectedElem", "DeleteFromTrash"
2021-05-26 10:47:53 +03:00
edd797d662
Web: Files: Moved translationKeys "DownloadAs", "ArchivingData", "Folders"
2021-05-25 16:29:36 +03:00
c379dc5edc
Web: Files: Moved translationKeys "Presentations", "Spreadsheets", "Author"
2021-05-25 16:11:26 +03:00
7c6212384f
Web: Files: removed duplicate translationKeys "CopyOperation", "DeleteThirdParty"
2021-05-25 15:40:17 +03:00
74b45edf3b
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-25 15:22:36 +03:00
Artem Tarasov
144c7479e2
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
...
# Conflicts:
# products/ASC.Files/Client/public/locales/de/Home.json
2021-05-25 15:25:57 +03:00
Artem Tarasov
f68bb45e61
Web: moved translation keys "Delete", "DeleteButton" to "/static/locales/{lng}/Common.json"
2021-05-25 15:22:59 +03:00
492bc86117
Web: Files: removed duplicate translationKeys "MoveToOperation", "LinkCopySuccess", "EncryptedFileSaving"
2021-05-25 15:22:30 +03:00
3c50d442d3
Web: Files: Moved translationKeys "Move", "MoveConfirmationAlert"
2021-05-25 14:58:28 +03:00
2e6bf1457b
Web: Files: removed duplicate translationKeys "MoveConfirmation", "CommonSettings", "ThirdPartySettings"
2021-05-25 14:36:53 +03:00
4b110884a9
Web: Moved translationKeys "DeleteSelfProfile", "PendingTitle"
2021-05-25 14:06:05 +03:00
45fffaf652
Web: Moved translationKeys "PasswordChangeButton", "RemoveData"
2021-05-25 13:55:34 +03:00
478d2764ec
Web: Moved translationKeys "AddMembers"
2021-05-25 13:34:57 +03:00
Artem Tarasov
671f98519a
Web: Moved translation Keys "ContinuteButton" to "/static/locales/{lng}/Common.json"
2021-05-25 12:49:56 +03:00
60679a5da7
Web: Moved translationKeys "Disabled", "Close"
2021-05-25 11:43:42 +03:00
f6fbe33814
Web.Core: moved from 08a01422
2021-05-24 20:41:31 +03:00
e01af3fd20
Web: Moved translationKeys "AdminSettings" to "/static/locales/{lng}/Common.json"
2021-05-24 19:47:26 +03:00
a80890f7cc
Web: Moved translationKeys "Guest" to "/static/locales/{lng}/Common.json"
2021-05-24 19:40:26 +03:00
f94c19385f
Web: Moved translationKeys "Settings" to "/static/locales/{lng}/Common.json"
2021-05-24 19:31:41 +03:00
43e65a51d1
Web: Moved translationKeys "Next", "Previous", "PageOfTotalPage" and "CountPerPage" to "/static/locales/{lng}/Common.json"
2021-05-24 19:22:20 +03:00
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
1e954b15d7
Web: Moved translationKeys "PasswordLimitLength", "PasswordLimitMessage", "PasswordLimitDigits", "PasswordLimitSpecialSymbols" and "PasswordLimitUpperCase" to "/static/locales/{lng}/Common.json"
2021-05-24 19:05:29 +03:00
b8edf32f87
Web: Moved translationKeys "User", "Warning" to Common.json
2021-05-24 17:55:14 +03:00
7697b9bf5d
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-24 17:40:36 +03:00
Artem Tarasov
e84e83816a
Web: Files: Settings: fixed usage translation key
2021-05-24 14:53:40 +03:00
c652209b49
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-24 13:58:54 +03:00
90c67cac13
ASC.Files.Thirdparty, ASC.Web.Core, ASC.ApiSystem: moved from 08a01422
2021-05-24 13:26:13 +03:00
c8e5c5a93c
crm: migrate from ProgressQueue to DistributedTaskQueue
2021-05-24 12:56:49 +03:00
1b730233c9
ElasticSearch: moved from 08a01422
2021-05-23 19:11:25 +03:00
Artem Tarasov
7e7a8302d5
Web: Files: fixed the transition to the folder when clicking on the newItems badge
2021-05-22 02:19:17 +03:00
Artem Tarasov
cdd7d43fa5
Web: Files: fixed badges postion
2021-05-22 02:07:24 +03:00
Artem Tarasov
be0aca139b
Web: fixed usage translation keys for errorsKeys in ChangeEmailDialog
2021-05-22 01:31:03 +03:00
e83d1d5922
Web: Moved translationKeys "DirectionAscLabel" and "DirectionDescLabel" to "/static/locales/{lng}/Common.json"
2021-05-21 17:59:28 +03:00
e52f868dd4
Web: Moved translationKeys "AddButton" to "/static/locales/{lng}/Common.json"
2021-05-21 17:53:12 +03:00
5159e351c4
Web: Moved translationKeys "ShowUsersList" to "/static/locales/{lng}/Common.json"
2021-05-21 17:45:12 +03:00
f31642615a
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-21 16:53:51 +03:00
Artem Tarasov
78d7bfa4c2
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-21 16:58:09 +03:00
Artem Tarasov
87e1d1050a
Web: Files: fixed translation usage for keys: "ExternalLink", "InternalLink"
2021-05-21 16:57:42 +03:00
d6a5041c3d
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-21 16:38:23 +03:00
facf0a01cf
Web: Moved translationKeys "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter" to "/static/locales/{lng}/Common.json"
2021-05-21 16:37:46 +03:00
Artem Tarasov
765481a578
Web: Files: fixed translation usage for keys: "TooltipElementCopyMessage", "TooltipElementMoveMessage", "TooltipElementsCopyMessage", "TooltipElementsMoveMessage"
2021-05-21 16:35:55 +03:00
b0e2ee5a19
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-21 16:31:24 +03:00
c1b7ea5a9a
Storage: moved from 08a01422
2021-05-21 16:26:42 +03:00
Artem Tarasov
90a04bcfc7
Merge branch 'feature/translations' of github.com:ONLYOFFICE/AppServer into feature/translations
2021-05-21 15:47:08 +03:00
Artem Tarasov
e2651028cf
Web: Files: fixed translation usage for Settings Title
2021-05-21 15:46:58 +03:00
ae27c9e917
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-21 15:44:50 +03:00
8e889049c2
Merge branch 'feature/translations' of https://github.com/ONLYOFFICE/AppServer into feature/translations
2021-05-21 15:03:19 +03:00
14214f2ad8
Web: Fixed translation usage for keys: "SignInWithFacebook", "SignInWithGoogle", "SignInWithLinkedIn", "SignInWithTwitter"
2021-05-21 15:00:30 +03:00
5afe35f58f
Web: Removed useless translations
2021-05-21 14:24:16 +03:00
989f74af52
Web: Removed useless translations
2021-05-21 13:36:02 +03:00
d83498f603
Web: Files: fixed tree menu update
2021-05-21 11:32:22 +03:00
db4d769321
Web: Moved translationKeys "Actions" to "/static/locales/{lng}/Common.json"
2021-05-21 11:22:43 +03:00
50efa8f384
Web: Moved translationKeys "MeLabel", "DefaultOptionLabel" and "AuthorMe" to "/static/locales/{lng}/Common.json"
2021-05-21 11:16:54 +03:00
bebc5ce03a
Web: Moved translationKey "Documents" to "/static/locales/{lng}/Common.json"
2021-05-21 11:12:03 +03:00
eb7f493304
Web: Moved translationKeys "RequiredField" and "FullAccess" to "/static/locales/{lng}/Common.json"
2021-05-21 11:05:37 +03:00
8120e24d15
Web: Moved translationKeys "Type", "ByType" and "UserType" to "/static/locales/{lng}/Common.json"
2021-05-21 10:43:52 +03:00
cc2bb50862
Web: Resolved NotFoundKeysTest issues
2021-05-21 10:31:32 +03:00
f586f4d428
Web: Files: fixed crash page if folder doesn't exist
2021-05-21 10:30:22 +03:00
1f299420a1
Web: Files: added update tree menu
2021-05-21 10:29:58 +03:00
cec5dd3330
Web: Files: refactoring
2021-05-21 10:26:18 +03:00
83892c08ca
Web: Files: Remove old translation key
2021-05-20 15:18:38 +03:00
46627f202c
Web: Moved translationKeys "EditButton" and "EditAvatar" to "/static/locales/{lng}/Common.json"
2021-05-20 14:11:27 +03:00
3ace83bd61
Web: Files: fixed onFilesClick
2021-05-20 14:00:41 +03:00
ac976de0a5
Web: Files: fixed onFilesClick
2021-05-20 13:55:58 +03:00
cda77e1234
Merge branch 'develop' into bugfix/context-actions
2021-05-20 13:24:18 +03:00