b088c925d6
Merge branch 'develop' into feature/personal
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
# products/ASC.Files/Client/src/pages/Home/index.js
# products/ASC.Files/Client/src/store/FilesStore.js
2021-06-17 15:47:33 +03:00
0aa2eb3e85
Web: Files: removed react-selectable-fast library
2021-06-17 14:27:41 +03:00
6118e95028
Merge branch 'develop' into feature/personal
2021-06-17 14:25:09 +03:00
a3298a49ac
Web: Files: fixed createTreeFolders
2021-06-17 12:04:01 +03:00
d7c8f22ea3
Merge branch 'develop' into feature/tree-menu-bugfix
2021-06-17 11:09:19 +03:00
b6d4408ce0
Files: fixed subfolders method
2021-06-16 21:53:56 +03:00
01639a56cc
RazorCompileOnBuild:false<
...
GenerateMvcApplicationPartsAssemblyAttributes:false
2021-06-16 20:08:26 +03:00
53ee0ef484
fixed warnings
2021-06-16 18:00:27 +03:00
3018e1822f
crm: fix path
2021-06-16 17:30:31 +03:00
e314f6ff1c
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
...
Feature/crm migrate
2021-06-16 17:02:46 +03:00
5fcbdbd7dd
added health checks
2021-06-16 16:54:36 +03:00
1250201319
Web: Files: fixed upload progress
2021-06-16 14:31:13 +03:00
0ff78c5192
Merge branch 'develop' into feature/tree-menu-bugfix
2021-06-16 13:47:56 +03:00
7d0a1d340d
Web: Files: fixed files render, removed log
2021-06-16 13:47:15 +03:00
b738bbc268
Web: Files: fixed files render
2021-06-16 13:38:18 +03:00
db7cfacd62
Files: remove warnings
2021-06-15 22:46:26 +03:00
91e4d844fb
Files: fix download
2021-06-15 21:40:12 +03:00
7d59d8f3a6
Web: Files: fixed deleteThirdParty
2021-06-15 18:59:07 +03:00
456a82a3fc
Web: Files: fixed tree menu update
2021-06-15 17:23:07 +03:00
ee029d557b
fixed tests
2021-06-15 17:20:53 +03:00
ad52d25d28
Web: Files: added tree menu update after folder deletion
2021-06-15 16:12:15 +03:00
dc1afaeafc
Merge branch 'develop' into hotfix/package_version_increment
2021-06-15 16:01:19 +03:00
9c5dee7752
Index: separate configs
2021-06-15 15:57:16 +03:00
605d5ce043
removed unused references
2021-06-15 15:52:29 +03:00
c09a637758
Web: Files: changed the logic of opening the folder tree
2021-06-15 14:59:51 +03:00
d07273cee8
Web: Files: fixed display of tree menu, added new api for tree menu
2021-06-15 14:15:48 +03:00
Artem Tarasov
f8e28e5952
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-15 14:06:29 +03:00
89264cc48d
crm: created common project for common services
2021-06-15 13:41:17 +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
Artem Tarasov
ee4760e899
Merge branch 'develop' into feature/thumbnails
...
# Conflicts:
# products/ASC.Files/Client/src/HOCs/withFileActions.js
2021-06-11 18:30:44 +03:00
4a154db396
Web: removed useless translations
2021-06-11 18:07:51 +03:00
5db2e8a868
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 17:50:28 +03:00
68f880254e
Web: Files: added dialog for converting to context actions
2021-06-11 17:20:38 +03:00
Artem Tarasov
d44f1bee0f
Web: fixed loading people/my, fixed Loaders.ProfileView, deleted unnecessary code
2021-06-11 16:57:17 +03:00
e074c0cf93
Web: Files: changed color of conversion
2021-06-11 16:56:43 +03:00
ef59a2ac47
Web: Files: added hideConfirmConvert setting
2021-06-11 15:49:32 +03:00
cc79e88737
increment version
2021-06-11 15:27:52 +03:00
e0d076a7bc
Merge branch 'develop' into feature/restore-files-convertation
2021-06-11 15:17:35 +03:00
Artem Tarasov
f181a491fb
Merge branch 'develop' into bugfix/fixed-styles
2021-06-11 14:56:52 +03:00
Artem Tarasov
1073da9d58
Web: deleted unnecessary code
2021-06-11 14:55:53 +03:00
6b1656ff10
Files: settings
2021-06-11 14:33:07 +03:00
61e957d00a
Files: added /subfolders request
2021-06-11 14:24:01 +03:00
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