Commit Graph

22972 Commits

Author SHA1 Message Date
TimofeyBoyko
4a2aa14722 Web:Files:Article: delete useless code after merge 2022-07-08 13:23:06 +03:00
mushka
3facc47665 removed reasssign data link and unuseful comment from DeleteUser and ConnectCloud 2022-07-08 12:50:44 +03:00
TimofeyBoyko
c8feb7899b Merge branch 'develop' into feature/virtual-rooms-page 2022-07-08 12:32:26 +03:00
TimofeyBoyko
f85b116721 Web:Files:Home: refactoring section filter 2022-07-08 12:23:57 +03:00
TimofeyBoyko
7803751844 Web:Common:FilterInput: refactoring 2022-07-08 12:10:37 +03:00
TimofeyBoyko
723716dbc8 Web:Files:VirtualRooms: update filter 2022-07-08 12:10:17 +03:00
TimofeyBoyko
f46add9687 Web:Files:RoomsStore: add filterRooms, sortRooms, searchRoom 2022-07-08 12:09:57 +03:00
0504838691 fix tests 2022-07-08 11:46:34 +03:00
59a78409b4 Files: optimization 2022-07-08 11:17:11 +03:00
TimofeyBoyko
0ecb0ed9f7 Web:Files:VirtualRooms: delete tag from row info 2022-07-08 10:49:53 +03:00
TimofeyBoyko
334367bb33 Web:Common:Tags: delete 'No tag' tag if tags length = 0 2022-07-08 10:41:36 +03:00
TimofeyBoyko
1e8859b29e Web:Common:Api: add method to get all tags 2022-07-08 10:41:00 +03:00
TimofeyBoyko
a3ca2d6052 Web:Common:Api: fix subject id for rooms filter 2022-07-08 10:40:26 +03:00
TimofeyBoyko
3adf3fe5aa Web:Common:Utils: update getObjectByLocation to work with array at URL 2022-07-08 10:40:04 +03:00
TimofeyBoyko
4ea77f00a5 Web:Common:Loaders: fix article loaders 2022-07-08 10:39:15 +03:00
TimofeyBoyko
9a541330aa Web:Common:Article: fix article width 2022-07-08 10:38:57 +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
4dcd8ba31a Merge branch 'develop' into feature/async-fix
# Conflicts:
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
2022-07-07 19:09:35 +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
c8458858e0 Merge branch 'develop' into feature/room_tests 2022-07-07 17:56:40 +03:00
f8c27acc7d Merge branch 'develop' into feature/room_tests 2022-07-07 17:56:15 +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
b5d082d816 room tests:first version 2022-07-07 17:45:23 +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
TimofeyBoyko
56c6873ac1 Web:Common:FilterInput: update for multiselect and refactoring 2022-07-07 12:23:21 +03:00
a04ae63a82 MemberModel: CultureName 2022-07-07 12:05:31 +03:00
12eb702d2d Merge branch 'develop' into bugfix/fix-rooms-filter 2022-07-07 10:28:11 +03:00
ca799f867f Fix Bug 57980: wrong tip position 2022-07-07 00:20:22 +03:00
1867ec9822 Files: fixed type/tags filters with subfolders 2022-07-06 23:14:45 +03:00
45466dad44 Files: removed unnecessary 2022-07-06 23:13:43 +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