Commit Graph

6378 Commits

Author SHA1 Message Date
5bd992b712 Web: Files: Fixed styles for buttons. 2022-04-12 13:26:48 +03:00
1ea6058232 fixed owner method 2022-04-12 13:21:39 +03:00
ed83701a35 Web: Files: SelectionPanel: Fixed styles for title. 2022-04-12 13:12:42 +03:00
4e50b0ed5b Web: Files: Fixed styles of aside view. 2022-04-12 12:59:28 +03:00
Timofey Boyko
340d403c79 Web:Files:Components: fix display internal link for third-party folders 2022-04-12 12:57:59 +03:00
054ef60233 Web: Files: OperationPanel: Added SelectFolderDialog. 2022-04-12 12:53:34 +03:00
ce0b453231 Web: Files: Path of folder moved to the local state. 2022-04-12 12:53:08 +03:00
Timofey Boyko
41a486b53e Web:Files:Panels: fix correct display owner of folder 2022-04-12 12:25:21 +03:00
193c1b2c9c Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign 2022-04-12 12:01:25 +03:00
080dfd2bd8 Files: rename 2022-04-12 10:33:59 +03:00
2031f32eca Files: added share template validation 2022-04-12 10:33:39 +03:00
7e9719828f Files: added aces fileter 2022-04-12 10:33:17 +03:00
Timofey Boyko
28582ca0d8 Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-12 10:33:10 +03:00
Timofey Boyko
653ac1bb3c Web:Files:Components: fix open access combo box for first element 2022-04-12 10:30:35 +03:00
1344d775d8 Web: Files: SelectFolder: Added disable color for files. 2022-04-12 10:16:01 +03:00
e9daf3aa55 Web: Files: Deleted useless code, added styles for tree. 2022-04-12 09:34:10 +03:00
0c693feda7 Web: Files: Deleted useless code. 2022-04-11 19:34:30 +03:00
7319a8f3e9 Web: Files: Removed loader. 2022-04-11 19:33:39 +03:00
Timofey Boyko
ef33e3d0cf Web:Files:Components: fix size of sharing panel button and delete max-height css property 2022-04-11 18:53:49 +03:00
2c473dea9b Web: Components/Files: Changed styles for tree. 2022-04-11 18:47:12 +03:00
296fe44c46 Files: added room manager share 2022-04-11 18:27:03 +03:00
ae9ae673cb Web: Files: fixed loader styles for tiles 2022-04-11 17:46:46 +03:00
72ab470f2b Files: added set access for rooms 2022-04-11 16:33:18 +03:00
70ec83fe06 Files: added gettings user rooms 2022-04-11 16:32:32 +03:00
0e7eec8221 Web: Files: fixed "Duplicate" translation 2022-04-11 16:22:23 +03:00
2de60d3e12 Web: Files: SelectFile: Added style for row selection. 2022-04-11 15:54:27 +03:00
eedfa4a154 Web: Files: Optimization aside view, refactoring. 2022-04-11 15:27:11 +03:00
ce5fe18139 Web: Files: fixed onClickMakeForm 2022-04-11 13:50:33 +03:00
efb225a3d8 Files: added creating rooms 2022-04-11 13:12:34 +03:00
38cc84ee5c FilesDao: revert 2022-04-11 13:09:43 +03:00
d727e60c49 Web: Files: SelectFileDialog: Added the possibility to disable button if file is not selected. 2022-04-11 12:45:35 +03:00
Timofey Boyko
bf7be4582d Merge branch 'feature/virtual-rooms-1.2' into feature/redesign-sharing-panel 2022-04-11 12:06:51 +03:00
Timofey Boyko
044755837e Web:Files:Components: fix displaying sharing panel, add users panel, add groups panel, change owner and embedding panel for small size devices and mobile 2022-04-11 12:05:13 +03:00
1922fe67d4 Web: Files: fixed activateHotkeys 2022-04-11 11:53:49 +03:00
8f623ae40a Web: Files: Fixed styles. 2022-04-11 11:20:38 +03:00
d07c5e071e Web: Files: Renamed function, refactoring. 2022-04-11 11:14:05 +03:00
002a432b4d Web: fixed info-panel icon 2022-04-11 11:11:44 +03:00
2b93c52d9d Web: Files: Added wrappers for ModuleFederationPlagin 2022-04-11 11:03:56 +03:00
387119f6f2 remove waste 2022-04-11 10:58:18 +03:00
347658726b Web: Files: refactoring, deleted useless code. 2022-04-11 10:51:42 +03:00
4e66bc9a7d Web: Files: SelectFile: Return onMouseEvent. 2022-04-11 10:45:52 +03:00
38aa42fdf8 Web: Files: Refactoring, deleted useless code. 2022-04-11 10:30:23 +03:00
Timofey Boyko
51c0411262 Web:Files:Components: fix padding-top of body for embedding panel 2022-04-11 10:24:05 +03:00
55cd1d17b9 Web: Files: Refactoring, fixed styles. 2022-04-11 09:58:15 +03:00
70ee53b5cb Web: Files: SelectFolder: Added "canCreate" prop. 2022-04-11 09:42:42 +03:00
751e2b2bd1 Web: Files: SelectFolder: Fixed styles of aside view, refactoring. 2022-04-11 09:01:18 +03:00
6b083cb99c Web:Files: Fixed dialog title. 2022-04-11 09:00:31 +03:00
e6d0d1a244 Web: Files: SelectFile: Fixed aside view. 2022-04-10 17:46:41 +03:00
8292795d8c Files: added root folders filter 2022-04-10 15:30:46 +03:00
e78253a6b9 Files: added root virtual rooms folder 2022-04-10 14:35:43 +03:00
0810423799 Web:Files/Common: Added new loaders. 2022-04-10 14:20:06 +03:00
09e800c63e WEb: Files: Refactoring. 2022-04-10 13:14:56 +03:00
34d4b5dbaa Merge branch 'feature/virtual-rooms-1.2' into selectors-redesign 2022-04-10 12:29:24 +03:00
Timofey Boyko
797324cd1e Web:Files:Components: add styled header from sharing panel to embedding panel 2022-04-08 19:43:30 +03:00
Timofey Boyko
1a6d773496 Web:Files:Component: add active class name for select size buttons of embedding panel 2022-04-08 19:42:48 +03:00
Timofey Boyko
04206a0cd0 Web:Files:Component: change styles of select size buttons of embedding panel 2022-04-08 19:42:23 +03:00
87e1222783 Web: Files: SelectFile: Changed logic. 2022-04-08 17:12:48 +03:00
Timofey Boyko
3424c13f1c Web:Files:Components: fix footer styles for ChangeOwnerPanel 2022-04-08 16:24:30 +03:00
31dadfd140 Web: removed unused code 2022-04-08 15:45:08 +03:00
Timofey Boyko
9bdf036f18 Web:Files: delete useless code 2022-04-08 15:33:45 +03:00
Timofey Boyko
864f20d751 Web:Files:Components: fix width and footer padding for AddUsersPanel and AddGroupsPanel 2022-04-08 15:29:16 +03:00
Timofey Boyko
f19a8bfe41 Web:Files:Components: fix error when open AddUsersPanel and type in search 2022-04-08 15:21:33 +03:00
Timofey Boyko
565ba4cf80 Web:Files:Components: fix sharing panel loader 2022-04-08 15:10:14 +03:00
Timofey Boyko
e0ec32e1ea Web:Files: fix clicking catalog badge and open new files panel 2022-04-08 14:50:10 +03:00
Timofey Boyko
a1c9a3df1b Web:Files:Components: add separator and delete item for access combobox 2022-04-08 14:49:15 +03:00
Timofey Boyko
1687fd613d Web:Files:Components: change getting selected items from shareDataItems for add users panel 2022-04-08 14:48:23 +03:00
Timofey Boyko
bfb1cf35f6 Web:Files:Components: change getting selected items from shareDataItems for add groups panel 2022-04-08 14:48:07 +03:00
9932e76cc4 Web: Refactoring, added styles. 2022-04-08 14:25:26 +03:00
b2fa7884d3 Web: Files: Hotkeys: fixed arrows selection 2022-04-08 13:09:47 +03:00
Timofey Boyko
eaba10ee3c Web:Files:Components: split shareUsers and shareGroups of sharing panel 2022-04-08 10:33:36 +03:00
Timofey Boyko
e2872f0be4 Web:Files:Components: fix displaying selected options for add users panel 2022-04-08 10:30:27 +03:00
ee247f56fd Web: Files: fixed oforms-gallery styles 2022-04-07 17:02:43 +03:00
90bf5a7dc2 Web: Files: added info panel for OFORMsGallery 2022-04-07 16:52:16 +03:00
Timofey Boyko
397ff0d90d Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-07 12:10:11 +03:00
Timofey Boyko
471927ff23 Web:Files:Components: add item component for sharing panel 2022-04-07 12:09:16 +03:00
Timofey Boyko
4fb1892463 Web:Files:Components: fix external link drop down for sharing panel 2022-04-07 12:08:49 +03:00
Timofey Boyko
7ffdd090d7 Web:Files:Components: add new locale for sharing panel 2022-04-07 12:08:12 +03:00
342c938415 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-07 11:17:57 +03:00
b135de806f Web: Files: Fix borders on thumbnails 2022-04-06 21:16:44 +03:00
22181e08d7 Web: Files: Restore thumbnail-image cover and increased thumbnaillHeight and thumbnaillWidth for Info Panel 2022-04-06 21:08:08 +03:00
aa91c6389c Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	packages/asc-web-common/components/Section/sub-components/section-container.js
2022-04-06 20:36:36 +03:00
3ef7ae85de Web: SelectFolder: Optimization, refactoring. 2022-04-06 18:04:43 +03:00
Timofey Boyko
1a59645ed0 Web:Files:Components: add new translates for sharing panel 2022-04-06 16:08:05 +03:00
Timofey Boyko
d6990bdf0b Web:Files:Components: add internal link component for sharing panel 2022-04-06 16:05:23 +03:00
Timofey Boyko
a3a318a01d Web:Files:Components: delete useless code of sharing panel 2022-04-06 15:07:51 +03:00
Timofey Boyko
d33e889392 Web:Files:Components: update AccessComboBox of SaringPanel 2022-04-06 15:07:33 +03:00
Timofey Boyko
d652300a5a Web:Files:Components: add ExternalLink component for SharingPanel 2022-04-06 15:06:59 +03:00
Timofey Boyko
6ec821586a Web:Files: add copy.react.svg and code.react.svg 2022-04-06 15:05:50 +03:00
6dfb0d86d5 filter of files
add searchInContent in filesController's methods
2022-04-06 14:32:15 +03:00
Timofey Boyko
8c31b41fd7 Web:Files:Components: update styled components for sharing panel 2022-04-05 18:29:07 +03:00
Timofey Boyko
f4e7c43d8d Web:Files:Components: create Footer funcation component for sharing panel 2022-04-05 18:28:37 +03:00
Timofey Boyko
574056b946 Web:Files:Components: move out StyledComponents 2022-04-05 18:28:11 +03:00
Timofey Boyko
5b975c5f29 Web:Files:Components: create StyledFooter, StyledHeader, StyledExternalLink, StyledContent and StyledBody for Sharing panels 2022-04-05 18:27:34 +03:00
Timofey Boyko
6b8ebb71a9 Web:Files:Panels: change aside width for sharing panel, move header to func component for sharing panel 2022-04-05 13:14:00 +03:00
b4c2c69af4 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-05 12:17:29 +03:00
a150b59fd9 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-04-05 12:16:27 +03:00
49abfdf84a fix docxf templates 2022-04-05 12:07:46 +03:00
c51741bf94 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-05 10:35:53 +03:00
45d2a31d03 Merge branch 'feature/virtual-rooms-1.2' into feature/add-units
# Conflicts:
#	public/locales/de/Common.json
2022-04-04 19:34:51 +03:00
mushka
5a5237d927 fixed ad bar sizing with InfoPanel open & redesigned thumbnail scaling 2022-04-04 17:40:45 +03:00
fc83ee53a8 Merge branch 'feature/virtual-rooms-1.2' into feature/oforms-gallery 2022-04-04 15:18:12 +03:00
3d3d383681 Web: Files: fixed FormGallery thumbnails 2022-04-04 15:17:24 +03:00
mushka
1af0383514 resolved problem with updated section width calculation 2022-04-04 14:57:22 +03:00
mushka
fa49b3120b Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-04-04 12:25:22 +03:00
a076a27aef Web: Files: added select gallery items, fixed routing 2022-04-04 11:26:13 +03:00
Timofey Boyko
d2c59d5ac9 Web:Files:Article: change term for displayin desktop or mobile article main button 2022-04-04 10:54:29 +03:00
Timofey Boyko
f21e6e6ffe Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-04 09:55:40 +03:00
5dab252350 Merge branch 'feature/virtual-rooms-1.2' of https://github.com/ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-01 18:14:51 +03:00
Timofey Boyko
8c6c2cbb58 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-01 18:14:06 +03:00
mushka
562bd9d088 changed thumbnail border 2022-04-01 17:42:45 +03:00
mushka
fb2cb1316a changed thumbnail styling 2022-04-01 17:39:03 +03:00
c44ff9a190 fix 2022-04-01 17:14:14 +03:00
d0c36facbb DistributedTaskQueue: removed CancelTask method. Add delete orphan cache items feature 2022-04-01 16:54:21 +03:00
99cdaa0440 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-04-01 15:46:42 +03:00
3ca90084e6 Web: Files: Fix get target of undefined 2022-04-01 15:44:39 +03:00
119d283027 Web: Files: Fix pathParts undefined 2022-04-01 15:44:03 +03:00
1e13f42c9c Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Server/Api/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
2022-04-01 15:17:46 +03:00
Timofey Boyko
02ba27f9c4 Web:Files:Store: fix error in hotkey store for activateHotkeys method 2022-04-01 15:02:20 +03:00
mushka
562e047da1 fixed undefined properties bug 2022-04-01 13:53:35 +03:00
Timofey Boyko
5fbbcc7c77 Web:Files:Section: change table group menu width for tablet and mobile devices 2022-04-01 12:39:58 +03:00
mushka
40cb0fd01f Merge branch 'feature/info-panel' of github.com:ONLYOFFICE/AppServer into feature/info-panel 2022-04-01 12:18:29 +03:00
mushka
6a3e94a0d5 added group support for access component & temporary removed Location system property 2022-04-01 12:16:40 +03:00
becb37d94f Web: Files: added context menu for FormGallery files 2022-04-01 11:20:58 +03:00
01ac9e5056 Web: Files: fixed activateHotkeys 2022-04-01 10:56:56 +03:00
2370f7bad5 refactoring DistributedTask. replace return value from string to dynamic for indexer 2022-04-01 10:10:15 +03:00
49efbc9780 refactoring: remove IServiceProvider 2022-03-31 20:32:46 +03:00
8c782a7903 Web: Files: added OFORMs gallery 2022-03-31 16:10:16 +03:00
mushka
1c5be7f82e fixed visualization of items with long titles 2022-03-31 15:04:09 +03:00
d33952a707 Web: Files: Removed temp console.log 2022-03-31 12:54:26 +03:00
mushka
e4ab022fb9 dark theme redesign 2022-03-30 21:59:00 +03:00
mushka
85663d7e5b removed title from InfoPanelWrapper & coded exception for files with undefined extension 2022-03-30 20:48:54 +03:00
Timofey Boyko
3b2ead5568 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-30 18:17:50 +03:00
f41c65623b Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel
# Conflicts:
#	config/kafka.json
2022-03-30 11:14:47 +03:00
90623263e9 merge from feature/backend-refactor 2022-03-29 23:29:03 +03:00
75bd270037 Web: Files: Fix thumbnails: increased size and replaced 'resize' to real size 2022-03-29 22:03:11 +03:00
80de482c4d Merge branch 'feature/virtual-rooms-1.2' of https://github.com/ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 21:06:04 +03:00
baba222ac5 Notify: refactoring 2022-03-29 18:39:09 +03:00
Timofey Boyko
d4dd11129c Web:Files:AddUsersPanels: change groups id for selected options 2022-03-29 17:54:24 +03:00
d3b6a4eeab Merge branch 'feature/virtual-rooms-1.2' of https://github.com/ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 16:33:04 +03:00
df8b7182b6 merge feature/backend-refactor 2022-03-29 16:12:36 +03:00
4fe34215c9
Merge pull request #580 from ONLYOFFICE/feature/files-mapping
Feature/files mapping
2022-03-29 16:59:43 +04:00
Timofey Boyko
0ffb92d56e Web:Files:Section: fix table group menu width for mobile and tablet devices 2022-03-29 14:37:22 +03:00
mushka
4e4ecec78f added dark theme support & moved context options "view details" button 2022-03-29 13:59:56 +03:00
03efcf7f00 Notify: remove serviceProvider 2022-03-29 13:53:05 +03:00
357bfc216f Merge branch 'feature/virtual-rooms-1.2' of https://github.com/ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 11:52:43 +03:00
1129f0b509 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-29 11:30:04 +03:00
adb8e4e680 Web: Files: TableView: use avatar in author cell 2022-03-29 11:29:53 +03:00
Timofey Boyko
89525d49e4 Web:Files: fix third-party 24px folder-icons 2022-03-29 11:14:57 +03:00
Timofey Boyko
bd94ebb621 Web:Files: change 24px folder-icon for thirdparty 2022-03-29 10:09:27 +03:00
cfad6e7ee7 removed IServiceProvider 2022-03-28 19:51:16 +03:00
Timofey Boyko
448d4eecd5 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-28 18:34:05 +03:00
Timofey Boyko
9d428ffa3d Web:Files: increase rect of 24px folder-icon 2022-03-28 18:32:11 +03:00
f55a6cb6b2 Merge branch 'feature/backend-refactor' into feature/remove-serviceprovider
# Conflicts:
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	web/ASC.Web.Core/Users/UserPhotoManager.cs
#	web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
2022-03-28 17:45:42 +03:00
c2cfdfd2d1 Files: fix 2022-03-28 17:37:28 +03:00
004435936e Web: Files: Hotkeys: fixed keyboard input 2022-03-28 17:05:47 +03:00
mushka
5a4b36df74 translation tweaks 2022-03-28 16:53:27 +03:00
dfa851221f Web: moved load language path to utils, added clearInterval 2022-03-28 17:33:42 +05:00
e7e0f5327a Merge branch 'feature/backend-refactor' into feature/log-refactor
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
2022-03-28 14:29:36 +03:00
bd6753df91 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-28 14:17:59 +03:00
e5229f12f5 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Api.Core/Middleware/TenantStatusFilter.cs
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Data.Backup.Core/BackupAjaxHandler.cs
#	common/ASC.Data.Backup.Core/BackupFileUploadHandler.cs
#	common/ASC.Data.Backup.Core/Core/NotifyHelper.cs
#	common/ASC.Data.Backup.Core/EF/BackupsContext.cs
#	common/ASC.Data.Backup.Core/Service/BackupWorker.cs
#	common/ASC.Data.Backup.Core/Storage/ConsumerBackupStorage.cs
#	common/ASC.Data.Backup.Core/Tasks/Data/TableInfo.cs
#	common/ASC.Data.Storage/Configuration/StorageSettings.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	products/ASC.Files/Core/Core/ResponseStream.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	products/ASC.Files/Service/Thumbnail/Builder.cs
#	products/ASC.Files/Service/Thumbnail/Worker.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
2022-03-28 12:53:15 +03:00
mushka
290e65288e tweaked getting selection, removed unused code 2022-03-28 12:44:35 +03:00
Timofey Boyko
d02b67e41f Web:Files:Settings: fix content-width for conntected clouds settings 2022-03-28 12:36:23 +03:00
Timofey Boyko
4161b16817 Web:Files:Settings: fix horizontal scroll of tabs when settings is mount 2022-03-28 12:21:25 +03:00
mushka
8df40dbca7 changed dateTime format to vary with language settings 2022-03-28 12:01:12 +03:00
Timofey Boyko
bdea1715a4 Web:Files:Settings: fix content-width 2022-03-28 11:58:57 +03:00
32186f21e7 ResponseStream: fix 2022-03-28 11:57:18 +03:00
Timofey Boyko
b13336a8be Web:Files:Settings: fix bug when forcesave show old value 2022-03-28 11:51:54 +03:00
Timofey Boyko
66bb0df3a5 Web:Files:Settings: fix bugs when storeForcesave show old value 2022-03-28 11:48:54 +03:00
9264302ec4 Thumbnail: async operations. Changed thumbnails format requested from editors to jpg. 1879 issue 2022-03-28 11:38:50 +03:00
Timofey Boyko
d2e192d048 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-28 11:15:47 +03:00
mushka
05fe1a8cb9 removed unused InfoPanelStore methods 2022-03-28 11:14:48 +03:00
Timofey Boyko
e2fa31d9a4 Web:Files:Settings: add tabs for page; move AdminSettings, CommonSettings to functional components; move StyledSettings to separate file 2022-03-28 11:14:31 +03:00
Timofey Boyko
a9c3d66f0d Web:Files:Article: disable mobile main button for settings page 2022-03-28 11:12:15 +03:00
Timofey Boyko
3418cb1ca7 Web:Files: add new keys 'Admin' and 'Common' for settings of eu and ru locales 2022-03-28 11:10:22 +03:00
7abe990d96 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-28 12:36:11 +05:00
81f3a1fb09 DistributedTaskQueue refactoring. set MaxThreadsCount to 1 2022-03-26 16:31:13 +03:00
31c37dfc46 Web: Files: Tile: fix checked style 2022-03-26 15:05:56 +03:00
bbd199bf6d Web: Files: DownloadAppList: use theme 2022-03-26 13:59:22 +03:00
067fb96060 DistributedTaskQueue: refactoring 2022-03-25 21:00:43 +03:00
abae61f2db IDE1006 2022-03-25 19:26:06 +03:00
cd1d3058ff DistributedTaskQueue refactoring 2022-03-25 19:15:28 +03:00
mushka
b0dd8d1077 fixed content gaps and deleted loaders 2022-03-25 18:58:07 +03:00
100e581f1c IDE1006 2022-03-25 17:54:34 +03:00
6fe2178e3e Notify: refactoring 2022-03-25 17:51:03 +03:00
mushka
cd22e7da41 fixed withFileActions bug 2022-03-25 17:09:24 +03:00
mushka
ae33a464e3 removed onFileClick action 2022-03-25 17:04:55 +03:00
mushka
fcff7d4354 Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel 2022-03-25 16:20:48 +03:00
mushka
9de69a3ff6 some tweaks 2022-03-25 12:10:23 +03:00
Timofey Boyko
fe3f9b59e8 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-25 10:11:00 +03:00
Timofey Boyko
7f6461e3b9 Web:Files:Panels: add selected options for group and people selector 2022-03-25 10:07:17 +03:00
1922da4ab9 merge 2022-03-24 20:56:51 +03:00
c7712fd7dc Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-24 18:01:09 +03:00
mushka
cd82919062 merge with feature/virtual-rooms-1.2 2022-03-24 18:00:31 +03:00
mushka
1d80eb1a9d refactored open/close behaviour + redesigned checkbox header 2022-03-24 17:57:36 +03:00
Timofey Boyko
6a9806117b Web:Common:AdvancedSelector: fix bugs with re-render list, add onSelectAll function, move to functional components renders option and group list, create group header component, change props isChecked and isIndeterminate for groups, fix default styles for advanced selector with aside view 2022-03-24 17:52:21 +03:00
1ee814a2ef Merge branch 'feature/backend-refactor' into feature/files-controller-refactoring
# Conflicts:
#	common/ASC.Api.Core/GlobalUsings.cs
#	products/ASC.Files/Server/GlobalUsings.cs
2022-03-24 17:11:33 +03:00
9fbb192fd3 Test: fix packages 2022-03-24 17:00:02 +03:00
9174a20871 Merge branch 'develop' into feature/virtual-rooms-1.2
# Conflicts:
#	packages/asc-web-common/api/portal/index.js
#	packages/asc-web-common/components/Loaders/index.js
#	packages/asc-web-common/store/SettingsStore.js
#	packages/asc-web-components/file-input/index.js
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/save-cancel-buttons/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/FilesListRow.js
#	products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
#	products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
#	products/ASC.Files/Client/src/components/panels/StyledPanels.js
#	products/ASC.Files/Client/src/store/ContextOptionsStore.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/public/locales/en/Settings.json
#	web/ASC.Web.Client/public/locales/ru/Settings.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/NavMenu/index.js
#	web/ASC.Web.Client/src/components/NavMenu/sub-components/header.js
#	web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/common/customization.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-portal.js
#	web/ASC.Web.Client/src/components/pages/Settings/categories/security/access-rights.js
#	web/ASC.Web.Client/webpack.config.js
#	web/ASC.Web.Editor/src/Editor.jsx
2022-03-24 14:39:52 +03:00
66ccce8eb5 Settings: refactoring 2022-03-24 12:35:00 +03:00
f464eb6e35 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-24 12:08:58 +05:00
cb4d39e427 refactor 2022-03-23 19:23:25 +03:00
a13d1ccf3b Merge branch 'develop' into feature/backup 2022-03-23 18:12:01 +03:00
ff54e42a27 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-23 17:59:05 +03:00
a857089ee6 renamed 2022-03-23 17:33:43 +03:00
079618e4e2 refactor 2022-03-23 16:08:27 +03:00
63e12f49ab merge from feature/backend-refactor 2022-03-23 14:56:18 +03:00
cee4ca3a4e Files: fix recent 2022-03-23 14:53:49 +03:00
643bf726b3 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-23 16:10:11 +05:00
5b793b1772 Web: Files: added section bar 2022-03-23 16:08:05 +05:00
0ff67e1f92 Web: Files: Article: fix crash on personal 2022-03-22 17:19:52 +03:00
64cd23a7bf Files: fix download as 2022-03-22 16:54:54 +03:00
244e345ac6 Merge 'feature/backend-refactor' into feature/builder-extensions 2022-03-22 15:57:46 +03:00
4e78af53f9 refactoring DistributedTaskQueue 2022-03-22 15:10:05 +03:00
mushka
bd20587a2b fixed context menu and added first-close-disable interaction 2022-03-22 14:59:34 +03:00
2be8ecfb22 Files: added license header 2022-03-22 13:34:46 +03:00
ee8b6eafc1 Web: Files: deleted useless folders after merge. 2022-03-22 13:22:51 +03:00
62fbab1185 Merge branch 'feature/backend-refactor' into feature/warnings 2022-03-22 13:20:43 +03:00
251f149eb6 Web: Revert withoutBodyScroll after merge. 2022-03-22 13:19:35 +03:00
e4eeb59138 Web: Files: UploadDataStore: fix folder update 2022-03-22 12:54:15 +03:00
476cec2607 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-22 14:50:23 +05:00
d13ef622f8 Merge branch 'feature/virtual-rooms-1.2' into hotfix/campaigns-banner 2022-03-22 14:16:20 +05:00
82c96d160f Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-22 12:09:41 +03:00
9bea7b362b Merge branch 'develop' into feature/backup 2022-03-22 09:59:55 +03:00
172eaa8985
Merge pull request #589 from ONLYOFFICE/feature/update-packages
Feature/update packages
2022-03-21 22:24:11 +04:00
b4c44d1b09 Merge branch 'feature/backend-refactor' into feature/files-controller-refactor 2022-03-21 19:03:57 +03:00
cf8c1ba3ff Merge branch 'feature/backend-refactor' into feature/files-mapping 2022-03-21 18:52:09 +03:00
mushka
c4b470f98a bugfixes 2022-03-21 18:42:23 +03:00
ae490c3290 System.Linq.Async package moved to share ASC.Core.Common 2022-03-21 18:32:04 +03:00
a6f111463b refactor 2022-03-21 18:11:26 +03:00
7f81a77556 Redis.Newtonsoft, Redis.AspNetCore moved to shared ASC.Api.Core 2022-03-21 17:53:23 +03:00
b50b2c3c6f Web: Files: SharingPanel: delete useless 2022-03-21 17:41:28 +03:00
e9671701cb Autofact.Extensions.DependencyInjection package moved to ASC.Api.Core 2022-03-21 17:39:01 +03:00
8381b3e9c6 Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-03-21 17:15:55 +03:00
6e4761b8c2 Systemd package moved to shared ASC.Api.Core 2022-03-21 16:40:09 +03:00
a3f85f8e0b Merge branch 'feature/backend-refactor' into feature/update-packages 2022-03-21 14:44:30 +03:00
df76602dac Web: Files: fixed on close banner function 2022-03-21 16:37:03 +05:00
Timofey Boyko
8355fa388d Web:Common: remove old filter component, update import and change themes 2022-03-21 13:56:42 +03:00
Timofey Boyko
c625b6c6ca Web:Files: remove old filter 2022-03-21 13:41:36 +03:00
mushka
f659632108 fixed exception warning 2022-03-21 13:12:45 +03:00
Timofey Boyko
17f1bcc446 Web:Files: fix display sub-menu for mobile and tablet devices 2022-03-21 12:26:30 +03:00
a72106dfae Web: Files: Deleted useless file after merge. 2022-03-21 11:55:38 +03:00
5420ceff44 Web: Deleted useless files. 2022-03-21 11:52:26 +03:00
Timofey Boyko
685c49552a Merge branch 'feature/refactoring-pagelayout' into feature/virtual-rooms-1.2 2022-03-21 11:41:51 +03:00
Timofey Boyko
133dfa3426 Web: fix article main button view (now correct display mobile main button when view port is increased/decreased) 2022-03-21 11:40:40 +03:00
mushka
61aac91d07 fix arrow keys not working with showCurrentFolder === true 2022-03-21 11:28:40 +03:00
mushka
c51d920092 vr-1.2 actualization 2022-03-21 11:13:56 +03:00
73033f996d Web: Files: Added missing translation. 2022-03-21 10:49:32 +03:00
mushka
3e951462d8 fixes with unexpcted info loading 2022-03-21 10:24:43 +03:00
mushka
a80ada2c37 added current folder info visualization on room-info button click 2022-03-20 22:29:42 +03:00
679aecbc76 Merge branch 'feature/backend-refactor' into feature/license-refactor
# Conflicts:
#	common/services/ASC.Webhooks.Service/WebhookSender.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
2022-03-20 16:47:31 +03:00
868492b562 Merge branch 'develop' into feature/backend-refactor
# Conflicts:
#	common/ASC.Common/Threading/DistributedTaskQueue.cs
#	common/ASC.Core.Common/Billing/BillingClient.cs
#	common/ASC.Core.Common/Billing/TariffService.cs
#	common/ASC.Core.Common/Notify/Context.cs
#	common/ASC.FederatedLogin/Helpers/OAuth20TokenHelper.cs
#	common/ASC.FederatedLogin/Helpers/RequestHelper.cs
#	common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/FacebookLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/GosUslugiLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/LinkedInLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/MailRuLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/VKLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/WordpressLoginProvider.cs
#	common/ASC.FederatedLogin/LoginProviders/YandexLoginProvider.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	common/services/ASC.Studio.Notify/Program.cs
#	common/services/ASC.Webhooks.Service/WebhookSender.cs
#	products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
#	products/ASC.Files/Core/Core/Thirdparty/Box/BoxProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveProviderInfo.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
#	products/ASC.Files/Core/Helpers/DocuSignHelper.cs
#	products/ASC.Files/Core/Helpers/EasyBibHelper.cs
#	products/ASC.Files/Core/Helpers/WordpressHelper.cs
#	products/ASC.Files/Core/Services/NotifyService/NotifyClient.cs
#	products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
#	products/ASC.Files/Core/ThirdPartyApp/Token.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
2022-03-19 22:16:03 +03:00
1c74b5702b Files:fix notify 2022-03-19 18:05:26 +03:00
21a8c0e0fc removed httpclient ctor 2022-03-18 22:34:01 +03:00
ef600712b8
Merge pull request #591 from ONLYOFFICE/feature/refactoring-pagelayout
Feature/refactoring pagelayout
2022-03-18 19:09:26 +03:00
37e0a4715c fix tests 2022-03-18 18:44:00 +03:00
Timofey Boyko
b2924c2914 Web:Files: delete useless code 2022-03-18 18:29:41 +03:00
Timofey Boyko
77709f3399 Web:Files: synchronized first display first loader 2022-03-18 18:25:33 +03:00
f8dadfa3e5 Web: Files: Fix isPrivacyFolder 2022-03-18 18:01:46 +03:00
72cef1b6aa Web: Files: Fix re-render ArticleMainButtonContent on history changes (removed useless goToHomePage() method) 2022-03-18 18:00:59 +03:00
Timofey Boyko
f4c591cf78 Web:Files: fix navigation item click 2022-03-18 16:36:12 +03:00
Timofey Boyko
7c33680d73 Web:Files: add title for icon button in third party list 2022-03-18 16:29:10 +03:00
Timofey Boyko
9bbcbb8e54 Web:Files: restore code 2022-03-18 15:50:18 +03:00
8163d018cd Web: Files: added timeout for banner display 2022-03-18 16:11:11 +05:00
Timofey Boyko
4e3ab4a8a8 Web:Files:Settings: fix render connected clouds list 2022-03-18 13:56:26 +03:00
9d8906f61a Web: Files: deleted check maintenance prop for section header 2022-03-18 15:50:18 +05:00
Timofey Boyko
75a8ee5641 Web:Files:Settings: fix render connected clouds list 2022-03-18 13:43:39 +03:00
Timofey Boyko
2c51acc636 Web:Files:Settings: change button size and position in connected clouds 2022-03-18 13:26:25 +03:00
ff79769307 Files: improvements for automapping 2022-03-18 11:51:33 +03:00
Timofey Boyko
27fab6de23 Merge branch 'feature/virtual-rooms-1.2' into feature/refactoring-pagelayout 2022-03-18 11:05:58 +03:00
645607aae5 default IOptionsMonitor<ILog> => ILog 2022-03-18 11:04:29 +03:00
568f427957 IDE1006 2022-03-17 19:57:02 +03:00
Timofey Boyko
4023359af3 Web:Files: fix warning 'each Each child in a list should have a unique 'key' prop' for main button 2022-03-17 18:45:50 +03:00
6b3f9a71ad IDE0065 2022-03-17 18:23:19 +03:00
11004ab61c IDE0161 2022-03-17 18:13:38 +03:00
6a09cf47e9 IDE0044 2022-03-17 18:07:17 +03:00
80eb1c8257 IDE0011 2022-03-17 18:01:39 +03:00
69950c9d8c IDE0007 2022-03-17 17:55:19 +03:00
72cee6362f CA1841 2022-03-17 17:53:05 +03:00
717456d71d CA1805 2022-03-17 17:33:16 +03:00
mushka
2d452e18da fixed after-merge room-info button deletion and configured new showCurrentFolderInfo feature 2022-03-17 17:16:21 +03:00
ac2d679e71
Merge pull request #517 from ONLYOFFICE/feature/login-redesign
Feature/login redesign
2022-03-17 16:29:22 +03:00
ea502301de Web: Files: Deleted horizontal scroll from Sharing panel. 2022-03-17 16:03:23 +03:00
89beecde71 replaced IOptionsMonitor<ILog> => ILog 2022-03-17 13:13:52 +03:00
679d0d51aa Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-17 12:42:26 +03:00
38d685c4ce
Merge branch 'develop' into feature/backup 2022-03-17 11:03:09 +03:00
fb675dd307 updated packages 2022-03-16 16:37:56 +03:00
e407031ec0 Web: Files: Tile: fix background 2022-03-16 16:07:55 +03:00
Timofey Boyko
7a22ead503 Web:Files: change page layout to section in file pages 2022-03-16 15:26:52 +03:00
Timofey Boyko
15c5844349 Web:Files:Components: delete useless code from article main button 2022-03-16 15:25:18 +03:00
2d42d75a6a Files: fix 2022-03-16 13:45:03 +03:00
c001de8f74 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/login-redesign 2022-03-16 13:03:29 +03:00
bada6b7dd0 Web: Files: Hotkeys: added new translations 2022-03-16 11:32:19 +03:00
Timofey Boyko
dde7fb6694 Web:Files:Store: add isArticleLoaded and setIsArticleLoaded for remove article loaders 2022-03-16 11:29:04 +03:00
Timofey Boyko
429925248f Web:Files: move routes and article to functional components 2022-03-16 11:28:24 +03:00
Timofey Boyko
85180f2fc1 Web:Files: refactoring new article and remove re-renders 2022-03-16 11:27:46 +03:00
0cd4cb49ed Merge branch 'feature/virtual-rooms-1.2' into feature/login-redesign
# Conflicts:
#	packages/asc-web-components/modal-dialog/index.js
#	packages/asc-web-components/themes/dark.js
#	public/locales/de/Common.json
#	web/ASC.Web.Client/src/Shell.jsx
#	web/ASC.Web.Client/src/components/pages/Confirm/sub-components/createUser.js
#	web/ASC.Web.Login/src/Login.jsx
2022-03-16 11:03:07 +03:00
65db98f65c added new license headers 2022-03-15 21:00:53 +03:00
3d50d7977b removed past license headers 2022-03-15 19:59:24 +03:00
d2855e47a4 Merge branch 'develop' into feature/virtual-rooms-1.2 2022-03-15 19:17:44 +03:00
Timofey Boyko
c85f40078a Web:Files: rename 'catalog' to 'article' and update exports/imports 2022-03-15 17:18:46 +03:00