Commit Graph

21956 Commits

Author SHA1 Message Date
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
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
7e3abdc498
Merge pull request #712 from ONLYOFFICE/feature/new-files
Files: update docstore submodule
2022-07-08 15:11:18 +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
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
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
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
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
a615053d88 Fix Bug 58025 - Client.Profile. The languages listed in the profile are not in alphabetical order. 2022-07-06 18:26:25 +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
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
0b5dc80b42 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-06 16:36:30 +03:00
ba21d018c9 Fixed Bug 58016 - Mobile. Fixed action menu closing 2022-07-06 16:36:21 +03:00
dce8c778c3 Fix Bug 58018: active background 2022-07-06 16:26:58 +03:00
1e0ae3cc4b Fix Bug 57998: disable paging if one page 2022-07-06 15:12:02 +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
47b4e2e753 Fixed Bug 57784: Common: Section: Fixed left padding for row view after change checkbox container 2022-07-06 13:18:45 +03:00
2b5bd41a9a Web: Files: removed duplicate openDocEditor function, changed file status after opening file 2022-07-06 13:14:01 +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
bcef77d46f Web: Common: FloatingButton: fix position 2022-07-05 23:52:37 +03:00
fbb9120a2d Web: revert config 2022-07-05 23:37:56 +03:00
c7d1850f58 Fix Bug 57999: footer on ThirdPartyDialog 2022-07-05 23:36:24 +03:00
95ce082219 Web: Components: Added DropDown offsetLeft default value 2022-07-05 22:56:18 +03:00
a0cb531f46 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-05 22:39:46 +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
TimofeyBoyko
545e4c0142 Web:Client:ProfileMenu: delete useless code 2022-07-05 19:48:46 +03:00
TimofeyBoyko
ddb52be77b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-05 19:09:51 +03:00