Commit Graph

5331 Commits

Author SHA1 Message Date
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
af2f24e4ac Merge branch 'develop' into feature/translations 2021-05-20 13:11:13 +03:00
16d6db9054 Web: Files: fixed context-menu drag 2021-05-20 12:54:16 +03:00
c2a3d1efee Web: fixed mobile page swipe 2021-05-20 12:08:07 +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
fc195f0325 Web: People: refactoring 2021-05-20 02:17:03 +03:00
0a5662220c Web: People: refactoring 2021-05-20 02:09:49 +03:00
ece8fcaabb Web: People: get backup codes count 2021-05-20 02:01:37 +03:00
b99ab0aa2a Web: People: get old backup codes 2021-05-20 01:44:20 +03:00
8c504e762b Web: People: added error handler 2021-05-20 01:29:38 +03:00
c950d53751 Web: People: deleted console, unused imports 2021-05-20 01:16:28 +03:00
4e57f2a47f Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-20 00:47:45 +03:00
5de1182bfa Web: Files: fixed NewFilesPanel error 2021-05-19 18:55:12 +03:00
2ee22ab052 Web: People: hide tfa settings if tfa dissabled 2021-05-19 18:51:32 +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
4b4b03f2a4 Merge branch 'develop' into feature/crm-migrate 2021-05-18 19:06:54 +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
9591974312 Web: People: reset tfa app 2021-05-17 23:29:03 +03:00
86a7802ada crm: refactoring 2021-05-17 19:32:05 +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
bbe1f1f205 crm: code refactoring 2021-05-17 17:50:55 +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
a98e12c2b7 Web: People: show tfa backup codes 2021-05-17 17:32:32 +03:00
36ce7a1b93 Web: People: fixed translations 2021-05-17 17:21:29 +03:00
0eb4f830d2 Web: People: fixed translates 2021-05-17 17:11:15 +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
f1ca0971fd crm: fixed work with sql queries 2021-05-15 17:42:16 +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
d85f6c0c1c crm:refactoring 2021-05-12 20:58:22 +03:00
d5163fe61c Web: Files: fixed closing MediaViewer 2021-05-12 16:08:20 +03:00
Artem Tarasov
99b3947016 Web: Files: Tiles: fix badges style, deleted unnecessary code 2021-05-12 15:56:19 +03:00
Artem Tarasov
59ad4fa563 Web: Files: Tile: added onThumbnailClick, doubleClick 2021-05-12 15:33:43 +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
Artem Tarasov
9d694ebe6e Web: Files: Tiles: fix EditingWrapperComponent style 2021-05-12 11:20:14 +03:00
93677ecb9b Merge branch 'develop' into bugfix/context-actions 2021-05-12 10:52:58 +03:00
Artem Tarasov
e6c97ef78e Web: Files: Tiles: fix after merge 2021-05-12 01:15:30 +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
c857751572 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	yarn.lock
2021-05-11 12:22:17 +03:00
Artem Tarasov
58a41faa4a Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
#	yarn.lock
2021-05-11 10:30:19 +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
09ef8ba660 crm.server: refactoring. remove obsolete cache class. In future release I will use EF Core cache 2021-05-07 17:00:51 +03:00
7a27280dc3 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-07 14:49:44 +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
3a4ae6c041 Web: Files: fixed remove files from MediaViewer 2021-05-06 15:39:44 +03:00
a6064acce5 Merge branch 'develop' of https://github.com/ONLYOFFICE/AppServer into develop 2021-05-06 14:58:19 +03:00
b7af18f636 v0.1.9 2021-05-06 14:57:01 +03:00
7baf093162 fix Bug 50092 2021-05-06 13:27:15 +03:00
b222f46837 Web: Files: added remove dialog to MediaViewer 2021-05-06 12:53:03 +03:00
5216ab5b6d Web: Fixed ModalDialog component styles 2021-05-06 12:51:32 +03:00
37f8bdd872 Merge branch 'master' into develop 2021-05-05 20:52:06 +03:00
5e5ae79505 Merge branch 'hotfix/v0.1.9' of github.com:ONLYOFFICE/AppServer into hotfix/v0.1.9 2021-05-05 17:20:46 +03:00
f96369f293 Web: Files: Store: Fixed displaying move context option 2021-05-05 17:20:24 +03:00
92ce702b28 crm: refactoring. bugfix 2021-05-05 17:09:05 +03:00
7bfb525bd5 Web: Files: fixed toastr error 2021-05-05 16:11:07 +03:00
261e6d8b4c Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth 2021-05-05 15:09:59 +03:00
5f0f262adf Web: People: get tfa backup codes 2021-05-05 14:59:58 +03:00
7f059353c7 Files: fix thridparty opitons 2021-05-05 14:48:15 +03:00
85f5b3c775 fix Bug 49858 2021-05-05 11:45:13 +03:00
4aecce0565 Web: Files: Fix Download files from third-party 2021-05-05 10:33:13 +03:00
91980d7dae Merge branch 'hotfix/v0.1.9' of github.com:ONLYOFFICE/AppServer into hotfix/v0.1.9 2021-05-04 20:36:07 +03:00
48427fd471 Files: fixed SetFileStatus for thirdparty files 2021-05-04 20:23:38 +03:00
35ef6c27bf Web: Files: removed file format for unselected items 2021-05-04 17:42:06 +03:00
6600c44900 Web: Files: fixed display filter 2021-05-04 16:41:03 +03:00
13c0a46280 Web: Files: Store: Fixed displaying delete context option for folder if not accessed 2021-05-04 11:19:08 +03:00
a23bb04864 Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9 2021-05-04 10:43:32 +03:00
90229e7a67 Files: fixed favorites 2021-05-02 19:47:21 +03:00
fc7bfcea50 Files: fixed onedrive 2021-04-30 18:13:42 +03:00
ce9ff9d715 Files: fixed recent files 2021-04-30 18:13:18 +03:00
2b0949c4c0 remove unused project 2021-04-30 18:08:15 +03:00
424c6a6806 migrate base mapper class from ASC.CRM to ASC.Common 2021-04-30 17:52:57 +03:00
7ba67cf63a Web: Fix click on webView link on ComingSoonPage (CRM, Projects, Mail, Calendar) 2021-04-30 17:25:26 +03:00
9bdc643840 crm: add support WindowsService/systemd for IHostBuilder 2021-04-30 15:33:33 +03:00
0c8a06dbe5 Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9 2021-04-30 15:19:24 +03:00
9f3f03a963 Web: added store to webpack.config, fixed Firefox store problems 2021-04-30 15:19:11 +03:00
d55b39a653 Web: Files: Added and fix AutoFocus, tabulation and close on errors in ConnectDialog 2021-04-30 14:02:58 +03:00
56997c5cb8 Thirdparty: Fix Token can't be null on WebDav (login/password issue) 2021-04-30 13:42:57 +03:00
ca819a930c Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9 2021-04-30 11:12:44 +03:00
23ed6b9d84 Web: Files: fixed isAuthenticated for Firefox 2021-04-30 11:12:34 +03:00
a116672441 Web: Files: Dialogs: Fixed setting login information at webdav connections from article 2021-04-29 16:50:53 +03:00
f4cf187485 Web: Files: Dialogs: Fixed setting login information at webdav connections 2021-04-29 16:26:34 +03:00
804be561fb Web: Files: Store: Fixed displaying delete context option if not accessed 2021-04-29 16:17:18 +03:00
12972dafa7 Web: Files: Store: Fixed displaying share context option if not accessed 2021-04-29 15:02:57 +03:00
ad40499083 Web: Files: Settings: Fixed displaying common settings for visitors 2021-04-29 14:51:36 +03:00
eb76b43464 Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9 2021-04-29 14:45:24 +03:00
7c9d646df9 Web: Files: fixed context menu options 2021-04-29 14:45:13 +03:00
61695dfb5f Web: Files: Hide Facebook share link (new FB SDK required) 2021-04-29 13:44:37 +03:00
90a5a79d03 Web: Files: Added encodeURIComponent (e-mail shared link issue) 2021-04-29 12:45:33 +03:00
9e40feb771 Added and applied Common.json for common translations (languages issue) 2021-04-29 10:14:47 +03:00
8816e535c1 merge from develop 2021-04-28 19:50:59 +03:00
72eaa8ff2d Merge branch 'hotfix/v0.1.9' of https://github.com/ONLYOFFICE/AppServer into hotfix/v0.1.9 2021-04-28 18:08:16 +03:00
127c240d9e Web: Files: fixed default selected folder for visitor 2021-04-28 18:08:03 +03:00
35364c97be Web: Files: HOC: Added missing folder id for copy link action 2021-04-28 17:03:06 +03:00
0922970121 Merge branch 'hotfix/v0.1.9' of github.com:ONLYOFFICE/AppServer into hotfix/v0.1.9 2021-04-28 16:56:18 +03:00
ea74579f8a Web: Files: Store: Fixed displaying badges for new files at favorites 2021-04-28 16:56:10 +03:00
a34b6d96e9 Web: Files: removed moveTo action from header for shared folder 2021-04-28 16:41:15 +03:00
6527fa7da7 Web: Files: fixed isAccessedSelected 2021-04-28 16:17:23 +03:00
b27e973ec0
Merge pull request #237 from ONLYOFFICE/feature/support-hosting-as-service
Feature/support hosting as service
2021-04-28 15:33:53 +03:00
584a88c025 Web: Files: fixed context menu of share 2021-04-28 14:35:49 +03:00
fc4a58966c Web: Bumped version to 0.1.9 2021-04-28 14:03:59 +03:00
8fc80a419b Merge branch 'develop' into feature/translations 2021-04-28 13:08:52 +03:00
3c7ab3b748 Web: People: fixed after merge 2021-04-28 11:25:58 +03:00
0656725149 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Confirm/index.js
2021-04-28 11:20:32 +03:00
7f436ef3cb add support WindowsService/systemd for IHostBuilder 2021-04-27 19:25:03 +03:00
Vladislav Makhov
decb2857e6 Merge branch 'release/v0.1.8' of github.com:ONLYOFFICE/AppServer into release/v0.1.8 2021-04-27 15:52:31 +03:00
Vladislav Makhov
52ade0bcf5 web: files: fix share button render 2021-04-27 15:51:35 +03:00
a231d8acf3 Web: Files: Article: Removed missing console log 2021-04-27 15:05:43 +03:00
Artem Tarasov
dfef5346ff Web: Files: Tiles: fix after merge 2021-04-27 14:52:29 +03:00
cc8d628cdb Web: Files: Store: Fixed displaying "Add account" for third-party accounts for visitors 2021-04-27 14:38:47 +03:00
6c51ae8a15 Merge branch 'develop' into feature/translations 2021-04-27 13:59:58 +03:00
2b6d536590 Merge branch 'release/v0.1.8' of https://github.com/ONLYOFFICE/AppServer into release/v0.1.8 2021-04-27 13:48:38 +03:00
Artem Tarasov
5d2264d483 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	products/ASC.Files/Client/src/components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/FileItem.js
#	products/ASC.Files/Client/src/components/FilesContainer.js
#	products/ASC.Files/Client/src/components/FilesContent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
#	products/ASC.Files/Client/src/components/panels/NewFilesPanel/index.js
#	products/ASC.Files/Client/src/components/sub-components/Badges.js
#	products/ASC.Files/Client/src/components/sub-components/EditingWrapperComponent.js
#	products/ASC.Files/Client/src/components/sub-components/Icons.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/FilesRowContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/RowsView/SimpleRowContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/BadgesFileTile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/FilesTileContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/SimpleTileContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/Tile.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContainer.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/TilesView/sub-components/TileContent.js
#	products/ASC.Files/Client/src/pages/Home/Section/Body/index.js
#	products/ASC.Files/Client/src/pages/Home/Section/Filter/index.js
2021-04-27 13:40:38 +03:00
c324693034 Merge branch 'develop' into release/v0.1.8 2021-04-27 12:11:36 +03:00
Alexey Kostenko
bf963f511b Merge branch 'develop' into bugfix/thirdparty 2021-04-27 11:25:30 +03:00
6bd11ae195 Web: Files: Store: Fixed displaying MoveTo action for share folder 2021-04-27 11:08:29 +03:00
11eea156a5 Web: People: fixed GroupAction 2021-04-27 10:18:53 +03:00
218140592d Web: Files: fixed display of the lock badge 2021-04-27 10:18:15 +03:00
6f330a04e5 Web: Files: fixed delete operation progress 2021-04-26 23:49:20 +03:00
8bb173fa92 Thirdparty: fix providers 2021-04-26 21:42:39 +03:00
d97928fd37 Merge branch 'develop' into feature/support-hosting-as-service 2021-04-26 19:52:32 +03:00
db1f883005 Bump version v0.1.8 2021-04-26 18:59:33 +03:00
Alexey Kostenko
a96ae77570 OAuth: Fixed crash on login page 2021-04-26 16:41:57 +03:00
0128b01518 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/two-factor-auth
# Conflicts:
#	products/ASC.People/Client/public/locales/en/Profile.json
#	products/ASC.People/Client/public/locales/ru/Profile.json
#	products/ASC.People/Client/src/pages/Profile/Section/Body/index.js
#	web/ASC.Web.Client/public/locales/en/Confirm.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Confirm.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
2021-04-26 15:57:19 +03:00
Artem Tarasov
8c939c77bb Web: Files: refactoring: renamed HOCs 2021-04-26 15:46:26 +03:00
Artem Tarasov
4b2f116044 Web: Files: refactoring: fix after merge 2021-04-25 20:41:57 +03:00