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 |
|
|
|
a71bbc9886
|
Files: fix finding template when saving file, hat doesn't have template
|
2021-04-01 16:32:10 +03:00 |
|
Artem Tarasov
|
83d3d82a65
|
Web: Files: created FilesItem component, refactoring SimpleFilesRow, deleted FileTile
|
2021-04-01 14:49:01 +03:00 |
|
Artem Tarasov
|
ddcdb41734
|
Web: Files: added FilesContainer, removed FilesTileContainer and FilesRowContainer
|
2021-04-01 13:37:44 +03:00 |
|
Artem Tarasov
|
4bfcf39410
|
Web: Files: fix context menu action
|
2021-04-01 12:22:07 +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 |
|
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 |
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
|
|
06e8a79b06
|
Web: Files: fixed drag to tree
|
2021-03-26 19:11:41 +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 |
|
|
|
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 |
|
Artem Tarasov
|
afd71e8ee5
|
Web: Files: Home: moved func getFilesContextOptions to index
|
2021-03-25 17:29:55 +03:00 |
|
|
|
2125a10011
|
Web: Files: fixed displaying selected node
|
2021-03-25 15:59:53 +03:00 |
|
|
|
1955e4f141
|
Web: Files: fixed drag styles, added drag tooltip
|
2021-03-25 15:29:34 +03:00 |
|
|
|
3e225e2ebb
|
Web: Files: fixed move thirdparty files
|
2021-03-25 11:47:59 +03:00 |
|
|
|
9b1fa3fd86
|
Web: Files: fixed drag
|
2021-03-25 11:29:51 +03:00 |
|
Artem Tarasov
|
a6d31cb1de
|
Web: Files: FilesTile: moved Tiles in FilesTile dir
|
2021-03-24 14:53:08 +03:00 |
|
|
|
f732f5fba6
|
Web: Moved sw-template to @appserver/common and removed api cache (translation issue)
|
2021-03-24 11:45:58 +03:00 |
|
|
|
f8c2f20fe8
|
Merge branch 'develop' into feature/workspaces
|
2021-03-23 14:21:30 +03:00 |
|
|
|
d9e3e96ab8
|
Web: Fix: init Files
|
2021-03-23 10:33:05 +03:00 |
|
