Commit Graph

9812 Commits

Author SHA1 Message Date
mushka
9d13e3a4c4 Merge branch 'develop' into feature/modal-redesign 2022-07-11 17:39:20 +03:00
TimofeyBoyko
58bd9509a1 Web:Files:Hocs: fix keyup on create docx after merge 2022-07-11 17:13:51 +03:00
TimofeyBoyko
a0651ecca4 Web:Files:HOCs: fix create operation with hotkeys 2022-07-11 16:36:46 +03:00
TimofeyBoyko
91ca312871 Merge branch 'develop' into feature/create-from-modal 2022-07-11 14:51:45 +03:00
mushka
58e68c1c12 Merge branch 'develop' into feature/modal-redesign 2022-07-08 17:23:02 +03:00
mushka
3facc47665 removed reasssign data link and unuseful comment from DeleteUser and ConnectCloud 2022-07-08 12:50:44 +03:00
mushka
89dd7ab365 fixed translations, styles and dark theme for ConnectCloud 2022-07-07 19:25:31 +03:00
b8a2cf5292 Files: update docstore submodule
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
2022-07-07 18:11:42 +03:00
912bb3ed36
Merge pull request #711 from ONLYOFFICE/feature/rooms-archive-delete-after
Feature/rooms-archive-delete-after
2022-07-07 17:55:40 +03:00
mushka
4ef6970583 fixed translations and styles on ThirdPartyMove dialog 2022-07-07 17:54:28 +03:00
2bc07e0a1d Files: added DeleteAfter for archiving/unarchiving rooms 2022-07-07 17:52:20 +03:00
7af929fee8 Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	products/ASC.People/Server/Models/MemberModel.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
2022-07-07 17:41:41 +03:00
mushka
2ba523da5f fixed translations in ConflictResolve, Convert, MoveToTrash, DeleteUser and DeleteUsers dialogs 2022-07-07 17:40:23 +03:00
c3b505f08e fix Bug 58035 2022-07-07 16:34:47 +03:00
f52162827e Files: added DeleteAfter for rooms 2022-07-07 16:20:44 +03:00
f28a372418 Fix Bug 58040: active download button 2022-07-07 14:52:26 +03:00
75251220ba Web: Files: ThirdPartyDialog: fix condition 2022-07-07 13:45:26 +03:00
mushka
a75fdc7690 fixed ChangedStatus and DeleteUsers 2022-07-07 13:36:50 +03:00
a171129d5f Fix Bug 58041: add cloud button not work 2022-07-07 13:36:19 +03:00
a04ae63a82 MemberModel: CultureName 2022-07-07 12:05:31 +03:00
ca799f867f Fix Bug 57980: wrong tip position 2022-07-07 00:20:22 +03:00
baa72db316 removed referencies 2022-07-06 18:47:16 +03:00
e06c076f80 Fix Bug 58009 - Client.Clouds.AsNew. The New label of a third-party storage folder will not disappear after marking Mark all as read by the icon next to the folder. 2022-07-06 18:46:17 +03:00
mushka
3fd65e887d Merge branch 'release/v1.2' into feature/modal-redesign 2022-07-06 18:13:33 +03:00
398a87fc3d Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-06 18:07:22 +03:00
27109aae4a Fix Bug 57965: Added a scrollbar for the list of formats. 2022-07-06 18:06:32 +03:00
mushka
b80f1c3237 redesigned SendInviteDialog and fixed VersionHistory 2022-07-06 18:01:38 +03:00
671addab40 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-06 17:56:59 +03:00
fcb184a036 Fixed Bug 57646 - Removed the hanging of loaders when creating files sequentially. 2022-07-06 17:56:32 +03:00
771dffbcce Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-06 17:47:15 +03:00
58c9da7e52 Fix Bug 58006 - Client.Files.Clouds. The edit icon for the file 'pencil' in the third-party storage folder only disappears after a page refresh. 2022-07-06 17:47:01 +03:00
31e5027d74 edit it (Translations.json) 2022-07-06 14:52:53 +03:00
600487e25d Fixed Bug 58011 - Client.Files. Fixed file selection after renaming 2022-07-06 14:34:52 +03:00
1a00edc87c Fixed Bug 57639: Added new icons for form actions. Fixed accordion menu sublevel padding and restored icons displaying. 2022-07-06 14:23:27 +03:00
mushka
a1b9fe1523 redesigned ThirdPartyMove and fixed radio buttons on ConflictResolve 2022-07-06 13:49:56 +03:00
2b5bd41a9a Web: Files: removed duplicate openDocEditor function, changed file status after opening file 2022-07-06 13:14:01 +03:00
mushka
ce4e9c26fd removed divider from ConflicResolve and added second btn to ChangeEmail and ChangePassword 2022-07-06 13:02:52 +03:00
a58cf941d3 fixed finalize version 2022-07-06 11:50:50 +03:00
a9004e30dc Fix Bug 58003: editing component background 2022-07-06 11:39:37 +03:00
c7d1850f58 Fix Bug 57999: footer on ThirdPartyDialog 2022-07-05 23:36:24 +03:00
dc711916a6 Fix Bug 57944 - Client.Files.Thumbnails. Instead of a preview of the document, the file icon is displayed after editing it. 2022-07-05 22:39:34 +03:00
373ece222e Fix Bug 57945 - Client.Files.Thumbnails. Icons 'pencil' and icon-button 'share' are disappear after thumbnail has been created 2022-07-05 18:55:47 +03:00
82f1759813 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-05 17:25:12 +03:00
7f38577332 Web: Translations: Removed useless translation key 'SharingSettings' (Replaced with "SharingPanel:SharingSettingsTitle") 2022-07-05 17:25:06 +03:00
mushka
cdcfdccb57 fixed SelectFile and SelectFolder panels && moved their footers to ModalDialog.Footer subcomponent 2022-07-05 17:23:59 +03:00
aeac8613a8 Merge branch 'develop' into features/enum_generator 2022-07-05 17:22:43 +03:00
69fccb5086 fix Bug 57979 2022-07-05 17:17:50 +03:00
e45541e8f8 Web: Translations: Removed useless translation key 'DeleteThirdParty' 2022-07-05 17:07:40 +03:00
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
ed45bb0118 Fix Bug 57978 - Client.Clouds. Rename button 'Delete third-party' to 'Disconnect' 2022-07-05 16:58:05 +03:00