|
6719ff0e72
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-11 12:39:34 +03:00 |
|
|
a9e94046c8
|
Merge branch 'master' into develop
|
2022-07-11 12:16:37 +03:00 |
|
|
b3324ad875
|
Web: Client: NavMenu: fix namespace
|
2022-07-11 11:28:25 +03:00 |
|
|
15fc78111a
|
Merge pull request #718 from ONLYOFFICE/release/v1.2
Release/v1.2
|
2022-07-11 10:47:33 +03:00 |
|
|
4987f53335
|
Merge branch 'feature/modal-redesign' of https://github.com/ONLYOFFICE/AppServer into feature/modal-redesign
|
2022-07-08 17:26:55 +03:00 |
|
mushka
|
58e68c1c12
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-08 17:23:02 +03:00 |
|
|
1f3dfb9ccc
|
Web: Client: AdminMessage: fix save
|
2022-07-08 16:46:26 +03:00 |
|
|
f69194b034
|
Web: Client: TfaActivation: fix error
|
2022-07-08 16:22:30 +03:00 |
|
|
6a690fc175
|
Web: Client: fix confirmLinkData
|
2022-07-08 16:22:08 +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 |
|
|
0da612710d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-07 19:39:12 +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 |
|
|
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 |
|
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 |
|
|
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 |
|