Commit Graph

22029 Commits

Author SHA1 Message Date
mushka
6f5b84308d fixed translation on Register dialog 2022-07-12 13:08:29 +03:00
mushka
a222f836c4 fixed ConsumerModalDialog compennt 2022-07-12 12:50:08 +03:00
mushka
96e85f9cb3 Merge branch 'develop' into feature/modal-redesign 2022-07-12 12:34:43 +03:00
e9a15cc2a4 added [HttpGet("iprestrictions/settings")] 2022-07-12 12:20:59 +03:00
c9f7e95d5c fixed iprestrictions method 2022-07-12 12:06:38 +03:00
fd986320f2 Api: fixed maildomainsettings 2022-07-12 11:47:05 +03:00
b2b55bfa5b fixed subfolders method 2022-07-11 22:22:56 +03:00
mushka
83cb430911 small tweaks on DebugInfo 2022-07-11 22:15:53 +03:00
mushka
96a2d4530e fixed DebugInfo styles 2022-07-11 22:11:55 +03:00
mushka
75a3a741c6 fixed SelectFile and SelectFolder styles 2022-07-11 21:20:52 +03:00
mushka
7d22e52c70 fixed mobile keyboard interaction with dialogs 2022-07-11 20:43:25 +03:00
mushka
35bde337bc fixed dialogs for create and rename global actions 2022-07-11 19:31:59 +03:00
mushka
9d13e3a4c4 Merge branch 'develop' into feature/modal-redesign 2022-07-11 17:39:20 +03:00
mushka
ada4ab71b8 fixed backdrop height on mobile browsers 2022-07-11 17:37:28 +03:00
477f386047
Merge pull request #698 from ONLYOFFICE/feature/create-from-modal
Feature/create from modal
2022-07-11 17:28:09 +03:00
14ec770253
Merge branch 'develop' into feature/create-from-modal 2022-07-11 17:19:39 +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
16acccc4e3 Sql: Added hosting_instance_registration table 2022-07-11 15:48:53 +03:00
TimofeyBoyko
91ca312871 Merge branch 'develop' into feature/create-from-modal 2022-07-11 14:51:45 +03:00
65a739d871 Removed ASC.Web.Campaigns (moved to separated repository) 2022-07-11 14:15:51 +03:00
mushka
44fc6509f3 Merge branch 'develop' into feature/modal-redesign 2022-07-11 13:54:06 +03:00
mushka
2fb38338e5 fixed backdrop and Debug dialog 2022-07-11 13:30:55 +03:00
a9e94046c8 Merge branch 'master' into develop 2022-07-11 12:16:37 +03:00
15fc78111a
Merge pull request #718 from ONLYOFFICE/release/v1.2
Release/v1.2
2022-07-11 10:47:33 +03:00
mushka
58e68c1c12 Merge branch 'develop' into feature/modal-redesign 2022-07-08 17:23:02 +03:00
7e3abdc498
Merge pull request #712 from ONLYOFFICE/feature/new-files
Files: update docstore submodule
2022-07-08 15:11:18 +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
5e08271fb0 Merge branch 'release/v1.2' into develop 2022-07-07 18:03:39 +03:00
dab94135cf Web: Components: fixed onClickOutside eventTypes 2022-07-07 17:58:41 +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
df3a74dffe
Merge pull request #710 from ONLYOFFICE/feature/rooms-delete-after
feature/rooms-delete-after
2022-07-07 16:25:38 +03:00
f52162827e Files: added DeleteAfter for rooms 2022-07-07 16:20:44 +03:00
085f769a19 Bump version to v1.2.0 in package.json 2022-07-07 15:30:06 +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
fb30766210 Fix Bug 58038: hide upload button by cross button 2022-07-07 13:16:46 +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
ee8bfbb77d
Merge pull request #706 from ONLYOFFICE/features/enum_generator
Features/enum generator
2022-07-06 18:47:48 +03:00
baa72db316 removed referencies 2022-07-06 18:47:16 +03:00