|
c0ab41b6db
|
Web: Files: Icons: Changed folder icons for all formats (24/32/64/96)
|
2022-06-28 16:54:15 +03:00 |
|
TimofeyBoyko
|
fd062b7cd6
|
Web:Files: change docspace to docSpace
|
2022-06-28 16:36:48 +03:00 |
|
TimofeyBoyko
|
5aaea7d5dc
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-06-28 16:12:33 +03:00 |
|
|
24d2672073
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 16:09:24 +03:00 |
|
|
abeec34451
|
Web: Files: Actions: Added icons for menu sublevels
|
2022-06-28 16:09:14 +03:00 |
|
|
9e42ee80b2
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/CommunityServer-AspNetCore into release/v1.2
|
2022-06-28 15:52:30 +03:00 |
|
|
21b2735147
|
filedownloadoperation: restore processed and progress fields
|
2022-06-28 15:52:21 +03:00 |
|
|
4684f26299
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 15:39:40 +03:00 |
|
|
08090ea3b4
|
Web: Icons: Fixed icon bundle for items menu and folders menu
|
2022-06-28 15:39:31 +03:00 |
|
|
fd7a6f9ee9
|
Web: Files: Hotkeys: fixed table-header styles
|
2022-06-28 15:34:20 +03:00 |
|
|
d1063df40c
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-28 15:32:06 +03:00 |
|
|
5cc38b95df
|
add fFmpegFormats and imageFormatsCanBeCrop
|
2022-06-28 14:39:20 +03:00 |
|
TimofeyBoyko
|
a251fab458
|
Web:Files:Store: update rooms store for room context menu
|
2022-06-28 13:27:35 +03:00 |
|
TimofeyBoyko
|
9d137ce39a
|
Web:Files:VirtualRooms: add rooms store and context options store
|
2022-06-28 13:27:01 +03:00 |
|
TimofeyBoyko
|
b7946159e8
|
Web:Files:Rooms: add rooms store to virtual rooms tile view
|
2022-06-28 13:25:36 +03:00 |
|
TimofeyBoyko
|
d9e9e28803
|
Web:Files:Rooms: update table view
|
2022-06-28 13:25:05 +03:00 |
|
|
8b6b3c75e1
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 12:45:57 +03:00 |
|
|
167a6b0db6
|
Fixed Bug 57770 - Client.Profile. Fixed display of the current theme after saving the profile
|
2022-06-28 12:45:49 +03:00 |
|
|
ccf7953a2d
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 12:30:01 +03:00 |
|
|
d9b640450e
|
Fix Bug 57825 - Client.Files.AsNew. New badge do not disappear on 'Mark all as read' button click
|
2022-06-28 12:29:55 +03:00 |
|
|
561a0bba71
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 10:53:40 +03:00 |
|
|
2ab43169a9
|
Web: Files: Fixed styles for convert dialog and empty trash dialog.
|
2022-06-28 10:53:34 +03:00 |
|
|
212fc5a405
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 10:26:41 +03:00 |
|
|
3ac73beb7e
|
Web: Files: fixed selection of items when clicking on the context menu
|
2022-06-28 10:26:32 +03:00 |
|
|
dd52a695e5
|
fix build
|
2022-06-27 23:18:23 +03:00 |
|
|
75737b8d12
|
fix Bug 57710
|
2022-06-27 17:52:56 +03:00 |
|
|
de51c8e1db
|
box: fix GetThumbnail
|
2022-06-27 16:40:26 +03:00 |
|
|
1b40530107
|
Fixed Bug 57814 - Client.HotKeys. Fixed setting of hotkey caret
|
2022-06-27 15:25:34 +03:00 |
|
|
8795b1e377
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 14:52:17 +03:00 |
|
|
6117f4b186
|
Fixed Bug 57781 - Docs: Fixed select items
|
2022-06-27 14:52:10 +03:00 |
|
|
060c7f371d
|
Web: Files: fixed table selection
|
2022-06-27 14:48:04 +03:00 |
|
|
435a0f53bd
|
Fix Bug 57775: Profile tab is not static when swipe
|
2022-06-27 14:13:07 +03:00 |
|
|
6d98440200
|
az resources
|
2022-06-27 14:00:23 +03:00 |
|
|
3bcb58999d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 13:46:03 +03:00 |
|
|
5e5b431e07
|
Fixed Bug 57811, 57812 - Client.Files. Fixed clearing selection when closing context menu.
|
2022-06-27 13:45:56 +03:00 |
|
|
eda70aef95
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 13:54:56 +05:00 |
|
|
9ec801e233
|
Fixed bug 57697 - Web: Files: added delay for requesting a folder if is viewer mode
|
2022-06-27 13:54:45 +05:00 |
|
|
b6b65a1941
|
Fixed Bug 57789 - Mobile. Fixed delete dialog styles
|
2022-06-27 11:48:03 +03:00 |
|
|
bb8e009c43
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 09:50:00 +03:00 |
|
|
2a854f1782
|
Fixed Bug 57770 - Client.Profile. Fixed display of the current theme after saving the profile
|
2022-06-27 09:49:44 +03:00 |
|
TimofeyBoyko
|
d7b3af8089
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-06-26 15:24:13 +03:00 |
|
|
80addf5d86
|
fixed Bug 57463
|
2022-06-24 20:41:11 +03:00 |
|
|
f0f4e13633
|
Fix Bug 57771 - The text color of the hotkeys on the Hotkeys page is not adapted to the dark theme
|
2022-06-24 18:39:33 +03:00 |
|
|
cb9c8a35a4
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-24 17:55:21 +03:00 |
|
|
4f93505de9
|
Fix Bug 57777 - Docs: Hotkey Ctrl+A makes pagination block smaller by height
|
2022-06-24 17:54:33 +03:00 |
|
|
a0852cd105
|
Web: Files: fixed onSelectItem
|
2022-06-24 17:54:02 +03:00 |
|
|
6e7675281e
|
Fixed Bug 57779 - Mobile. Fixed buttons styles for dark theme
|
2022-06-24 17:00:09 +03:00 |
|
|
e8cf4e7906
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-24 16:24:26 +03:00 |
|
|
fef096b0a5
|
fix generating thumbnails for video
|
2022-06-24 16:22:52 +03:00 |
|
|
54fa40be47
|
Fixed Bug 57681 - Client. Removed the checkbox when opening the context menu
|
2022-06-24 15:51:55 +03:00 |
|
|
30d0ca4b97
|
Files: added comunity compability
|
2022-06-24 15:46:59 +03:00 |
|
|
1b6b71b98e
|
Web: Files: disabled hotkeys when version history panel is open
|
2022-06-24 14:23:07 +03:00 |
|
|
f66309bfed
|
Fixed Bug 57774 - VersionHistory. Added close when Escape button is pressed
|
2022-06-24 13:12:53 +03:00 |
|
|
f7b4cb89f6
|
Fixed Bug 57768 - Mobile. Fixed open context menu for IOS devices.
|
2022-06-24 12:47:16 +03:00 |
|
|
d85c4dac29
|
fix
|
2022-06-24 12:15:56 +03:00 |
|
|
09612d377d
|
box: add check can create thumbnail
|
2022-06-24 11:53:12 +03:00 |
|
|
748d26f2ca
|
Fixed Bug 57769 - Docs: Fixed text selection in HotkeysPanel
|
2022-06-24 11:05:58 +03:00 |
|
|
d445b9e05d
|
Fix Bug 57753 - badge Revision is not visible clearly on dark theme
|
2022-06-24 10:44:53 +03:00 |
|
TimofeyBoyko
|
600616b9d9
|
Web:Files:Article: fix click on root rooms and fix actiove article item
|
2022-06-23 20:16:17 +03:00 |
|
TimofeyBoyko
|
c651e88681
|
Web:Files:RoomsStore: correct select root room
|
2022-06-23 20:15:07 +03:00 |
|
TimofeyBoyko
|
348169e3f4
|
Merge branch 'feature/room-types' into feature/virtual-rooms-page
|
2022-06-23 19:40:36 +03:00 |
|
TimofeyBoyko
|
fff7dd7646
|
Web:Files:Store: add rooms store
|
2022-06-23 19:38:01 +03:00 |
|
|
f2bf9defe6
|
Files: added property room type in dto
|
2022-06-23 18:39:00 +03:00 |
|
|
a035e9bf0c
|
Merge pull request #696 from ONLYOFFICE/feature/download-dialog
Feature/download dialog
|
2022-06-23 15:41:47 +03:00 |
|
|
9408a5a296
|
Web: Files: Added and applied new "ErrorInternalServer" translation key to Common.json
|
2022-06-23 15:34:52 +03:00 |
|
|
67f276e0d0
|
Fixed Bug 57763 - Сlient.OformsGallery. Fixed form creation after back from form gallery page
|
2022-06-23 15:19:17 +03:00 |
|
|
20deb4458a
|
thumbnails: adaptive size
|
2022-06-23 15:18:15 +03:00 |
|
|
4b513bef15
|
Fixed Bug 57743 - Client.Upload. Added warning about possible data loss when refreshing the page while loading files/folders
|
2022-06-23 14:03:03 +03:00 |
|
|
d98a151385
|
Merge branch 'release/v1.2' into feature/download-dialog
|
2022-06-23 12:28:13 +03:00 |
|
|
3bf29d925c
|
Web: Files: Fix decrement of root folder counter by click on 'New' file status
|
2022-06-23 12:26:10 +03:00 |
|
|
af252cc949
|
fix
|
2022-06-23 12:24:20 +03:00 |
|
|
c9eaeed719
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
|
2022-06-23 12:09:13 +03:00 |
|
|
5bcbae5711
|
fix
|
2022-06-23 11:48:31 +03:00 |
|
TimofeyBoyko
|
d49b5afb98
|
Web:Files:Article: remove useless code
|
2022-06-22 17:33:23 +03:00 |
|
TimofeyBoyko
|
07c34da64d
|
Web:Files: change virtual rooms page url
|
2022-06-22 17:33:10 +03:00 |
|
|
ed2298663c
|
Web: Files: Added opportunity to turn off "New" files badge
|
2022-06-22 17:25:26 +03:00 |
|
TimofeyBoyko
|
c20c47921e
|
Web:Files:Article: send rootFolderType as type at catalog item
|
2022-06-22 17:21:57 +03:00 |
|
|
b9496e4d0b
|
Merge branch 'release/v1.2' into feature/download-dialog
|
2022-06-22 17:21:38 +03:00 |
|
|
9f97d1f2b7
|
Fixed Bug 57733 - Client.Profile. Fixed update header-profile
|
2022-06-22 16:38:48 +03:00 |
|
TimofeyBoyko
|
4023e101bd
|
Web:Files:Store applied e2bdaa4
|
2022-06-22 16:27:30 +03:00 |
|
|
478666331b
|
fix bug 57463
|
2022-06-22 16:26:38 +03:00 |
|
TimofeyBoyko
|
fdbe61603b
|
Web:Files:Article: add empty accounts item
|
2022-06-22 16:24:18 +03:00 |
|
|
d05f13b143
|
fix
|
2022-06-22 16:21:39 +03:00 |
|
TimofeyBoyko
|
073c24014a
|
Web:Files:Article: add new header items: files, rooms, other
|
2022-06-22 16:14:42 +03:00 |
|
|
914c9bc799
|
File: fix download
|
2022-06-22 15:54:43 +03:00 |
|
|
274e89f51c
|
Web: Files: added limit for download action
|
2022-06-22 15:38:05 +03:00 |
|
|
5e4d065623
|
Fixed Bug 57720 - Client. Fixed display the current directory
|
2022-06-22 14:58:34 +03:00 |
|
|
5cb96c0727
|
Merge branch 'release/v1.2' into feature/download-dialog
|
2022-06-22 14:32:57 +03:00 |
|
TimofeyBoyko
|
40d69ea88f
|
Web:Files:Article: rename SettingsItems to SettingItem
|
2022-06-22 14:20:27 +03:00 |
|
TimofeyBoyko
|
6c6052293b
|
Web:Files:Article: change default icon to settings item
|
2022-06-22 14:17:35 +03:00 |
|
TimofeyBoyko
|
ceaa29e294
|
Web:Files:Article: hide thirparty list, download app list and banner for docspace
|
2022-06-22 14:17:07 +03:00 |
|
|
2273887a6a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-22 14:11:19 +03:00 |
|
|
cd2687e260
|
Fixed Bug 57630: Web: Files: Fixed animation when switching between folders.
|
2022-06-22 14:11:07 +03:00 |
|
|
de7148686c
|
fix Bug 52860
|
2022-06-22 13:48:11 +03:00 |
|
TimofeyBoyko
|
4b7520c6a8
|
Web:Files:Article: add new icons for article items
|
2022-06-22 12:32:21 +03:00 |
|
|
1658240e2f
|
Web: Files: fixed download action
|
2022-06-22 12:07:57 +03:00 |
|
|
b88dadf961
|
Merge branch 'feature/download-dialog' of github.com:ONLYOFFICE/AppServer into feature/download-dialog
|
2022-06-22 11:53:01 +03:00 |
|
|
f84d98c6df
|
Web: Files: fixed downloadFiles toast
|
2022-06-22 11:52:37 +03:00 |
|
|
7189a99583
|
Merge branch 'feature/download-dialog' of https://github.com/ONLYOFFICE/AppServer into feature/download-dialog
|
2022-06-22 11:36:35 +03:00 |
|
|
3b99ef503c
|
Merge branch 'release/v1.2' into feature/download-dialog
|
2022-06-22 11:36:20 +03:00 |
|
TimofeyBoyko
|
36835eea13
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-06-22 11:17:05 +03:00 |
|
|
f2da6fc55c
|
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
|
2022-06-22 11:55:36 +04:00 |
|
|
417b13b844
|
Fix Bug 57704: left/right arrow select item in compact view
|
2022-06-21 22:09:40 +03:00 |
|
|
7f77633a92
|
Fix Bug 57639: different actions menu
|
2022-06-21 21:41:29 +03:00 |
|
|
aad8a92b4c
|
RoomInvite replaced by LinkInvite
|
2022-06-21 20:33:05 +03:00 |
|
|
bbcd5b7382
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 19:45:30 +03:00 |
|
|
95c23cc95a
|
Fix Bug 57680 - Mobile. Couldn't not select more than 1 tile in thumbnails mode
|
2022-06-21 19:45:16 +03:00 |
|
|
b30ec3c1bd
|
Files: added room api docs
|
2022-06-21 18:43:54 +03:00 |
|
|
231c99a5f0
|
fix Bug 57693
|
2022-06-21 17:52:32 +03:00 |
|
|
1aadf26fe2
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-21 17:05:04 +03:00 |
|
|
fa3b7003ba
|
Fixed Bug 57701 - Client.HotKeys. Fixed the creation of the document
|
2022-06-21 16:49:30 +03:00 |
|
|
8ad241fc6d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 16:21:47 +03:00 |
|
|
9c1eb1e185
|
Fixed Bug 57683 - Client.Info. Hidden "Content" field for third-party folders
|
2022-06-21 16:21:07 +03:00 |
|
|
aaf331557e
|
Fixed Bug 57646: Web: Files: Added the ending of file/folder creation
|
2022-06-21 16:07:21 +03:00 |
|
|
14eb735fed
|
Fixed Bug 57642 - Docs: Actions: Fixed form template creation after resizing window to tablet size
|
2022-06-21 14:10:01 +03:00 |
|
TimofeyBoyko
|
4bf70be27d
|
Web:Files: applied changes from 610f738
|
2022-06-21 14:09:58 +03:00 |
|
|
27f1138a5d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 13:46:30 +03:00 |
|
|
6f0fa1555f
|
Web: Files: Removed static description from GalleryForm item info
|
2022-06-21 13:23:50 +03:00 |
|
|
b318b0390e
|
Fix Bug 57662: missing email in translation
|
2022-06-21 13:23:48 +03:00 |
|
|
6619e40896
|
Fix Bug 57690: current email when changing
|
2022-06-21 13:17:30 +03:00 |
|
|
66cdf0bdaf
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 13:03:31 +03:00 |
|
mushka
|
343dd2174c
|
files
|
2022-06-21 12:42:58 +03:00 |
|
|
610f738ca6
|
Web: Files: Fix password protected files operations
|
2022-06-21 12:29:26 +03:00 |
|
|
a4d33b9939
|
Fixed Bug 57660 - Docs: Fixed display info-panel content for forms-gallery
|
2022-06-21 12:19:15 +03:00 |
|
TimofeyBoyko
|
3f1623716d
|
Web:Files: move global event args to one payload
|
2022-06-21 11:30:26 +03:00 |
|
TimofeyBoyko
|
7726b8f9ef
|
Web:Files:CreateEvent: add onClose function after user click save button
|
2022-06-21 11:29:31 +03:00 |
|
TimofeyBoyko
|
c4de30ee0f
|
Web:Files:HOCs: fix warning after removing fileActionStore
|
2022-06-21 11:28:44 +03:00 |
|
TimofeyBoyko
|
c4483f2892
|
Merge branch 'develop' into feature/create-from-modal
|
2022-06-21 11:05:53 +03:00 |
|
|
494b2bc1e0
|
merge
|
2022-06-21 10:53:05 +03:00 |
|
|
0a27a98511
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-21 10:52:53 +03:00 |
|
|
18f944b2c6
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 10:10:12 +03:00 |
|
|
3fdf32f445
|
Fixed Bug 57674: Client: People: Fixed DropDown out of page border opening
|
2022-06-20 23:02:33 +03:00 |
|
|
b2f9e35041
|
Fixed Bug 57663: Client: Files: Fixed displaying icons for connecting accounts
|
2022-06-20 22:42:48 +03:00 |
|
|
fc567a1040
|
Fixed Bug 57637: Client: Files: Fixed icon size for editing item
|
2022-06-20 22:09:36 +03:00 |
|
|
db89e1684c
|
Fixed Bug 57676: Client: People: Profile: Disabled email interaction for self profile
|
2022-06-20 21:52:21 +03:00 |
|
|
3c2c147662
|
Fixed Bug 57678: Client: People: Profile: Disabled toggle option for "Interface theme" parameter
|
2022-06-20 21:45:33 +03:00 |
|
|
46d495080a
|
Fixed Bug 57634: Web: Client: People: Fixed displaying "Sex" field for personal mode
|
2022-06-20 21:41:43 +03:00 |
|
|
72f0ac4f9b
|
file converter server: fixed bugs
|
2022-06-20 19:58:08 +03:00 |
|
TimofeyBoyko
|
9a58baa435
|
Web:Files: delete filesActionStore and useless code after adding global events for create and rename file/folder
|
2022-06-20 19:01:10 +03:00 |
|
|
c3faf982c5
|
Files: fix download
|
2022-06-20 18:29:07 +03:00 |
|
|
aa53acccd9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-20 17:54:19 +03:00 |
|
|
fa458aa1a5
|
Web: Files: fixed selection when clicking on badge or file/folder name
|
2022-06-20 17:54:14 +03:00 |
|
|
e0a23a91a3
|
Web: Files: added error on download action
|
2022-06-20 17:50:32 +03:00 |
|
|
5ac3d3e5b6
|
Web: Files: added new logic when select file format
|
2022-06-20 17:28:55 +03:00 |
|
|
34cb63fd3f
|
fix
|
2022-06-20 17:23:32 +03:00 |
|
|
5a06f23111
|
fix Bug 57618
|
2022-06-20 17:14:37 +03:00 |
|
|
03e756277b
|
fixed warnings
|
2022-06-20 17:01:59 +03:00 |
|
|
ac94309716
|
Web: Files: removed custom format from download dialog selector
|
2022-06-20 16:55:21 +03:00 |
|
|
3b5cb1b7fe
|
Web: Files: fixed display of items in download dialog
|
2022-06-20 16:33:05 +03:00 |
|
|
c192e0fd0a
|
Merge branch 'release/v1.2' into feature/download-dialog
|
2022-06-20 15:41:53 +03:00 |
|
|
79cce9cfc1
|
Web: Files: Added file ext after update date on File Row view mode
|
2022-06-20 15:35:27 +03:00 |
|
TimofeyBoyko
|
fe4f4ac80d
|
Web:Files:GlobalEvents: delete console log
|
2022-06-20 15:06:04 +03:00 |
|
|
a8bf285dc1
|
Web: Files: Added and applied new modern row mode
|
2022-06-20 15:01:54 +03:00 |
|
|
57916d46ba
|
Files: removed unnecessary, refactor
|
2022-06-20 14:39:08 +03:00 |
|
|
44747e837a
|
Files: tag id replaced with tag name
|
2022-06-20 14:30:49 +03:00 |
|
|
2eb288f307
|
Web: Files: removed comments
|
2022-06-20 14:28:10 +03:00 |
|
|
9e99fed6b5
|
Web: Files: added new DownloadDialog, refactoring
|
2022-06-20 14:18:40 +03:00 |
|
|
231daa2e0b
|
Web: removed useless translations
|
2022-06-20 14:16:11 +03:00 |
|
|
e6602a22ab
|
Files: fix copyas
|
2022-06-20 13:21:40 +03:00 |
|
|
e68ac70005
|
Merge branch 'develop' into feature/docspace
|
2022-06-20 12:15:08 +03:00 |
|
TimofeyBoyko
|
413962bbaa
|
Web:Files:GlobalEvents: add title validation on rename
|
2022-06-20 12:14:49 +03:00 |
|
TimofeyBoyko
|
efa8a383d7
|
Web:Files:GlobalEvents: change dialog styles for device width less than 400px
|
2022-06-20 11:29:47 +03:00 |
|
mushka
|
d4cfd235fc
|
merge with release
|
2022-06-20 11:25:28 +03:00 |
|
TimofeyBoyko
|
991e3cc012
|
Web:Files:GlobalEvents: refactoring rename and create events
|
2022-06-20 11:05:58 +03:00 |
|
|
efba3d824e
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-20 11:04:43 +03:00 |
|
TimofeyBoyko
|
0bfa280c38
|
Web:Files:FilesActionsStore: fix rename event
|
2022-06-20 10:34:59 +03:00 |
|
|
e2bdaa40e4
|
Web: Files: returned set filter url.
|
2022-06-20 10:30:18 +03:00 |
|
TimofeyBoyko
|
c3620c6c91
|
Web:Files:Components: add rename and create global events
|
2022-06-20 10:09:03 +03:00 |
|
TimofeyBoyko
|
a71e637c98
|
Web:Files:FilesActionsStore: add type as argument to editCompleteAction and change setAction from fileActionStore to global event
|
2022-06-20 10:08:28 +03:00 |
|
TimofeyBoyko
|
71fea71531
|
Web:Files:FilesActionsStore: add type as argument to editCompleteAction and change setAction from fileActionStore to global event
|
2022-06-20 10:07:07 +03:00 |
|
TimofeyBoyko
|
3703693b34
|
Web:Files:DialogsStore: change create oform file from docx from action store to global event
|
2022-06-20 10:05:31 +03:00 |
|
TimofeyBoyko
|
fd3a45f301
|
Web:Files:ContextOptionStore: change rename file or folder from action store to global event
|
2022-06-20 10:04:33 +03:00 |
|
TimofeyBoyko
|
441786da21
|
Web:Files:Home: change create oform file from action store to global event
|
2022-06-20 10:02:48 +03:00 |
|
|
e2cee2c2fc
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# 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/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-06-19 22:44:48 +03:00 |
|
|
72b0a81f51
|
fix
|
2022-06-17 20:51:01 +03:00 |
|
|
8ea04bcc81
|
Merge branch 'develop' into feature/12.0
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
|
2022-06-17 19:19:00 +03:00 |
|
|
c83bd81bd5
|
Web: Files: Styled table badge (more closer to figma)
|
2022-06-17 18:21:16 +03:00 |
|
TimofeyBoyko
|
ae66c8e4f6
|
Web:Files:Section:Header: change create file or folder from action store to global event
|
2022-06-17 16:16:14 +03:00 |
|
TimofeyBoyko
|
10a745c1e6
|
Web:Files:withHotkeys: change create file or folder from action store to global event
|
2022-06-17 16:15:54 +03:00 |
|
TimofeyBoyko
|
a029abadf5
|
Web:Files:EmptyContainer: change create file or folder from action store to global event
|
2022-06-17 16:00:15 +03:00 |
|
TimofeyBoyko
|
0ab899d5c9
|
Web:Files: add GlobalEvents component
|
2022-06-17 15:51:55 +03:00 |
|
TimofeyBoyko
|
1a34e82155
|
Web:Files:Article: change create file or folder from action store to global event
|
2022-06-17 15:49:29 +03:00 |
|
|
080cde2888
|
Web: Files: Fix empty second line of FileRowContent on third-party folders
|
2022-06-17 15:39:45 +03:00 |
|
TimofeyBoyko
|
bac023f04c
|
Web:Files:Constants: add global events name
|
2022-06-17 14:54:17 +03:00 |
|
|
29d3bb3fee
|
Merge branch 'develop' into feature/get-thumbnail-from-thirdparty
|
2022-06-17 13:18:03 +03:00 |
|
|
597db4684e
|
refactoring
|
2022-06-17 13:17:53 +03:00 |
|
|
3684775829
|
Files: security fix
|
2022-06-17 12:27:07 +03:00 |
|
|
ff6a403c3c
|
Files: refactor
|
2022-06-17 11:22:55 +03:00 |
|
|
fa9316807c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-17 11:15:51 +03:00 |
|
|
06ce968e9f
|
Web: Files: fixed edit component styles
|
2022-06-17 11:15:32 +03:00 |
|
|
2b8b7c9898
|
Files: added permission check for link generation
|
2022-06-17 10:59:03 +03:00 |
|
|
1f65ea35a7
|
Files: removed unnecessary
|
2022-06-17 10:52:32 +03:00 |
|
|
09de3c141c
|
Web: Files: Deleted useless code.
|
2022-06-17 10:31:38 +03:00 |
|
|
0fbe11ed1c
|
Merge branch 'develop' into feature/docspace
|
2022-06-17 10:26:51 +03:00 |
|
|
b62ba1d729
|
fix tests
|
2022-06-17 10:17:17 +03:00 |
|
mushka
|
930b05fc31
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 19:01:53 +03:00 |
|
mushka
|
776a37f538
|
changed InfoPanel behaviour on module switch + added InfoPanelLoader components + changed the way how InfoPanelHeader passed itself to Section + united GalleryHeader and InfoPanelHeader to one component
|
2022-06-16 19:01:30 +03:00 |
|
|
34d55db6a6
|
Files: added invitation by link without email, added existing user to room by link
|
2022-06-16 18:39:50 +03:00 |
|
|
fc93c6336a
|
Files: added email invitation
|
2022-06-16 18:34:38 +03:00 |
|
|
d3890b3e18
|
Files: deleted unnecessary
|
2022-06-16 18:28:15 +03:00 |
|
|
67b9a00068
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 17:23:09 +03:00 |
|
|
b26c2a8a6f
|
edit VersionHistory.json
|
2022-06-16 17:21:42 +03:00 |
|
|
e9a1220c0e
|
Web: Files: fixed oforms creation
|
2022-06-16 17:18:04 +03:00 |
|
|
56ece27e1b
|
moved from ddf515b8
|
2022-06-16 17:16:46 +03:00 |
|
|
0d1239af95
|
add thumbnails for video
|
2022-06-16 16:43:29 +03:00 |
|
TimofeyBoyko
|
0317a4f4a3
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 16:41:49 +03:00 |
|
TimofeyBoyko
|
7b2fe1790c
|
Web:Files:EditingWrapperComponent: fix dark theme for tile view
|
2022-06-16 16:41:33 +03:00 |
|
|
d3bb2419c1
|
Web: Files: fixed oforms creation, added display oforms gallery button for all languages
|
2022-06-16 16:15:01 +03:00 |
|
|
83d9e01d04
|
Web: Files: fixed header jumping for mobile devices
|
2022-06-16 13:39:36 +03:00 |
|
|
f2e2ccee72
|
Web: Files: Header: refactoring
|
2022-06-16 13:28:38 +03:00 |
|
|
1ac2e80310
|
Web: Files: fixed download dialog styles
|
2022-06-16 12:29:50 +03:00 |
|
|
8c8bef2418
|
Web: Files: fixed finalizeVersionAction
|
2022-06-16 12:03:47 +03:00 |
|
|
430542b2ea
|
moved from ddf515b8
|
2022-06-16 11:35:24 +03:00 |
|
|
c9fb0d3dac
|
moved from ddf515b8
|
2022-06-16 11:13:53 +03:00 |
|
|
a98e5d9c6a
|
Web: Files: Fix display name decoding ('Shared With Me' Author column issue)
|
2022-06-15 19:49:18 +03:00 |
|
|
56ba38e1fa
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-15 18:07:16 +03:00 |
|
|
3a6eb0c8de
|
Web: Files: removed table-row z-index
|
2022-06-15 17:25:53 +03:00 |
|
|
59f50effc5
|
Merge branch 'develop' into bugfix/fix-private-room
|
2022-06-15 14:48:49 +03:00 |
|
|
2321806548
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-15 14:40:41 +03:00 |
|
mushka
|
78cdd52e94
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-15 14:25:45 +03:00 |
|
mushka
|
f2d7a02288
|
added decoding for unicode characters in InfoPanel
|
2022-06-15 14:25:33 +03:00 |
|
|
f3f3ed96ae
|
moved from ddf515b8
|
2022-06-15 12:46:21 +03:00 |
|
|
e3fd726cd6
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-15 12:21:17 +03:00 |
|
|
c37af416da
|
Files: fix 404
|
2022-06-15 10:41:59 +03:00 |
|
Vashchuk Nikita
|
a10b1f98b9
|
added parallel tasks in files
|
2022-06-14 18:13:40 +03:00 |
|
|
77ecf6f988
|
Files: fix
|
2022-06-14 18:12:37 +03:00 |
|
TimofeyBoyko
|
52d9f7f20f
|
Web:Files:init virtual rooms page with empty container and table and tile views
|
2022-06-14 16:41:26 +03:00 |
|
TimofeyBoyko
|
0746b20089
|
Web:Files: add context options for virtual rooms page
|
2022-06-14 16:34:07 +03:00 |
|
TimofeyBoyko
|
668ac51998
|
Web:Files: add new pin and settings images
|
2022-06-14 16:30:41 +03:00 |
|
|
7194fec848
|
Files: fix
|
2022-06-14 13:30:12 +03:00 |
|
|
d4622ee902
|
Web: Files: added error handling for create/edit operations
|
2022-06-14 12:51:54 +03:00 |
|
Artem Tarasov
|
2eebeb3c1a
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-06-14 11:22:23 +03:00 |
|
|
35bebe49f9
|
moved from ddf515b8
|
2022-06-14 11:11:41 +03:00 |
|
|
c2b7f99f16
|
refactoring get thumbnailFile
|
2022-06-14 10:45:52 +03:00 |
|
|
722f3568bb
|
refactoring get ThumbnailFile
|
2022-06-14 10:28:57 +03:00 |
|
|
a98eb791e8
|
Files: refactor
|
2022-06-14 01:33:37 +03:00 |
|
|
de36de1870
|
Files: fix
|
2022-06-14 00:04:45 +03:00 |
|
|
269cdd9825
|
Files: refactor
|
2022-06-13 21:50:49 +03:00 |
|
|
f68585bf9d
|
Files: fix
|
2022-06-13 21:04:51 +03:00 |
|
|
3e2483a016
|
Files: added rooms folder cache clearing
|
2022-06-13 17:41:13 +03:00 |
|
|
5be6e7cbee
|
Files: fix
|
2022-06-13 17:40:34 +03:00 |
|
|
2336dc9762
|
Files: refactor
|
2022-06-13 17:40:25 +03:00 |
|
|
239d1803c7
|
FIles: refactor
|
2022-06-13 17:32:24 +03:00 |
|
|
e618f7f450
|
Files: fix filter, added clearing rooms cache
|
2022-06-10 22:32:21 +03:00 |
|
|
d370c797bb
|
Files: added virtual rooms default share
|
2022-06-10 22:31:24 +03:00 |
|
|
2811e694c6
|
Files: fix System.NullReferenceException
|
2022-06-10 22:30:49 +03:00 |
|
|
7fdf89ecae
|
Files: added thirdparty rooms tags query
|
2022-06-10 22:30:28 +03:00 |
|
|
d43693acb2
|
get status Thumbnail.Created for thirdparty
|
2022-06-10 16:06:32 +03:00 |
|
|
f839a195c9
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-10 12:25:16 +03:00 |
|
|
aa5edf7ba7
|
Web: Translations: Moved "DeleteUserDataConfirmation" key to Translations.json (FullEnDublicatesTest issue fix)
|
2022-06-10 12:25:08 +03:00 |
|
|
7ddb0506c9
|
Web: Files: moved Hotkeys translation, added button to open hotkeys
|
2022-06-10 11:30:57 +03:00 |
|
|
1b6d96400c
|
Files: changed filtering rooms by types
|
2022-06-09 20:11:12 +03:00 |
|
|
d132f0d565
|
fileconverter: refactoring
|
2022-06-09 17:38:27 +03:00 |
|
|
22b341c942
|
fileconverter: added logs
|
2022-06-09 17:02:19 +03:00 |
|
|
9edcce8858
|
moved from ddf515b8
|
2022-06-09 15:11:45 +03:00 |
|
|
16b5a4cac8
|
Files: refactor
|
2022-06-09 13:24:54 +03:00 |
|
Artem Tarasov
|
885ab9b041
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-09 13:05:48 +03:00 |
|
Artem Tarasov
|
67ec336b60
|
Web: Files: changed setSelection to setBufferSelection when scroll to item
|
2022-06-09 13:05:29 +03:00 |
|
|
ef4b0a17f2
|
Files: added room presets
|
2022-06-09 11:38:34 +03:00 |
|
|
8ad71434c1
|
Files: added room presets
|
2022-06-09 11:33:31 +03:00 |
|
|
8f8fc7323d
|
Files: refactor
|
2022-06-09 11:33:14 +03:00 |
|
Artem Tarasov
|
2aa0bc254a
|
Web: Files: fixed selector
|
2022-06-09 11:03:06 +03:00 |
|
|
95e7d85c53
|
Fixed Bug 57445: Client: Files: Added property to restore selection after fetching items
|
2022-06-09 10:44:13 +03:00 |
|
Artem Tarasov
|
c28a513a9a
|
Web: Files: fixed scroll to item for table view
|
2022-06-09 10:24:00 +03:00 |
|
Artem Tarasov
|
dccd09dd89
|
Web: Files: added prop 'id' for list items
|
2022-06-09 10:23:02 +03:00 |
|
Artem Tarasov
|
2ca378643d
|
Web: Files: added scroll to the created file and to the last opened image
|
2022-06-09 01:22:50 +03:00 |
|
Artem Tarasov
|
d761598b1f
|
Web: Client: Settings: applied helpLink from settings
|
2022-06-08 17:47:24 +03:00 |
|
Artem Tarasov
|
1f856ef377
|
Web: Common/People: Fixed Bug 57478 - Client.Profile. The ‘Learn more’ link in the popup helper window leads to a page with a 404 Error.
|
2022-06-08 17:44:27 +03:00 |
|
|
7b1ea58cdf
|
fileconverter: moved timer to separete worker service
|
2022-06-08 17:25:25 +03:00 |
|
|
e2ba706d71
|
Fix after merge
|
2022-06-08 16:38:34 +03:00 |
|
|
b693779ea1
|
Merge branch 'develop' into feature/docspace-pin
|
2022-06-08 16:38:16 +03:00 |
|
TimofeyBoyko
|
c0084cb7dc
|
Web:Files/Components: add new images for virtual rooms page
|
2022-06-08 16:17:46 +03:00 |
|
|
02b4031ba0
|
fix Bug 57463
|
2022-06-08 12:53:33 +03:00 |
|
|
c1d152becc
|
moved from ddf515b8
|
2022-06-07 21:00:08 +03:00 |
|
|
397cde0a3b
|
Files: added pin/unpin, fix tags
|
2022-06-07 19:07:55 +03:00 |
|
|
5203feffe7
|
Web: Files: added table loader
|
2022-06-07 16:15:55 +03:00 |
|
TimofeyBoyko
|
617f3974e0
|
Web:Files: add new route virtual rooms
|
2022-06-07 13:19:19 +03:00 |
|
Artem Tarasov
|
cec8eeeff1
|
Web: Files: Fixed Bug 57442 - Client.Block: disabled lock/unlock action for non-editable formats
|
2022-06-07 10:04:33 +03:00 |
|
|
161ef0f1f9
|
Web: Files: fixed withFileActions re-render, removed tiles log
|
2022-06-06 18:11:53 +03:00 |
|
mushka
|
dced443306
|
removed unused get func from SettingsStore
|
2022-06-06 18:04:16 +03:00 |
|
|
720121f56e
|
add google and onedrive
|
2022-06-06 17:28:51 +03:00 |
|
|
5f4c61e807
|
Fix Bug 57476: min width profile info
|
2022-06-06 12:37:12 +03:00 |
|
|
8c56de7a26
|
moved from ddf515b8
|
2022-06-05 18:44:37 +03:00 |
|
|
9f74ef2bc3
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-03 15:16:34 +03:00 |
|
|
ff118752ed
|
Web: Files: Fixed memory leak after resize.
|
2022-06-03 15:16:19 +03:00 |
|
|
efcf805aec
|
Web: Files: fix show paging
|
2022-06-03 14:46:23 +03:00 |
|
|
0eade93e81
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-03 14:25:47 +03:00 |
|
|
f0363e6a81
|
Web: Files: Removed hover border overlay on hotkey border in table view.
|
2022-06-03 14:25:32 +03:00 |
|
|
4e7e9415d9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-03 13:38:17 +03:00 |
|
|
493a7eb39b
|
Fixed Bug 57469 - Client.Files.Upload. "Something went wrong" when opening the upload panel.
|
2022-06-03 13:38:11 +03:00 |
|
|
dfd595193d
|
Fix Bug 57383: open editor when created form
|
2022-06-03 13:37:02 +03:00 |
|
|
cc7c29c8cf
|
Files: fix
|
2022-06-03 13:26:16 +03:00 |
|
|
da4bdc89cd
|
Web: Files: Added a default cursor for files in the folder selection dialog.
|
2022-06-03 12:56:39 +03:00 |
|
|
e594cdaf4d
|
Web: Files/Components: Fixed dark theme of files icons for selection folder dialog.
|
2022-06-03 12:53:12 +03:00 |
|
|
bbf1a0cbfa
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-03 12:19:49 +03:00 |
|
|
def3db7860
|
Web: Files: Return bad code after merge.
|
2022-06-03 12:19:26 +03:00 |
|
|
00a2bfa884
|
Merge pull request #686 from ONLYOFFICE/bugfix/field-created-on-file
Bugfix/field created on file
|
2022-06-03 12:03:40 +03:00 |
|
|
d221e4dca2
|
Web: Files/Components: Added restriction on moving a folder into itself
|
2022-06-03 11:37:30 +03:00 |
|
|
a0729a8084
|
thumbnail: first version
add from google and dropbox
|
2022-06-03 10:41:05 +03:00 |
|
|
57df81aa76
|
Files: added logo audit, fix
|
2022-06-03 01:27:56 +03:00 |
|
|
848751220c
|
Files: added logos for rooms
|
2022-06-02 21:41:16 +03:00 |
|
|
85bb4df966
|
edit translations
|
2022-06-02 18:41:50 +03:00 |
|
|
e2d047ad54
|
Fix Bug 57447: active restore button in trash
|
2022-06-02 17:12:52 +03:00 |
|
|
8079b217ac
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-02 17:06:21 +03:00 |
|
|
db238ffedb
|
update lo
|
2022-06-02 17:03:42 +03:00 |
|
|
30ae545e6f
|
Fix Bug 57443: layering icon over text
|
2022-06-02 14:19:18 +03:00 |
|
|
34028b0990
|
Fixed Bug 57414 - Client.Upload. Fixed file extension display after upload and conversion
|
2022-06-02 13:46:30 +03:00 |
|
|
2b63336d62
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-02 13:22:46 +03:00 |
|
|
e2d39453f8
|
edit translations
|
2022-06-02 13:21:37 +03:00 |
|
|
fa3aca4a3e
|
Web: Files: removed group sharing for personal
|
2022-06-02 11:25:01 +03:00 |
|
|
d38d88c0ea
|
Fixed Bug 54591 - Client.Files. Fixed deleting third party files/folders toast.
|
2022-06-02 11:12:19 +03:00 |
|
|
3757174d08
|
fix test
|
2022-06-01 20:25:03 +03:00 |
|
|
bcec4e7e05
|
fix 57264
|
2022-06-01 18:55:22 +03:00 |
|
Nikita
|
c662c59d41
|
added asyncEnumerable to GetEntriesAsync
|
2022-06-01 18:27:31 +03:00 |
|
|
146891713d
|
Web: Files: fixed group context menu
|
2022-06-01 18:15:52 +03:00 |
|
|
19d9a258b9
|
Merge branch 'release/v1.2' into feature/group-context-menu
|
2022-06-01 17:48:36 +03:00 |
|
|
f070c50c63
|
Web: Files: added clear selection after mark as favorite
|
2022-06-01 17:39:08 +03:00 |
|
|
b1abac2eae
|
Files: fixed move operation
|
2022-06-01 17:18:26 +03:00 |
|
|
cbcb8f903a
|
Web: Files: combined add to favorites / remove from favorites in a single block
|
2022-06-01 17:14:54 +03:00 |
|
|
a861268e4f
|
moved from ddf515b8
|
2022-06-01 17:07:08 +03:00 |
|
|
b8162f4af7
|
Web: Files: removed count of files from group context menu label
|
2022-06-01 17:06:54 +03:00 |
|
|
9467a7e366
|
Web: Files: added separators to group context menu, remove empty trash
|
2022-06-01 16:54:32 +03:00 |
|
|
6c04530f20
|
Web: Files: Delete useless translation.
|
2022-06-01 16:19:59 +03:00 |
|
|
219366b3f6
|
Web: Moved translations to Common.
|
2022-06-01 15:56:50 +03:00 |
|
|
229a6e8f0d
|
Merge branch 'release/v1.2' into bugfix/field-created-on-file
|
2022-06-01 17:40:32 +05:00 |
|
|
9df538e4b5
|
Web: Files: fixed setSelected
|
2022-06-01 15:30:18 +03:00 |
|
|
8af30212aa
|
Web: Files: added group context options
|
2022-06-01 15:13:09 +03:00 |
|
|
3ebd67f444
|
merge from develop
|
2022-06-01 14:44:30 +03:00 |
|
|
36fd7e6e0c
|
Web: Files: removed useless code
|
2022-06-01 13:23:59 +03:00 |
|
|
aef79ffbe7
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-01 12:34:01 +03:00 |
|
|
76c4d2ebfc
|
Web: Fixed color in dark theme for dialog.
|
2022-06-01 12:33:49 +03:00 |
|
Timofey Boyko
|
ff9c0f54ae
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-01 11:56:31 +03:00 |
|
Timofey Boyko
|
af00060711
|
Fix Bug 57426 - Client. Folder name tooltip at cursor position when navigation bar is open
|
2022-06-01 11:56:21 +03:00 |
|
|
e7650b126b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-01 10:51:41 +03:00 |
|
|
e24891953e
|
Web: Files: Fixed border color of header of upload panel.
|
2022-06-01 10:51:30 +03:00 |
|
Timofey Boyko
|
7efeeabe1b
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-01 10:41:22 +03:00 |
|
Timofey Boyko
|
5e78699844
|
Web:Files:FormGallery: fix interface jumping when info panel is open
|
2022-06-01 10:40:59 +03:00 |
|
|
141ee254e6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-01 12:21:46 +05:00 |
|
|
90da8a3fa1
|
Fix bug 57415 - Web: Files: fixed clear uploaded files history
|
2022-06-01 12:21:34 +05:00 |
|
|
4c2064714d
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-31 18:38:13 +03:00 |
|
|
8b1facfcae
|
edit translations
|
2022-05-31 18:37:00 +03:00 |
|
|
8b92df64e4
|
crm: fix logs
|
2022-05-31 18:34:04 +03:00 |
|
|
ee7dddac5d
|
crm: fix crm api
|
2022-05-31 17:01:58 +03:00 |
|
|
b81d3ff507
|
Files: fix routing
|
2022-05-31 16:49:54 +03:00 |
|
|
9902b536d9
|
Files: added thirdparty rooms filter
|
2022-05-31 16:49:39 +03:00 |
|
|
9584e8ba74
|
Files: fix
|
2022-05-31 16:47:59 +03:00 |
|
|
eda86591a1
|
Files: fix "MySql connection already in use"
|
2022-05-31 16:47:37 +03:00 |
|
|
2461b16468
|
fix Bug 53137: save lastModified when uploading file
|
2022-05-31 16:20:11 +03:00 |
|
mushka
|
aaff52299b
|
Fix InfoPanelToggleWrapper in FormGallery on desktop
|
2022-05-31 15:48:42 +03:00 |
|
|
fa38dad158
|
Merge pull request #681 from ONLYOFFICE/feature/info-panel-store-relocation
InfoPanelStore relocation
|
2022-05-31 15:29:42 +03:00 |
|
mushka
|
cf01904b94
|
fixed GalleryHeader`s InfoPanelToggle on tablet and mobile
|
2022-05-31 14:14:10 +03:00 |
|
Timofey Boyko
|
12702e0b57
|
Web:Files:TableView: increase z-index for hover row
|
2022-05-31 13:50:04 +03:00 |
|
Timofey Boyko
|
0b252d79a6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-31 13:24:34 +03:00 |
|
Timofey Boyko
|
55515ded68
|
Fix Bug 57407 - Client.OformsGallery. Something went wrong when template info opened
|
2022-05-31 13:24:21 +03:00 |
|
mushka
|
7d327bd9f7
|
removed infoPanelStore from hotkeyStore
|
2022-05-31 13:15:54 +03:00 |
|
|
478d4a429c
|
Web: Client: Files: Fixed displaying rename action on editing third party item
|
2022-05-31 12:27:21 +03:00 |
|
Timofey Boyko
|
ce0fca842b
|
Fix Bug 54569 - Client.Files. Switch tab automatically completes the creation of the file
|
2022-05-31 12:24:13 +03:00 |
|
|
cca2e4aa1f
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-31 09:37:21 +03:00 |
|
|
056fe260cd
|
Web: Files: Removed scroll sticking if you try to move the scroll slider.
|
2022-05-31 09:37:06 +03:00 |
|
|
5795586f0d
|
Merge pull request #682 from ONLYOFFICE/feature/upload-empty-folders
Feature/upload empty folders
|
2022-05-30 19:37:05 +03:00 |
|
|
7d98feae07
|
Web: Files: Commented console logs
|
2022-05-30 19:32:38 +03:00 |
|
|
461e628c59
|
Web: Files: Fix upload on DnD to Catalog
|
2022-05-30 19:13:17 +03:00 |
|
|
02e08d8097
|
Web: Files: Fix issues with parallel uploads (empty folders + files)
|
2022-05-30 18:28:01 +03:00 |
|
|
a4f412ee89
|
Merge branch 'release/v1.2' into feature/upload-empty-folders
|
2022-05-30 17:36:42 +03:00 |
|
|
30b89d1ae0
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-30 17:18:53 +03:00 |
|
|
05eb1a7596
|
edit translations
|
2022-05-30 17:18:12 +03:00 |
|
|
4b35b21b6e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-30 16:29:13 +03:00 |
|
|
69dceb030a
|
Fix Bug 57375: cancel uploads
|
2022-05-30 15:51:52 +03:00 |
|
|
299e776a66
|
Fixed Bug 57376 - Client.Upload. The previous list of downloaded files is displayed on the download panel after it is closed
|
2022-05-30 15:44:50 +03:00 |
|
|
5a26c4f404
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-30 15:33:17 +03:00 |
|
|
73364c1fba
|
Files: refactor
|
2022-05-30 14:32:00 +03:00 |
|
|
2a7853bf5b
|
Files: added creating thirdparty rooms
|
2022-05-30 14:31:30 +03:00 |
|
|
1edb778115
|
Files: added thirdparty rooms
|
2022-05-30 14:30:08 +03:00 |
|
|
68cbced3d0
|
Web: Files: Removed file offset when selecting them. (macOS, Safari)
|
2022-05-30 13:58:10 +03:00 |
|
mushka
|
b20d37c22e
|
relocated InfoPanelStore from Files to Common.Auth
|
2022-05-30 13:46:45 +03:00 |
|
|
5a98f14cc7
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-30 13:30:31 +03:00 |
|
|
2119e35224
|
Web: Files: Removed additional borders on the left and right in the table view (macOS, Safari).
|
2022-05-30 13:28:59 +03:00 |
|
Nikita
|
abaf1374ab
|
Merge branch 'feature/iasync-enumarable' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
|
2022-05-30 11:18:57 +03:00 |
|
|
e704983452
|
Filex: fix controller
|
2022-05-29 22:36:28 +03:00 |
|
|
8bf6cdda9f
|
Files: fix, added thirdparty archiving, deleting
|
2022-05-29 22:36:15 +03:00 |
|
|
d8e48dca88
|
Web: Files: Added showing of empty folder creation progress
|
2022-05-27 22:22:20 +03:00 |
|
|
10091ac5d1
|
Web: Files: Added empty folder tree creation on DropZone upload only
|
2022-05-27 20:50:32 +03:00 |
|
|
9b779be2f4
|
Files: added thirdparty rooms
|
2022-05-27 19:02:47 +03:00 |
|
|
1e10e23b0c
|
fix
|
2022-05-27 18:10:34 +03:00 |
|
|
bb64f104c5
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 17:26:10 +03:00 |
|
|
e1e021f3fa
|
edit translations
|
2022-05-27 17:25:03 +03:00 |
|
|
717dac9e69
|
Web: Files: added lastModifiedDate to start upload session
|
2022-05-27 18:21:59 +05:00 |
|
|
19aacaa69c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 16:19:49 +03:00 |
|
|
da19e06d1f
|
Web: Files: Hotkeys: fixed arrow key events
|
2022-05-27 16:19:43 +03:00 |
|
|
2d72dcf337
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 16:15:16 +03:00 |
|
|
4d02251c6b
|
edit translations
|
2022-05-27 16:14:45 +03:00 |
|
mushka
|
5ad2231fc3
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-05-27 15:24:29 +03:00 |
|
|
881a70a540
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 14:58:43 +03:00 |
|
|
c092ae1d13
|
Fixed Bug 57327: Wrong size of icon on mobile shortcut
|
2022-05-27 14:58:32 +03:00 |
|
|
7acd9e894f
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 14:11:20 +03:00 |
|
|
98903043e6
|
Fix Bug 57353: hide version history for media
|
2022-05-27 14:11:06 +03:00 |
|
|
bb7871abad
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-27 14:09:34 +03:00 |
|
|
a16b2c7927
|
edit translations
|
2022-05-27 14:08:27 +03:00 |
|
|
8a48a64d02
|
Web: Files: Tile: fix context menu crash
|
2022-05-27 13:14:29 +03:00 |
|
|
a7c5e5cb5e
|
Web: Files: fix tile check logic
|
2022-05-27 13:04:38 +03:00 |
|
|
e6e7afd1f7
|
Web: Files: Hotkeys: fixed lagging
|
2022-05-27 12:02:06 +03:00 |
|
|
f7342801a2
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-27 11:54:29 +03:00 |
|
|
515c401914
|
Merge branch 'release/v1.2' into feature/upload-empty-folders
# Conflicts:
# products/ASC.Files/Client/src/store/UploadDataStore.js
# yarn.lock
|
2022-05-27 11:05:36 +03:00 |
|
|
ca7728f3b6
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
|
2022-05-26 22:10:39 +03:00 |
|
|
3f217af868
|
fix 57264
|
2022-05-26 22:00:09 +03:00 |
|
|
470c983e2e
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 21:46:36 +03:00 |
|
|
04e5a83e8e
|
Web: Files: Tile: fix tile check
|
2022-05-26 21:45:51 +03:00 |
|
Timofey Boyko
|
63d4de9ee9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 21:18:36 +03:00 |
|
Timofey Boyko
|
335d344cb4
|
Web:Files:Home: add check for empty column before set dropbbable-hover class
|
2022-05-26 21:18:27 +03:00 |
|
Timofey Boyko
|
2ad3a2fa6e
|
Web:Files:TableView: fix bug with wrong background for empty column with drag and drop
|
2022-05-26 21:17:49 +03:00 |
|
Timofey Boyko
|
8710b8b4b8
|
Web:Files:TableView: move storage names from table header to table container component
|
2022-05-26 20:03:24 +03:00 |
|
|
325a53579a
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 19:22:45 +03:00 |
|
|
032191f542
|
edit translations
|
2022-05-26 19:22:25 +03:00 |
|
|
437808b6bd
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 18:07:41 +03:00 |
|
|
f3505e2b4a
|
Web: fix smart banner meta
|
2022-05-26 17:35:59 +03:00 |
|
|
5f9c5c54e7
|
Files: added db entity fields
|
2022-05-26 17:34:04 +03:00 |
|
|
66ad7f5c9e
|
fix 57358
|
2022-05-26 17:29:57 +03:00 |
|
Timofey Boyko
|
6ce9963ee6
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 17:07:32 +03:00 |
|
Timofey Boyko
|
26a7533ac7
|
Web:Files:DragTooltip: increase z-index
|
2022-05-26 17:07:27 +03:00 |
|
|
7691ab5f90
|
fix 57359
|
2022-05-26 17:03:43 +03:00 |
|
|
dc7d837e46
|
Merge branch 'release/v1.2' into feature/smart-banner
|
2022-05-26 16:57:04 +03:00 |
|
|
e2e8f3fce9
|
Merge branch 'feature/docspace-tags' into feature/docspace-thirdparty
|
2022-05-26 16:39:19 +03:00 |
|
|
3123bbd187
|
Files: added tags filtering
|
2022-05-26 16:37:31 +03:00 |
|
|
aa9b6cbb19
|
fix 57223
|
2022-05-26 16:20:30 +03:00 |
|
|
10e2b77ca9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 15:11:08 +03:00 |
|
mushka
|
9a91b32783
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 15:08:56 +03:00 |
|
mushka
|
31380a6956
|
Fixed for unexisting InfoPanel EmptyScreen
|
2022-05-26 15:08:17 +03:00 |
|
|
1d4d8055bb
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 15:00:35 +03:00 |
|
|
6c349b5240
|
edit translations
|
2022-05-26 14:59:50 +03:00 |
|
|
e9866bf339
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 14:59:28 +03:00 |
|
|
06a565b02d
|
Web:Files:Adding props areaSelect.
|
2022-05-26 14:58:16 +03:00 |
|
|
518fe17d14
|
refactor
|
2022-05-26 14:43:56 +03:00 |
|
mushka
|
8b63d4e489
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 14:37:05 +03:00 |
|
mushka
|
a70b8895c5
|
Bug 52730: Empty screen for InfoPanel in all sections except My documents
|
2022-05-26 14:36:55 +03:00 |
|
|
76db35e748
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 13:40:26 +03:00 |
|
Nikita
|
52e2925c8f
|
fix in @my
|
2022-05-26 13:24:12 +03:00 |
|
|
968e4440ea
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 13:18:06 +03:00 |
|
|
52a779326e
|
edit translations
|
2022-05-26 13:16:53 +03:00 |
|
|
03eaaf4b19
|
Files: added thirdparty rooms connection
|
2022-05-26 13:13:25 +03:00 |
|
|
597e121a95
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 15:08:52 +05:00 |
|
|
ba1b93d777
|
Web: People, Files: fixed banner display delay
|
2022-05-26 15:08:10 +05:00 |
|
Timofey Boyko
|
4f9cc695e3
|
Fix Bug 57339 - Client.Files.Upload.Dragndrop. The file does not load when dragging it to the left menu folder
|
2022-05-26 13:03:01 +03:00 |
|
|
29b3c61355
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-05-26 12:55:16 +03:00 |
|
|
2e021b107c
|
Web: Files: fixed selected hover styles
|
2022-05-26 12:55:09 +03:00 |
|
|
5414a9b3df
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 12:10:16 +03:00 |
|
|
cfeca5f1d0
|
Web: Files: Badges: fix title
|
2022-05-26 12:09:49 +03:00 |
|
|
2b72a57115
|
Web: Files: added hover selection for tile folders
|
2022-05-26 12:05:29 +03:00 |
|
|
e7886aff2c
|
Log: refactoring
|
2022-05-26 12:01:54 +03:00 |
|
|
ceeb190c0a
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into feature/smart-banner
|
2022-05-26 11:31:03 +03:00 |
|
|
7c7c12fe72
|
Web: Files: fixed horizontal scroll when file selected for mobile devices
|
2022-05-26 11:25:58 +03:00 |
|