Commit Graph

7669 Commits

Author SHA1 Message Date
fa8898d522 Files: fixed converter 2022-07-12 14:18:26 +03:00
TimofeyBoyko
9bfb54bcc3 Web:Files:VirtualRooms: add group menu for virtual room pages 2022-07-12 14:05:51 +03:00
mushka
96e85f9cb3 Merge branch 'develop' into feature/modal-redesign 2022-07-12 12:34:43 +03:00
TimofeyBoyko
1bee56d3aa Web:Files:VirtualRooms: disable open archived rooms and fix logo 2022-07-12 10:22:46 +03:00
b2b55bfa5b fixed subfolders method 2022-07-11 22:22:56 +03:00
mushka
75a3a741c6 fixed SelectFile and SelectFolder styles 2022-07-11 21:20:52 +03:00
mushka
35bde337bc fixed dialogs for create and rename global actions 2022-07-11 19:31:59 +03:00
Vashchuk Nikita
5cfb69ae48 recreated all migrations 2022-07-11 18:33:57 +03:00
Vashchuk Nikita
bc0ad53e8f changed int type to tinyint(1) for bool 2022-07-11 18:31:00 +03:00
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
1face3ea40 Files: added searching rooms without tags only 2022-07-11 17:13:30 +03:00
TimofeyBoyko
a0651ecca4 Web:Files:HOCs: fix create operation with hotkeys 2022-07-11 16:36:46 +03:00
TimofeyBoyko
76dd9dd97d Web:Files:VirtualRooms: add open room action to all view 2022-07-11 16:23:02 +03:00
TimofeyBoyko
8838d7282a Web:Files:Store: add onOpenRoom action 2022-07-11 16:22:37 +03:00
TimofeyBoyko
cdd6bc40b5 Web:Files:Home: refactoring section header 2022-07-11 16:20:59 +03:00
TimofeyBoyko
67d1a49ffa Web:Files:Home: upgrage onClickFolder at section header to work with rooms 2022-07-11 16:09:27 +03:00
TimofeyBoyko
a754d7fb71 Web:Files:Home: upgrage onBackToParentFolder at section header to work with rooms 2022-07-11 15:57:39 +03:00
Vashchuk Nikita
f13263c75a fix contexts after merge 2022-07-11 15:43:06 +03:00
TimofeyBoyko
95e03a49d2 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-11 14:55:50 +03:00
TimofeyBoyko
91ca312871 Merge branch 'develop' into feature/create-from-modal 2022-07-11 14:51:45 +03:00
TimofeyBoyko
5f41dc12ed Web:Files:Store: delete useless selectedRoomsStore 2022-07-11 14:21:47 +03:00
TimofeyBoyko
50620640eb Web:Files:SelectedFolderStore: add isPinned and roomType 2022-07-11 14:21:21 +03:00
TimofeyBoyko
4e63873bc4 Web:Files:FilesStore: add isRoom and isRootRoom for navigationPath at fetchFiles 2022-07-11 14:20:47 +03:00
45ae2510ab Merge branch 'bugfix/fix-rooms-filter' into feature/rooms-api 2022-07-11 13:41:43 +03:00
Vashchuk Nikita
e49d082fa3 Merge branch 'develop' into feature/migrations-fix
# Conflicts:
#	common/ASC.Core.Common/EF/Model/Core/Acl.cs
#	common/ASC.Core.Common/GlobalUsings.cs
#	common/ASC.Core.Common/Messaging/EventMessage.cs
#	common/ASC.Core.Common/Messaging/LoginEvent.cs
#	common/ASC.Core.Common/Messaging/MessageTarget.cs
#	common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
#	common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
#	common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
#	common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
#	common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
#	common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
#	common/ASC.Resource.Manager/ResourceData.cs
#	common/services/ASC.AuditTrail/GlobalUsings.cs
#	products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
#	products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
#	products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
#	web/ASC.Web.Api/GlobalUsings.cs
2022-07-11 13:28:49 +03:00
7dfaf60592 Files: refactoring 2022-07-10 22:21:09 +03:00
Artem Tarasov
120f5f7b17 Web: Files/People/Client/Login: updated version webpack-cli 4.9.0 -> 4.10.0 2022-07-10 12:34:16 +03:00
Artem Tarasov
55198d0e7f Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	web/ASC.Web.Editor/src/i18n.js
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-10 11:23:44 +03:00
TimofeyBoyko
42cc6dc5a5 Web:Files:Home: remove useless sorting from section body of tile view 2022-07-08 18:06:52 +03:00
70c1476686 Files: added sorting by room type/tags 2022-07-08 17:31:37 +03:00
mushka
58e68c1c12 Merge branch 'develop' into feature/modal-redesign 2022-07-08 17:23:02 +03:00
63c2c34d44 refactoring tests 2022-07-08 15:31:07 +03:00
TimofeyBoyko
fffe60a1c7 Web:Files:VirtualRooms:TileView/TableView: add select tag to filter function 2022-07-08 15:00:30 +03:00
TimofeyBoyko
ee572da527 Web:Files:RoomsActionsStore: add onSelectTag action 2022-07-08 14:41:55 +03:00
TimofeyBoyko
a6a0bb9cc2 Web:Files:Store: init roomsActionsStore 2022-07-08 14:41:32 +03:00
Vashchuk Nikita
4628769136 fix Contexts,
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
2022-07-08 14:24:18 +03:00
b294b557b0 removed ConfigureAwait 2022-07-08 13:39:07 +03:00
e80613e8db Files: fix 2022-07-08 13:28:27 +03:00
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
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
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
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
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
a171129d5f Fix Bug 58041: add cloud button not work 2022-07-07 13:36:19 +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
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
TimofeyBoyko
459b812d16 Web:Files:VirtualRooms: update section directory 2022-07-06 11:01:23 +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
e7ece44c01 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-05 16:37:57 +03:00
ac38e7c9a9 fix 2022-07-05 16:37:28 +03:00
077dfbd334 Web: Translations: Removed useless translations (key "MoveConfirmationAlert"). 2022-07-05 16:35:49 +03:00
e9f790e95c Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-05 16:31:09 +03:00
4d62881a3c Fixed Bug 57984: Tapping on folder title after canceling creation of form from file leads to an error 2022-07-05 16:30:59 +03:00
f54fd4ef71 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-05 16:19:13 +03:00
5c550849e2 Web: Files: Deleted useless code. 2022-07-05 16:19:02 +03:00
b7ca559bd4 fix 2022-07-05 16:03:31 +03:00
6ddb05512a Fixed Bug 57973 - Web: Files: Changed view for "Move to" dialog. 2022-07-05 15:56:26 +03:00
mushka
6566ca8645 removed unnecessary extra margin from second button on several dialogs 2022-07-05 15:31:17 +03:00
mushka
6c13d87e92 fixed MoveFileToTrash dialog 2022-07-05 14:05:00 +03:00
mushka
3efe86b053 Merge branch 'feature/modal-redesign' of github.com:ONLYOFFICE/AppServer into feature/modal-redesign 2022-07-05 13:55:08 +03:00
mushka
58aa87ff19 fixed Article CloseBtn and Header offset 2022-07-05 13:53:43 +03:00
a15fdeb4f1 Fixed Bug 57986 - Client.Files. Fixed file selection after clicking on the context menu 2022-07-05 13:35:29 +03:00
9841588f65 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-05 13:09:42 +03:00
62e6a84b51 Fix Bug 57964 - Client.Files.Share. Rename Sharing setting on 'ru' 2022-07-05 13:09:35 +03:00
422ec8baf2 Fix Bug 57982: console error if filter by missing file types 2022-07-05 13:05:59 +03:00
04b211f1bd fix 2022-07-05 12:59:15 +03:00
c8c40948a2 Fixed Bug 57789 - Mobile. Redesigned delete dialog 2022-07-05 12:57:36 +03:00
mushka
15d1c4d65b Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-05 12:54:41 +03:00
mushka
34ac4b7e5d Fix Bug 57981: changed wrong icon on Open location ContextMenu action 2022-07-05 12:54:33 +03:00
f041359d3a Fix Bug 57953: show new badge on folder tile 2022-07-05 12:54:27 +03:00
c7b556131e Web: Files: Header: Fixed translation keys for sublevel of creating menu 2022-07-05 12:43:09 +03:00
7391469381 Web: Files: Article: Fixed displaying icons on sublevel 2022-07-05 12:42:11 +03:00
mushka
9f002e3249 Merge branch 'release/v1.2' into feature/modal-redesign 2022-07-05 12:17:58 +03:00
mushka
b179390243 fix of DeleteForever dialog 2022-07-05 12:12:44 +03:00
TimofeyBoyko
5be87292a4 Web:Files:Store: update rooms store and context options store, add rooms actions store and selected rooms store 2022-07-05 10:05:56 +03:00
TimofeyBoyko
3bd7b6f465 Web:Files:VirtualRooms: add filter for rooms 2022-07-05 10:05:17 +03:00
TimofeyBoyko
c6eaa0f41a Web:Files:VirtualRooms: refactoring tile view 2022-07-05 10:04:41 +03:00
TimofeyBoyko
65819730b9 Web:Files:VirtualRooms: refactoring table view and add sorting 2022-07-05 10:04:19 +03:00
90fe1383b7 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-04 18:04:06 +03:00
ba8b14273a Web: Files: SharingPanel: delete useless import 2022-07-04 17:53:26 +03:00
f95f91d737 Fix Bug 53335: disable save button if no change 2022-07-04 17:51:14 +03:00
d8a459f397 Web: i18n: Replaced i18next-http-backend package with custom realization from @appserver/common/utils/i18next-http-backend (fix issue: too many same translations files are loading at once) 2022-07-04 17:47:12 +03:00
b2779ff9ac Fix Bug 57955: click new badge error 2022-07-04 17:28:53 +03:00
45406dec07 fix total 2022-07-04 16:42:29 +03:00
1e0962a11a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-04 15:49:11 +03:00
421070f3a3 Fix Bug 57864: For phones in landscape orientation, shifting the list of access rights to the right in ExternalLink to personal. 2022-07-04 15:48:42 +03:00
19095f9108 files: async fix 2022-07-04 14:51:17 +03:00
1576609ed9 Fix Bug 57951: clear trash doesn't work on mobile 2022-07-04 14:27:36 +03:00
18c415c9d3 Fix Bug 57947: show cancel button 2022-07-04 14:07:13 +03:00
TimofeyBoyko
5789eb1f1f Web:Files:VirtualRooms: update virtual rooms section header with selected store 2022-07-04 14:05:28 +03:00
d8af680616 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-07-04 13:55:47 +03:00
630ae2489b Fixed Bug 57681 - Client. Removed the checkbox when opening the context menu 2022-07-04 13:55:38 +03:00
mushka
f88b82670a tweaks on ModalDialog component 2022-07-04 12:12:02 +03:00
fb09f62881 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-07-04 11:39:38 +03:00
0f901bf6e3 added hy-AM 2022-07-04 11:38:57 +03:00
5ea7dfcb0c Web: Files: MainButton: use withoutIcon 2022-07-04 07:24:32 +03:00
c6691b5de6 Web: Files: MainButton: add submenu for mobile 2022-07-04 07:10:07 +03:00
d37a6eaede Web: Files: Header: add submenu for plus 2022-07-04 06:17:00 +03:00
TimofeyBoyko
8b87d68924 Web:Files:VirtualRooms: refactoring 2022-07-04 04:58:40 +03:00
TimofeyBoyko
c2356c6f7b Web:Files:VirtualRooms: refactoring tile view 2022-07-04 04:51:34 +03:00
TimofeyBoyko
4f627eac5d Web:Files:VirtualRooms: refactoring table view 2022-07-04 04:51:20 +03:00
TimofeyBoyko
8326d99c4a Web:Files:VirtualRooms: add row view 2022-07-04 04:50:57 +03:00
29b8826ab3 fix 2022-07-03 22:39:43 +03:00
0e423430be Merge branch 'develop' into feature/async-fix
# Conflicts:
#	products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Security/FileSecurity.cs
#	products/ASC.Files/Core/Core/Security/ISecurityDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
#	products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
2022-07-03 22:19:53 +03:00
d6b7db91e3 Web: Translations: Added translations minimization 2022-07-03 13:25:41 +03:00
TimofeyBoyko
62e8b7d761 Web:Files:Article: fix double fetching rooms after change root room 2022-07-03 08:11:54 +03:00
Artem Tarasov
2ef94f75da Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
#	products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
#	web/ASC.Web.Editor/package.json
#	web/ASC.Web.Editor/src/Editor.jsx
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
2022-07-01 23:41:10 +03:00
5d4715e674 fix 2022-07-01 17:37:09 +03:00
d8291efa30 Fixed Bug 57933 - Client.Files.Info. Fixed console error ‘Uncaught (in promise) TypeError: l.findIndex is not a function’ 2022-07-01 17:30:08 +03:00
d1677a8070 Web: Files: fixed hotkeys scroll 2022-07-01 16:02:14 +03:00
c9d3382b34 Fixed Bug 57927 - Client.FormsGallary.Info. ‘Something went wrong’ when opening the info-panel 2022-07-01 14:58:24 +03:00
85ef85df76 Web: Translations: Removed useless translations (key "FormTemplateInfo") 2022-07-01 14:34:58 +03:00
634bae6002 Fix Bug 57926 - Client.FormsGallary.Info.The name of the info panel in some languages in two lines. 2022-07-01 14:33:38 +03:00
Vashchuk Nikita
bdbd6bd65e Recreating and fixing migrations 2022-07-01 14:27:28 +03:00
Vashchuk Nikita
5a0acc8eaa Renaming folders for contexts and models 2022-07-01 14:23:07 +03:00
381d9165cb Fix Bug 57920: Fixed clearing selection after update items list on delete elements 2022-07-01 13:00:48 +03:00
7e34e45371 ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
TimofeyBoyko
b107cad79b Web:Files:Store: update context menu archive item for archived rooms 2022-07-01 11:48:11 +03:00
TimofeyBoyko
bca685850a Merge branch 'feature/virtual-rooms-page' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-page 2022-07-01 11:22:56 +03:00
45ce1387ba Web: Files: hidden context menu button for editing component 2022-07-01 10:43:07 +03:00
TimofeyBoyko
3e07ef1efc Merge branch 'develop' into feature/virtual-rooms-page 2022-07-01 10:09:47 +03:00
74d238bde8 Merge branch 'release/v1.2' into develop
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Common/Logging/Log.cs
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Backup.Core/BackupResource.Designer.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
#	products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
#	products/ASC.Files/Core/Core/Compress/CompressToZip.cs
#	products/ASC.Files/Core/Core/Compress/ICompress.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
2022-06-30 16:13:31 +03:00
f9902d1524 Fix Bug 57833: mobile open cloud 2022-06-30 16:09:18 +03:00
ffd5c0b3aa Files: changed title for docspace, refactor 2022-06-30 14:57:24 +03:00
1b1005f8bf Files: added new key, renamed virtualrooms, archive 2022-06-30 14:56:28 +03:00
6da2935874 Fix Bug 57890: incorrect cursor 2022-06-30 14:56:19 +03:00
98be4769b4 Web: Files: fix getIsEmptyTrash 2022-06-30 14:31:20 +03:00
a357badf78 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-30 13:30:41 +03:00
bdb26fe251 Fixed Bug 57881: Web: Files: Changed icon for removed from favorites option. 2022-06-30 13:29:43 +03:00
aeaef47115 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-30 13:16:41 +03:00
0dc5273cc7 Web:Files:Fix border DeleteDialog. 2022-06-30 13:16:27 +03:00
e891f8b6d6 Fixed Bug 57880: Added theme support for download dialog. 2022-06-30 13:14:31 +03:00
0f3da31811 Files: fix 2022-06-30 12:43:38 +03:00
5edde068f7 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-30 12:18:24 +03:00
a7456fa89b Fixed Bug57856: Removed delete button from media-viewer in the favorite folder. 2022-06-30 12:16:50 +03:00
630250b439 fix tests 2022-06-30 12:07:30 +03:00
10a3edec61 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-30 11:46:34 +03:00
32433e10e1 Fix Bug 57876: blocked files while deletion is in progress 2022-06-30 11:45:18 +03:00
ec90de13c6 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-30 11:28:28 +03:00
e972c06d22 Web:Files:Added isTrashFolder. 2022-06-30 11:28:15 +03:00
8624e75c30 Fix Bug 57875: white row when create file 2022-06-30 11:13:58 +03:00
f4d9b4dd3a Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-30 11:05:04 +03:00
e64b4a46ac Web:Files:Removed the ability to create and upload files and folders in the Favorites, Recent, Trash folders. 2022-06-30 11:03:53 +03:00
8f9c8b4c1b Fix Bug 57836: add clear trash button 2022-06-30 02:48:52 +03:00
de068f869e thumb: fix 2022-06-29 20:55:01 +03:00
75be0827d7 Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
#	products/ASC.Files/Service/GlobalUsings.cs
2022-06-29 20:01:27 +03:00
35ab5a3531 fix order 2022-06-29 19:43:29 +03:00
d78509993f fixed Bug 53280 2022-06-29 18:40:35 +03:00
5ccd9d01a5 DeleteExpiredService: launch frequency 2022-06-29 18:34:50 +03:00
TimofeyBoyko
5581aa3039 Web:Files:VirtualRooms: fix fetching rooms if search area and filter doesn exists 2022-06-29 18:09:25 +03:00