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
1b730233c9
ElasticSearch: moved from 08a01422
2021-05-23 19:11:25 +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
af2f24e4ac
Merge branch 'develop' into feature/translations
2021-05-20 13:11:13 +03:00
f5372bbba8
Web: People: MyProfile: Fix translations loading
2021-05-20 11:45:13 +03:00
fc822e5ad5
Web: Fix setModuleInfo usage
2021-05-20 11:27:50 +03:00
3b7f1f60ec
Web: Files: fixed loopTreeFolders
2021-05-20 11:17:50 +03:00
5de1182bfa
Web: Files: fixed NewFilesPanel error
2021-05-19 18:55:12 +03:00
52750c607d
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
2021-05-19 18:14:40 +03:00
f04a4560b4
Web: Files: moved getNewFiles to actions
2021-05-19 18:14:35 +03:00
e268b077df
Web: Files: Store: Fixed displaying edit action for files with low access
2021-05-19 17:54:29 +03:00
666cc00a52
Web: Files: Store: Fixed copy action for shared files inside root. Added view action for edited files
2021-05-19 17:48:23 +03:00
03a71ae131
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
...
# Conflicts:
# products/ASC.Files/Client/src/components/dialogs/DeleteDialog/index.js
2021-05-19 17:11:46 +03:00
23c075859b
Web: Files: moved mark as read to actions
2021-05-19 17:11:10 +03:00
1003c6fe15
Web: Files: Dialog: Added unsubscribe action for DeleteDialog
2021-05-19 17:03:03 +03:00
e5f066e074
Web: Files: Store: Added unsubscribeAction for FilesActionsStore
2021-05-19 16:54:17 +03:00
cf49743054
Web: Files: Store: Added unsubscribe mark for Dialog
2021-05-19 16:53:32 +03:00
98d9fb4e33
Web: Files: HOC: Added unsubscribe action
2021-05-19 16:52:38 +03:00
e4f10d16cb
Server: Files: Controller: FilesController: Fixed model parse for delete share
2021-05-19 16:50:08 +03:00
2cd59d9014
Merge branch 'bugfix/context-actions' of https://github.com/ONLYOFFICE/AppServer into bugfix/context-actions
2021-05-19 13:55:13 +03:00
d5ff576188
Web: Files: Store: Added mark read action, added remove from list and mark read icons
2021-05-19 13:54:45 +03:00
49e70d1ccc
Web: Files: removed useless code
2021-05-19 13:46:53 +03:00
536c6c2f5e
Web: Moved custom.scss to @appserver/common
...
+ Added missing ErrorBoundary
+ Removed useless commented code
2021-05-19 11:14:44 +03:00
86952dd71e
Merge branch 'develop' into bugfix/context-actions
2021-05-19 10:19:17 +03:00
3433c074d7
Merge branch 'develop' into feature/my-profile
...
# Conflicts:
# products/ASC.People/Client/src/pages/ProfileAction/Section/Body/updateUserForm.js
2021-05-19 10:16:40 +03:00
b9c52c526e
Fixed DistributedTask
2021-05-18 21:24:22 +03:00
1b4807c07a
Files: fixed SetTagsNew for thirdparty
2021-05-18 20:10:48 +03:00
2f7b9102ee
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into develop
2021-05-18 20:06:42 +03:00
d9e17af9d5
OneDrive: fix DI
2021-05-18 20:06:06 +03:00
c4c4d940a0
Merge pull request #252 from ONLYOFFICE/feature/remove-wq
...
Feature/remove wq
2021-05-18 19:04:34 +03:00
5f36009630
Web: Moved translationKeys "LoadingDescription" and "LoadingLabel" to "/static/locales/{lng}/Common.json"
2021-05-18 18:35:03 +03:00
8ad59d282b
Web: Files: Store: Added mark read button
2021-05-18 18:18:38 +03:00
bc901b8a4a
Web: People: disabled user type change
2021-05-18 18:00:29 +03:00
2c6d06f304
Web: Files: fixed drag
2021-05-18 17:59:02 +03:00
df1ebc8d77
Web: Moved translationKeys "OpenApp" and "ViewWeb" to "/static/locales/{lng}/Common.json"
2021-05-18 15:23:12 +03:00
f6ecc35ae7
Web: Moved translationKeys "LearnMore" and "ComingSoon" to "/static/locales/{lng}/Common.json"
2021-05-18 15:10:20 +03:00
0ae236ad6d
Web: Moved translationKey "People" to "/static/locales/{lng}/Common.json"
2021-05-18 14:42:44 +03:00
923f5012bc
Web: Moved translationKey "SendButton" to "/static/locales/{lng}/Common.json"
2021-05-18 14:35:54 +03:00
49780cee24
Web: Moved translationKey "Email" to "/static/locales/{lng}/Common.json"
2021-05-18 14:27:59 +03:00
99b86212dd
Web: Moved translationKey "Password" to "/static/locales/{lng}/Common.json"
2021-05-18 13:57:17 +03:00
08411cfc3b
Web: Moved translationKey "CloseButton" to "/static/locales/{lng}/Common.json"
2021-05-18 13:47:36 +03:00
35da962d06
Web: Moved translationKey "LoadingProcessing" to "/static/locales/{lng}/Common.json"
2021-05-18 13:40:32 +03:00
7a2167a0b9
Web: Rename translationKeys to Common "OKButton", "SaveButton" and "CancelButton" to "/static/locales/{lng}/Common.json"
2021-05-18 13:23:54 +03:00
629239fd9b
Web: Moved translationKey "OkButton" to "/static/locales/{lng}/Common.json"
2021-05-18 13:07:05 +03:00
bad58f32f2
Merge branch 'develop' into bugfix/context-actions
2021-05-18 11:05:43 +03:00
cdb9ef6be9
Web: Moved translationKey "SaveButton" to "/static/locales/{lng}/Common.json"
2021-05-18 10:56:24 +03:00
036a8595c2
Web: Files: fixed update badges new
2021-05-17 17:55:55 +03:00
002469c650
Web: Files: added progress to "mark as read" operation
2021-05-17 17:53:52 +03:00
ef8b4d8a3a
Web: Files: removed useless code, fixed getting file icons
2021-05-17 17:43:05 +03:00
4b1c067d34
Web: Files: fixed badge new translation
2021-05-17 17:41:35 +03:00
a5c6ba5dcc
Common, db: moved from 08a01422
2021-05-17 14:35:00 +03:00
f907244431
Web: Files: Store: Added remove from list button, fixed displaying separator and some actions inside context menu
2021-05-17 12:27:09 +03:00
85cb6b822a
Merge branch 'develop' into bugfix/context-actions
2021-05-17 12:25:27 +03:00
b91ddca880
Web: Moved translationKey "CancelButton" to "/static/locales/{lng}/Common.json"
2021-05-17 12:08:57 +03:00
2beacfcf23
Web: Enabled Common.json translations loading
2021-05-17 11:19:38 +03:00
8ba2d041f9
Merge branch 'develop' into bugfix/fixed-files-badges
2021-05-14 15:29:12 +03:00
31752e64b4
fixed warnings
2021-05-14 15:26:18 +03:00
0792920677
Web: Files: hid the edit icon if the file is locked
2021-05-14 14:11:16 +03:00
fe38eb0f44
Web: Files: fixed locked badge
2021-05-14 14:10:08 +03:00
85bd971735
Merge branch 'develop' into feature/translations
2021-05-14 12:07:48 +03:00
eb628d3703
Merge branch 'develop' into bugfix/enable-favorites-recent-settings
2021-05-14 11:34:10 +03:00
1a58007fcd
Web: Common: removed custom selection frame
2021-05-14 11:21:59 +03:00
ef085ef7df
Web: Files: enable favorites and recent settings
2021-05-14 11:08:57 +03:00
f4e8ddc33b
Merge branch 'develop' into bugfix/fixed-header-loader
2021-05-14 10:45:15 +03:00
359ead6b85
Files: added RecentSection, FavoritesSection
2021-05-13 20:25:49 +03:00
67e166772c
Web: People: MyProfile: Added setModuleInfo
2021-05-13 18:20:24 +03:00
75a603f439
Web: Files: removed useless code
2021-05-13 15:39:44 +03:00
acccdfbda5
Web: Files: fixed setSelectedFolder
2021-05-13 15:39:18 +03:00
d7d22a9369
Web: People: Disabled editing of UserType and Group in MyProfile with action=edit
2021-05-13 13:43:45 +03:00
3db2963106
Web: People: Added transition back from MyProfile with action=edit
2021-05-13 13:08:30 +03:00
bb48586343
Web: People: Added transition back from MyProfile
2021-05-13 13:03:36 +03:00
f5b242e957
Web: People: Added transition to edit page from MyProfile
2021-05-13 12:56:11 +03:00
16deb72acc
Web: People: MyProfile refactoring
2021-05-13 11:26:55 +03:00
6867ded281
Merge branch 'develop' into feature/remove-wq
...
# Conflicts:
# common/ASC.Common/DIHelper.cs
# common/ASC.Common/Threading/DistributedTaskQueue.cs
# common/ASC.Common/Threading/Progress/ProgressQueue.cs
# common/ASC.Common/Threading/Workers/WorkerQueue.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.Data.Storage/StaticUploader.cs
# common/ASC.Data.Storage/StorageUploader.cs
# common/services/ASC.Data.Backup/BackupServiceLauncher.cs
# common/services/ASC.Data.Backup/Service/BackupService.cs
# common/services/ASC.Data.Backup/Service/BackupWorker.cs
# common/services/ASC.Data.Backup/Startup.cs
# common/services/ASC.Data.Storage.Encryption/EncryptionOperation.cs
# common/services/ASC.Data.Storage.Encryption/EncryptionWorker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.People/Server/Startup.cs
# web/ASC.Web.Core/Users/UserPhotoManager.cs
2021-05-13 11:23:44 +03:00
710e3db4c5
Web: People: Added new component "people/MyProfile" for users without "People" module access
2021-05-13 10:55:31 +03:00
d5163fe61c
Web: Files: fixed closing MediaViewer
2021-05-12 16:08:20 +03:00
5a06c56d15
Web: Files: fixed remove media files
2021-05-12 14:23:18 +03:00
72ed5e031c
Web: Common: hide delete icon from MediaViewer for shared folder
2021-05-12 14:05:54 +03:00
9ea5a131e8
Web: Files: fixed MediaViewer crash
2021-05-12 11:55:34 +03:00
55b3d86dba
Web: Files: Store: Added open location for favorite folder
2021-05-12 11:37:28 +03:00
93677ecb9b
Merge branch 'develop' into bugfix/context-actions
2021-05-12 10:52:58 +03:00
12e805fff7
Merge branch 'develop' into bugfix/fixed-description-for-download-as
2021-05-11 18:08:34 +03:00
fe2701740b
Web: Files: fixed description for action download as
2021-05-11 14:59:53 +03:00
888de70778
Web: Files: fixed ThirdParty connection settings
2021-05-11 14:31:45 +03:00
4dc54feb19
Web: Files: added loader to DeleteThirdPartyDialog
2021-05-11 14:29:17 +03:00
3fa9e0659a
Web: Files: fixed "Open folder" in the Recent folder
2021-05-11 14:12:08 +03:00
f0bb88da5f
Web: People: fixed incorrect user date of birth
2021-05-11 13:46:23 +03:00
8f6bcf6e68
Web: Client scripts optimizations:
...
+ Fix deploy script (xcopy not installed issue)
+ Added concurrently for build and deploy scripts
+ Added new packages "mkdirp" (original "mkdir" not working with yarn run <script>), "rimraf"
+ Added missing "terser-webpack-plugin" package
2021-05-07 20:59:39 +03:00
3ae370deed
Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop
2021-05-07 18:54:42 +03:00
6c3244a3e9
Web: Added opportunity to deploy all static clients to build/deploy directory (yarn build && yarn deploy)
2021-05-07 18:54:25 +03:00
fc76758e65
Merge branch 'develop' into feature/portal-modal-dialog
2021-05-07 11:01:36 +03:00
69fb32552a
Web: People: fixed InviteDialog z-index
2021-05-07 11:01:16 +03:00
0173c85c8f
fix Bug 50069
2021-05-06 20:59:27 +03:00
7670ea3e4c
Web: Files: fixed version history panel crash
2021-05-06 16:42:07 +03:00
95c9c9d1a3
Merge branch 'develop' into feature/portal-modal-dialog
2021-05-06 16:30:31 +03:00