Ilya Oleshko
|
2b8bf618fb
|
Merge branch 'develop' into feature/contextmenu-refactoring
|
2021-04-02 11:09:57 +03:00 |
|
Vladislav Makhov
|
f70bcc52ca
|
web: files: fix FilesActionStore accesses
|
2021-04-01 17:34:22 +03:00 |
|
TatianaLopaeva
|
f79f75f6db
|
Merge branch 'develop' into feature/EditorIntegration
|
2021-04-01 16:42:33 +03:00 |
|
|
|
a71bbc9886
|
Files: fix finding template when saving file, hat doesn't have template
|
2021-04-01 16:32:10 +03:00 |
|
TatianaLopaeva
|
0ea46425c6
|
Web:Files: Fix SharedPanel when uploadPanel is visible.
|
2021-04-01 15:32:21 +03:00 |
|
|
|
c3f27278b4
|
Merge pull request #209 from ONLYOFFICE/feature/dotnet5
Feature/dotnet5
|
2021-04-01 14:44:26 +03:00 |
|
TatianaLopaeva
|
26fe94ae5f
|
Web: Files: Added translation for EmbeddingPanel.
|
2021-04-01 13:50:57 +03:00 |
|
Vladislav Makhov
|
61fcaf8315
|
web: files: fix SettingsStore accesses
|
2021-04-01 13:28:59 +03:00 |
|
Ilya Oleshko
|
3812af35ea
|
Merge branch 'develop' into feature/contextmenu-refactoring
|
2021-04-01 13:24:05 +03:00 |
|
Ilya Oleshko
|
04b8500a78
|
Web: Components: Apply ContextMenu at Row
|
2021-04-01 13:22:37 +03:00 |
|
TatianaLopaeva
|
968e0009ee
|
Web: Files: SharingPanel/EmbeddingPanel: Fixed icon path.
|
2021-04-01 13:03:28 +03:00 |
|
Vladislav Makhov
|
cb10e850cd
|
web: common: switch to makeAutoObservable, add action setIsEncryptionSupport
|
2021-04-01 12:42:23 +03:00 |
|
Vladislav Makhov
|
3915d28737
|
web: files: fix InitFilesStore accesses
|
2021-04-01 12:27:19 +03:00 |
|
Vladislav Makhov
|
07c457882a
|
web: files: fix FilesStore accesses
|
2021-04-01 11:58:22 +03:00 |
|
TatianaLopaeva
|
833bd357a0
|
Web: Files: Deleted useless condition for Editor.
|
2021-04-01 11:55:20 +03:00 |
|
TatianaLopaeva
|
fc1d8001b6
|
Web: Files: Deleted useless props.
|
2021-04-01 11:52:24 +03:00 |
|
TatianaLopaeva
|
8f8a0d2f44
|
Web: Editor: Deleted useless props.
|
2021-04-01 11:50:30 +03:00 |
|
TatianaLopaeva
|
386529c6fd
|
Merge branch 'develop' into feature/EditorIntegration
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-04-01 10:17:14 +03:00 |
|
|
|
18b4fba15a
|
Merge branch 'develop' into feature/dotnet5
|
2021-03-31 20:38:05 +03:00 |
|
|
|
e9c62be0ce
|
Merge pull request #208 from ONLYOFFICE/bugfix/privacy-room
Bugfix/privacy room
|
2021-03-31 19:08:31 +03:00 |
|
|
|
8f2baed113
|
Jenkinsfile: fix
|
2021-03-31 18:24:32 +03:00 |
|
|
|
be316548fb
|
Merge branch 'develop' into bugfix/privacy-room
|
2021-03-31 18:23:27 +03:00 |
|
|
|
166aaa8239
|
Merge branch 'develop' into bugfix/privacy-room
|
2021-03-31 18:01:58 +03:00 |
|
Vladislav Makhov
|
b0b8849ae5
|
web: files: fix isDesktop refer
|
2021-03-31 17:59:03 +03:00 |
|
TatianaLopaeva
|
33b165fd40
|
Web: Files/Editor: Added SharingDialog.
|
2021-03-31 16:49:14 +03:00 |
|
Ilya Oleshko
|
4a66eda956
|
Merge branch 'develop' into feature/contextmenu-refactoring
|
2021-03-31 15:21:16 +03:00 |
|
Artem Tarasov
|
d83a9a255c
|
Merge pull request #206 from ONLYOFFICE/feature/drag-and-drop
Feature/drag and drop
|
2021-03-31 15:10:09 +03:00 |
|
Vladislav Makhov
|
2c253bd471
|
web: files: rename isItemsSelected to selectionCount
|
2021-03-31 13:56:56 +03:00 |
|
Vladislav Makhov
|
56f49526ad
|
web: files: fix link
|
2021-03-31 13:54:29 +03:00 |
|
Ilya Oleshko
|
81c18fcd49
|
Merge branch 'develop' into feature/contextmenu-refactoring
|
2021-03-31 13:52:08 +03:00 |
|
Vladislav Makhov
|
a6f1ed972c
|
web: fix progress-indicator style for desktop
|
2021-03-31 12:46:09 +03:00 |
|
Ilya Oleshko
|
d75e0e7e1d
|
Web: Components: Fixed usage webkit-touch-callout at TextInput component only for desktop
|
2021-03-31 12:39:31 +03:00 |
|
|
|
c0e780a287
|
Web: Files: fixed showDragItems
|
2021-03-31 11:03:56 +03:00 |
|
Vladislav Makhov
|
1728da802d
|
web: fix isAccessedSelected
|
2021-03-31 10:49:46 +03:00 |
|
Ilya Oleshko
|
b979b3324f
|
Web: Components: Added stopping webkit-touch-callout at GroupButtonsMenu component
|
2021-03-31 10:44:04 +03:00 |
|
Ilya Oleshko
|
d12a3460db
|
Web: Components: Added stopping webkit-touch-callout at TextInput component
|
2021-03-31 10:43:41 +03:00 |
|
Ilya Oleshko
|
ff79708e59
|
Web: Client: Layout: Fixed component render on old webkit devices, disable webkit-touch-callout at article
|
2021-03-31 10:42:59 +03:00 |
|
TatianaLopaeva
|
b52997a7f8
|
Merge branch 'develop' into feature/EditorIntegration
|
2021-03-30 18:39:09 +03:00 |
|
TatianaLopaeva
|
2a2b6cd1ac
|
Web: Editor: Refactoring.
|
2021-03-30 18:21:36 +03:00 |
|
Vladislav Makhov
|
75386c10ea
|
web: files: add missing whitespaces in description
|
2021-03-30 16:05:04 +03:00 |
|
Vladislav Makhov
|
627e84aeaa
|
web: files: fix isAccessedSelected
|
2021-03-30 15:53:47 +03:00 |
|
TatianaLopaeva
|
af379ac72f
|
Web: Editor: Deleted useless console.log.
|
2021-03-30 15:48:08 +03:00 |
|
TatianaLopaeva
|
dea731dfa7
|
Web: Files/Editor: Deleted useless code.
|
2021-03-30 15:44:45 +03:00 |
|
TatianaLopaeva
|
3960ca1490
|
Web: Files: SharingPanel: Added loader when list of users does not load yet.
|
2021-03-30 15:24:44 +03:00 |
|
Vladislav Makhov
|
1a66373c16
|
web: fix defaultPage
|
2021-03-30 15:01:25 +03:00 |
|
TatianaLopaeva
|
1531a37951
|
Web: Editor: Fixed displaying of toast.
|
2021-03-30 14:03:43 +03:00 |
|
Vladislav Makhov
|
be3c97bce2
|
web: fix opening Files as default page, if desktop client uses
|
2021-03-30 13:05:52 +03:00 |
|
|
|
6c46dd759f
|
Web: Files: fixed context options props
|
2021-03-30 12:14:25 +03:00 |
|
Vladislav Makhov
|
b4ea70ddaa
|
web: files: regDesktop fix
|
2021-03-30 11:34:48 +03:00 |
|
|
|
06f34408ff
|
Merge branch 'develop' into feature/drag-and-drop
|
2021-03-30 11:10:15 +03:00 |
|
