TatianaLopaeva
|
f095e9c71b
|
Web: Files: FloatingButton remains visible on error until the UploadPanel is opened.
|
2021-04-05 14:43:03 +03:00 |
|
Artem Tarasov
|
8e7324330a
|
Web: Files: fix after merge
|
2021-04-05 12:39:51 +03:00 |
|
Artem Tarasov
|
98f30631b2
|
Web: Files: store: refactoring contextOptionsStore
|
2021-04-05 12:39:31 +03:00 |
|
Artem Tarasov
|
43491f42a9
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/FilesRowContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTileContent.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/InitFilesStore.js
|
2021-04-05 10:54:27 +03:00 |
|
TatianaLopaeva
|
ed97700dcb
|
Web:Files: UploadPanel: Fixed styles of row content.
|
2021-04-05 10:26:46 +03:00 |
|
Artem Tarasov
|
2bb0f69e4b
|
Merge branch 'feature/thumbnails' of github.com:ONLYOFFICE/AppServer into feature/thumbnails
|
2021-04-02 23:56:49 +03:00 |
|
Artem Tarasov
|
1156f31d63
|
Web: Files: refactoring FIlesContent
|
2021-04-02 23:56:28 +03:00 |
|
|
|
a11804b60d
|
temp fix. BinaryFormatter deprecated in .net 5
|
2021-04-02 21:48:40 +03:00 |
|
|
|
b89e232e59
|
Web: Files: fixed drag
|
2021-04-02 19:29:06 +03:00 |
|
Vladislav Makhov
|
b45e243fe6
|
web: files: fix stores init
|
2021-04-02 18:12:50 +03:00 |
|
Vladislav Makhov
|
3180831e19
|
web: files: fix stores init
|
2021-04-02 17:03:52 +03:00 |
|
Vladislav Makhov
|
0f6b08b2f3
|
web: files: transfer InitFilesStore to FilesStore
|
2021-04-02 16:33:18 +03:00 |
|
Vladislav Makhov
|
601c9441cb
|
web: files: remove unnecessary code
|
2021-04-02 15:45:49 +03:00 |
|
Vladislav Makhov
|
179fec232e
|
Merge branch 'develop' into bugfix/files-store
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-04-02 15:34:34 +03:00 |
|
Vladislav Makhov
|
3e3c442f7c
|
web: files: destructured variables
|
2021-04-02 15:02:03 +03:00 |
|
Vladislav Makhov
|
ff04684f53
|
web: remove unused code
|
2021-04-02 13:49:42 +03:00 |
|
Vladislav Makhov
|
d63132d9e7
|
web: files: remove console log
|
2021-04-02 13:06:12 +03:00 |
|
Vladislav Makhov
|
c99fc660c9
|
web: files: remove unused code and imports
|
2021-04-02 13:03:28 +03:00 |
|
Artem Tarasov
|
7fa13538f5
|
Web: File: moved okIcon and cancelIcon to EditingWrapperComponent
|
2021-04-02 12:45:40 +03:00 |
|
Vladislav Makhov
|
1bc8ad8600
|
web: files: fix FilesStore accesses
|
2021-04-02 12:41:13 +03:00 |
|
Vladislav Makhov
|
f532c06c55
|
web: files: fix UploadDataStore accesses
|
2021-04-02 12:40:59 +03:00 |
|
|
|
300c064556
|
Web: Files: fixed drag
|
2021-04-02 12:26:31 +03:00 |
|
Vladislav Makhov
|
2bafdbc0d2
|
web: files: fix TreeFoldersStore accesses
|
2021-04-02 11:20:19 +03:00 |
|
Vladislav Makhov
|
df3f8ca9e5
|
web: files: fix MediaViewerDataStore accesses
|
2021-04-02 11:16:01 +03:00 |
|
Vladislav Makhov
|
0eeee5842a
|
web: files: fix FormatsStore accesses
|
2021-04-02 11:13:33 +03:00 |
|
Artem Tarasov
|
ffb4405a1a
|
Web: Files: fix after merge
|
2021-04-02 00:11:15 +03:00 |
|
Artem Tarasov
|
43b9301e90
|
Merge branch 'develop' into feature/thumbnails
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRow/SimpleFilesRow.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesTile/FilesTileContainer.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/FilesActionsStore.js
|
2021-04-01 18:19:09 +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 |
|
Artem Tarasov
|
83d3d82a65
|
Web: Files: created FilesItem component, refactoring SimpleFilesRow, deleted FileTile
|
2021-04-01 14:49:01 +03:00 |
|
TatianaLopaeva
|
26fe94ae5f
|
Web: Files: Added translation for EmbeddingPanel.
|
2021-04-01 13:50:57 +03:00 |
|
Artem Tarasov
|
ddcdb41734
|
Web: Files: added FilesContainer, removed FilesTileContainer and FilesRowContainer
|
2021-04-01 13:37:44 +03:00 |
|
Vladislav Makhov
|
61fcaf8315
|
web: files: fix SettingsStore accesses
|
2021-04-01 13:28:59 +03:00 |
|
TatianaLopaeva
|
968e0009ee
|
Web: Files: SharingPanel/EmbeddingPanel: Fixed icon path.
|
2021-04-01 13:03:28 +03:00 |
|
Vladislav Makhov
|
3915d28737
|
web: files: fix InitFilesStore accesses
|
2021-04-01 12:27:19 +03:00 |
|
Artem Tarasov
|
4bfcf39410
|
Web: Files: fix context menu action
|
2021-04-01 12:22:07 +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
|
386529c6fd
|
Merge branch 'develop' into feature/EditorIntegration
# Conflicts:
# products/ASC.Files/Client/src/store/FilesStore.js
|
2021-04-01 10:17:14 +03:00 |
|
Artem Tarasov
|
c6a462168c
|
Web: Files: Tile: refactoring
|
2021-04-01 10:08:07 +03:00 |
|
|
|
18b4fba15a
|
Merge branch 'develop' into feature/dotnet5
|
2021-03-31 20:38:05 +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 |
|
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 |
|
|
|
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 |
|
TatianaLopaeva
|
b52997a7f8
|
Merge branch 'develop' into feature/EditorIntegration
|
2021-03-30 18:39:09 +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
|
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 |
|
Artem Tarasov
|
e7d9c9b9d5
|
Web: Files: added transfer func t and history to contextOptionsStore
|
2021-03-30 13:21:44 +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 |
|
|
|
9427d98318
|
Web: Files: refactoring
|
2021-03-30 11:08:38 +03:00 |
|
TatianaLopaeva
|
f6e242f341
|
Web: Files: Added name space for translation.
|
2021-03-30 10:34:09 +03:00 |
|
TatianaLopaeva
|
dc0baec941
|
Web: Editor/Files: Fix displaying of shared user list at Shared Panel & Refactoring.
|
2021-03-30 10:21:30 +03:00 |
|
Artem Tarasov
|
ebca5f181e
|
Web: Files: applied contextOptionsStore in tile
|
2021-03-30 01:13:26 +03:00 |
|
Artem Tarasov
|
7fa2a132b5
|
Web: Files: added necessary methods to contextOptionsStore
|
2021-03-30 01:12:35 +03:00 |
|
Artem Tarasov
|
a50af59dd1
|
Web: Files: applied contextOptionsStore in row
|
2021-03-30 01:11:04 +03:00 |
|
Artem Tarasov
|
72e1e7a08f
|
Web: Files: added ContextOptionsStore
|
2021-03-29 22:23:49 +03:00 |
|
TatianaLopaeva
|
005d6759e9
|
Web: Editor/Files: Deleted conditions for Edit & Fixed url to folder where the file is located.
|
2021-03-29 19:31:11 +03:00 |
|
|
|
3a756986a0
|
Files: added enableExternalExt when creating file
|
2021-03-29 17:53:12 +03:00 |
|
|
|
91aa5996b5
|
Web: Files: refactoring
|
2021-03-29 17:45:26 +03:00 |
|
Vladislav Makhov
|
701e5fc2d1
|
web: files: fix isOnlyFoldersSelected
|
2021-03-29 16:25:16 +03:00 |
|
Vladislav Makhov
|
ddba3d91bf
|
web: files: fix isEncryptionSupport value
|
2021-03-29 16:13:21 +03:00 |
|
Vladislav Makhov
|
70b6e8fe51
|
web: files: fix share button for private room
|
2021-03-29 16:05:00 +03:00 |
|
Vladislav Makhov
|
760c3268df
|
web: files: add missing prop
|
2021-03-29 16:03:34 +03:00 |
|
|
|
a8d475cb91
|
Merge branch 'develop' into feature/drag-and-drop
|
2021-03-29 15:26:22 +03:00 |
|
|
|
b574424224
|
Files: added enableExternalExt when creating file
|
2021-03-29 15:06:51 +03:00 |
|
|
|
f381eb2780
|
Web: Files: fixed move operations for third party folders
|
2021-03-29 14:56:39 +03:00 |
|
|
|
d10f47d984
|
Web: Files: fixed scroll
|
2021-03-29 12:06:01 +03:00 |
|
|
|
fa372f118b
|
Web: Files: fixed scroll
|
2021-03-29 11:41:42 +03:00 |
|
TatianaLopaeva
|
704f241674
|
Web: Files: SharingPanel: Fixed icon pathname.
|
2021-03-28 23:00:21 +03:00 |
|
TatianaLopaeva
|
c4bcb8772c
|
Web: Files/Editor: Added additional conditions for access to the sharing panel and updated conditions for the custom filter.
|
2021-03-28 22:59:36 +03:00 |
|
TatianaLopaeva
|
5ccb86abeb
|
Web: Editor/Files: Refactoring & Moved icon to the common folder for icons.
|
2021-03-28 21:38:48 +03:00 |
|
TatianaLopaeva
|
88392ffd56
|
Web: Editor/Files: Refactoring.
|
2021-03-28 19:21:08 +03:00 |
|
TatianaLopaeva
|
9309818e77
|
Web: Files: Fixed internal link for document from the Editor.
|
2021-03-28 19:04:49 +03:00 |
|
TatianaLopaeva
|
89dbfd1f54
|
Web: Editor/Files: Fixed share email from the Editor.
|
2021-03-28 18:47:04 +03:00 |
|
|
|
06e8a79b06
|
Web: Files: fixed drag to tree
|
2021-03-26 19:11:41 +03:00 |
|
TatianaLopaeva
|
7777d05515
|
Web: Editor/Files: Added full list of access rights for SharingPanel to Editor.
|
2021-03-26 17:18:43 +03:00 |
|
|
|
e72558182b
|
Web: Files: removed debugger
|
2021-03-26 17:12:40 +03:00 |
|
|
|
6b16402d82
|
Web: Files: fixed tree drag-and-drop, refactoring
|
2021-03-26 15:26:44 +03:00 |
|
TatianaLopaeva
|
2dba92ba28
|
Web: Editor/Files: Added refresh list of people and their access rights after changed at SharingPanel.
|
2021-03-26 15:19:55 +03:00 |
|
TatianaLopaeva
|
4892b39e0e
|
Web: Editor: Added SharingPanel.
|
2021-03-26 15:14:17 +03:00 |
|
TatianaLopaeva
|
1b9c327e10
|
Web: Files: SharingPanel: Fix icon path.
|
2021-03-26 14:51:25 +03:00 |
|
TatianaLopaeva
|
0e1225cc5a
|
Web: Files: helpers: Fix icon path.
|
2021-03-26 14:50:45 +03:00 |
|
TatianaLopaeva
|
c853accdf7
|
Web: Files: Fix icon path.
|
2021-03-26 14:50:12 +03:00 |
|
TatianaLopaeva
|
e2ebecac4d
|
Web: Files: Fix icon path.
|
2021-03-26 14:49:28 +03:00 |
|
TatianaLopaeva
|
e837ef77b5
|
Web: Files: Moved translation from common file to local folder.
|
2021-03-26 14:48:37 +03:00 |
|
TatianaLopaeva
|
f27c38e2d9
|
Web: Moved icons from files to common folder.
|
2021-03-26 14:45:29 +03:00 |
|
|
|
7c6bf909a6
|
Files: fixed query
|
2021-03-26 12:50:04 +03:00 |
|
|
|
65e1c72c01
|
Sln: fixed packages
|
2021-03-26 12:26:12 +03:00 |
|
|
|
18a2c0a53d
|
Merge branch 'develop' into feature/dotnet5
# Conflicts:
# common/ASC.Core.Common/EF/Model/Audit/LoginEvents.cs
# common/ASC.Core.Common/EF/Model/CRM/CrmContact.cs
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioIndex.cs
# common/ASC.Core.Common/EF/Model/DbipLocation.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedAggregate.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedLast.cs
# common/ASC.Core.Common/EF/Model/Mail/Mailbox.cs
# common/ASC.Core.Common/EF/Model/Mail/ServerServer.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyInfo.cs
# common/ASC.Core.Common/EF/Model/Notify/NotifyQueue.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthors.cs
# common/ASC.Core.Common/EF/Model/Resource/ResCultures.cs
# common/ASC.Core.Common/EF/Model/Resource/ResData.cs
# common/ASC.Core.Common/EF/Model/Resource/ResFiles.cs
# common/ASC.Core.Common/EF/Model/Resource/ResReserve.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTariff.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbTenantVersion.cs
# common/ASC.Core.Common/EF/Model/Tenant/TenantIpRestrictions.cs
# common/ASC.Core.Common/EF/Model/User/UserPhoto.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20201006100008_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20210309093641_CoreDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/MySqlCoreDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20201006101436_TenantDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/TenantDbContextMySql/20210309095116_TenantDbContextMySql.Designer.cs
# products/ASC.Files/Core/Core/EF/DbFilesTag.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
|
2021-03-25 21:50:09 +03:00 |
|
