TatianaLopaeva
|
a01b1e6430
|
Web: Files: Added data-format
|
2020-10-12 18:25:39 +03:00 |
|
Ilya Oleshko
|
989a854d32
|
Web: Files : Home : Fixed ShareButton after merge
|
2020-10-12 17:40:26 +03:00 |
|
TatianaLopaeva
|
7fef9285ce
|
Web: Files: Added data-format
|
2020-10-12 17:20:36 +03:00 |
|
TatianaLopaeva
|
1010886262
|
Web: Refactoring
|
2020-10-12 16:56:34 +03:00 |
|
|
|
36034bf97a
|
fix warnings
|
2020-10-12 16:52:31 +03:00 |
|
Ilya Oleshko
|
cdaef9e76f
|
Web: Files : Home : Fixed MediaViewer collection with selectors
|
2020-10-12 16:40:11 +03:00 |
|
TatianaLopaeva
|
6557261ac8
|
Web: Files: Changed margin by layout
|
2020-10-12 16:20:06 +03:00 |
|
TatianaLopaeva
|
4b81c0adfd
|
Web: Files: Added images by layout
|
2020-10-12 16:15:35 +03:00 |
|
Vladislav Makhov
|
cdddef441a
|
merge fix
|
2020-10-12 15:50:46 +03:00 |
|
Artem Tarasov
|
a6257d7006
|
Web: Files: Settings: fixed blinking of Settings page when jump from Folders page
|
2020-10-12 15:40:11 +03:00 |
|
|
|
577fc5ac70
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
|
2020-10-12 15:36:26 +03:00 |
|
Artem Tarasov
|
ba8564ffe5
|
Web: Files: Settings: applied SettingsFiles loader
|
2020-10-12 15:34:46 +03:00 |
|
|
|
824961ddec
|
Web: Files: added upload files-converter, fixed upload filer for tree folders, refactoring
|
2020-10-12 15:28:36 +03:00 |
|
Vladislav Makhov
|
a179ae0e6c
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-12 14:45:53 +03:00 |
|
Vladislav Makhov
|
7aaeddedb2
|
Add pushing to recently viewed
|
2020-10-12 14:37:52 +03:00 |
|
|
|
17e0de56da
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-10-12 11:31:24 +03:00 |
|
|
|
344acefa9b
|
Files: fix filter
|
2020-10-12 11:26:15 +03:00 |
|
Vladislav Makhov
|
9ea5a648e9
|
Fix code after merge
|
2020-10-12 11:02:22 +03:00 |
|
Vladislav Makhov
|
2476b306f9
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
# web/ASC.Web.Components/package.json
|
2020-10-12 10:04:24 +03:00 |
|
SuhorukovAnton
|
917493f397
|
fix-messages: IDE0058
|
2020-10-10 14:35:05 +03:00 |
|
|
|
15f4b38a03
|
Web: Files: Remove hack
|
2020-10-09 21:39:34 +03:00 |
|
|
|
ee6307e288
|
Web: People: Added hack for build machine only
|
2020-10-09 19:14:48 +03:00 |
|
|
|
9f6f7b4bff
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-09 18:11:11 +03:00 |
|
|
|
e25c59fb09
|
Web: Files: Changed initialization of DocsAPI
|
2020-10-09 18:11:02 +03:00 |
|
|
|
615f514bfd
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# web/ASC.Web.Common/src/store/auth/selectors.js
|
2020-10-09 17:24:50 +03:00 |
|
SuhorukovAnton
|
72fbf6b81e
|
remove-FileOperationsManagerHelper: first version
|
2020-10-09 17:13:44 +03:00 |
|
Ilya Oleshko
|
a129bda5ee
|
Web: Files : Home : Added share button at row
|
2020-10-09 17:08:29 +03:00 |
|
Vladislav Makhov
|
f4abe419db
|
Fix bug with add/remove from Share folder
|
2020-10-09 17:03:08 +03:00 |
|
|
|
a71fd1208b
|
Web: Files: fixed Home render, added new select logic
|
2020-10-09 16:43:50 +03:00 |
|
|
|
290f7649f1
|
Web: Files: fixed updating of the tree after operations with folders
|
2020-10-09 15:55:30 +03:00 |
|
|
|
e01ee037f2
|
Merge branch 'master' into feature/fix-messages
# Conflicts:
# common/ASC.Core.Common/Billing/TariffService.cs
# common/ASC.Core.Common/EF/Context/BaseDbContext.cs
# common/ASC.Core.Common/EF/Context/CoreDbContext.cs
# common/ASC.Core.Common/EF/Context/DbContext.cs
# common/ASC.Core.Common/EF/Context/DbContextManager.cs
# common/ASC.Core.Common/EF/Context/FeedDbContext.cs
# common/ASC.Core.Common/EF/Context/FilesDbContext.cs
# common/ASC.Core.Common/EF/Context/MessagesContext.cs
# common/ASC.Core.Common/EF/Context/ResourceDbContext.cs
# common/ASC.Core.Common/EF/Context/TelegramDbContext.cs
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# common/ASC.Core.Common/EF/Model/AccountLinks.cs
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/EF/Model/Core/DbCoreSettings.cs
# common/ASC.Core.Common/EF/Model/Core/DbSubscriptionMethod.cs
# common/ASC.Core.Common/EF/Model/Core/Subscription.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioSettings.cs
# common/ASC.Core.Common/EF/Model/DbWebstudioUservisit.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedReaded.cs
# common/ASC.Core.Common/EF/Model/Feed/FeedUsers.cs
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# common/ASC.Core.Common/EF/Model/MobileAppInstall.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsFile.cs
# common/ASC.Core.Common/EF/Model/Resource/ResAuthorsLang.cs
# common/ASC.Core.Common/EF/Model/TelegramUser.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbButton.cs
# common/ASC.Core.Common/EF/Model/Tenant/DbQuotaRow.cs
# common/ASC.Core.Common/EF/Model/User/UserGroup.cs
# common/ASC.Core.Common/HostedSolution.cs
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Data.Reassigns/QueueWorker.cs
# common/ASC.Data.Reassigns/ReassignProgressItem.cs
# common/ASC.Data.Reassigns/RemoveProgressItem.cs
# common/ASC.VoipService/Dao/CachedVoipDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/DaoFactory.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/EF/DbEncryptedData.cs
# products/ASC.Files/Core/Core/EF/DbFile.cs
# products/ASC.Files/Core/Core/EF/DbFilesBunchObjects.cs
# products/ASC.Files/Core/Core/EF/DbFilesSecurity.cs
# products/ASC.Files/Core/Core/EF/DbFilesTagLink.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyApp.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyIdMapping.cs
# products/ASC.Files/Core/Core/EF/DbFolderTree.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFile.cs
# products/ASC.Files/Core/Core/Search/FactoryIndexerFolder.cs
# products/ASC.Files/Core/Core/Thirdparty/CachedProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderTagDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Server/Startup.cs
# web/ASC.Web.Studio/Startup.cs
|
2020-10-09 15:40:44 +03:00 |
|
|
|
1dfd7afe1c
|
Update yarn.lock files
|
2020-10-09 15:07:41 +03:00 |
|
|
|
4cbaad0dfc
|
Web: Files: fixed tree drag
|
2020-10-09 14:36:38 +03:00 |
|
|
|
226d4c6cc5
|
Web: Files: Add and applied Filter loader
|
2020-10-09 14:23:40 +03:00 |
|
|
|
215e33d053
|
Web: Files: Replaced hard-coded link for DocsAPI
|
2020-10-09 13:39:22 +03:00 |
|
SuhorukovAnton
|
370400e4c0
|
fix_API_return: first version
|
2020-10-09 13:05:48 +03:00 |
|
|
|
68d32c7335
|
Web: Files: removed useless loopFilesOperations prop
|
2020-10-09 12:32:06 +03:00 |
|
|
|
dbfc5a6a96
|
Web: Files: fixed Home render
|
2020-10-09 11:57:40 +03:00 |
|
Ilya Oleshko
|
a1e696f6ae
|
Web: Files : Selectors : Added property to selector
|
2020-10-09 11:46:53 +03:00 |
|
Ilya Oleshko
|
76c09fb7ee
|
Web: Files : Actions : Fixed selectors
|
2020-10-09 11:46:22 +03:00 |
|
Ilya Oleshko
|
333b3f1e79
|
Web: Files : Panels : Fixed selectors
|
2020-10-09 11:46:03 +03:00 |
|
Ilya Oleshko
|
8440737f70
|
Web: Files : Home : Fixed selector for create url
|
2020-10-09 11:45:29 +03:00 |
|
Ilya Oleshko
|
8f4b6dd021
|
Web: Files : Home : Fixed selectors for tile content
|
2020-10-09 11:44:28 +03:00 |
|
Ilya Oleshko
|
404b775303
|
Web: Files : Home : Fixed selectors for tile badges
|
2020-10-09 11:44:06 +03:00 |
|
|
|
3385d0b2f5
|
Web: Files: fixed files operations
|
2020-10-08 23:58:21 +03:00 |
|
|
|
3ca0990715
|
Merge branch 'master' into feature/files
# Conflicts:
# common/ASC.Core.Common/EF/Model/FilesConverts.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
|
2020-10-08 19:01:09 +03:00 |
|
|
|
b95816a388
|
Merge branch 'feature/selectors-refactoring' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/selectors-refactoring
|
2020-10-08 17:54:14 +03:00 |
|
|
|
718dc8cc5a
|
Web: Files: fixed dragging
|
2020-10-08 17:54:04 +03:00 |
|
Ilya Oleshko
|
fa0c649fe2
|
Web: Files : Home : Added icon for temp item on create
|
2020-10-08 17:13:49 +03:00 |
|
Ilya Oleshko
|
033a67863e
|
Web: Files : Selectors : Fixed isMediaOrImage usage for context menu
|
2020-10-08 16:56:01 +03:00 |
|
Vladislav Makhov
|
b4d3dc0114
|
Fix code after merge
|
2020-10-08 16:23:57 +03:00 |
|
Ilya Oleshko
|
1d79a2709f
|
Web: Files : Home : Added selectors for formats and media viewer
|
2020-10-08 16:03:37 +03:00 |
|
Ilya Oleshko
|
a0a680aa7e
|
Web: Files : Home : Added selectors for formats
|
2020-10-08 16:02:52 +03:00 |
|
Ilya Oleshko
|
79b6f43df0
|
Web: Files : Selectors : Added file format selectors, fixed fileList params
|
2020-10-08 16:02:03 +03:00 |
|
Ilya Oleshko
|
16cbf4436a
|
Web: Files : Reducer : Added default formats
|
2020-10-08 16:01:08 +03:00 |
|
|
|
b4675941f6
|
Web: Files: fixed selectors
|
2020-10-08 13:54:34 +03:00 |
|
|
|
bc1438ba92
|
EF: rename
|
2020-10-08 12:07:05 +03:00 |
|
|
|
573dc8922b
|
Merge branch 'master' into feature/schema
# Conflicts:
# common/ASC.Common/DIHelper.cs
|
2020-10-08 11:42:57 +03:00 |
|
|
|
e8061d10bd
|
DI: refactoring
|
2020-10-08 11:36:47 +03:00 |
|
Vladislav Makhov
|
aef6e4035f
|
Fix code after merge
|
2020-10-08 11:16:08 +03:00 |
|
|
|
6cf7358b92
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-08 10:25:37 +03:00 |
|
Vladislav Makhov
|
a72c087e2a
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-08 10:18:06 +03:00 |
|
Vladislav Makhov
|
716a9f387e
|
Fix code after merge
|
2020-10-08 10:14:38 +03:00 |
|
Artem Tarasov
|
5806daa594
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 18:23:34 +03:00 |
|
|
|
954fe70035
|
Web: Files: fixed isCanCreate and isCanBeDeleted selectors
|
2020-10-07 18:09:08 +03:00 |
|
Ilya Oleshko
|
be48e703b9
|
Web: Files : Home : Fixed context menu separator key
|
2020-10-07 17:31:59 +03:00 |
|
|
|
41eaf5d885
|
Files: api. AddToRecent
|
2020-10-07 17:31:17 +03:00 |
|
|
|
cbcf6bef85
|
Web: Files: removed auth selectors from files
|
2020-10-07 17:23:02 +03:00 |
|
Artem Tarasov
|
17daf4e847
|
Web: Files: settings: fix warning
|
2020-10-07 17:15:40 +03:00 |
|
Vladislav Makhov
|
b24bc1f05a
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/FilesRowContent.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/components/pages/Home/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-07 17:11:40 +03:00 |
|
|
|
fdd0b945b0
|
Web: Files: fixed SectionHeaderContent selectors
|
2020-10-07 17:05:50 +03:00 |
|
|
|
9d87b8de09
|
Merge pull request #94 from ONLYOFFICE/feature/empty-screen
Feature/empty screen
|
2020-10-07 16:52:54 +03:00 |
|
|
|
b375463d02
|
Web: Files: added getRootFolderId, fixed sharing panel
|
2020-10-07 16:42:37 +03:00 |
|
|
|
3bf8bd5103
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 16:41:24 +03:00 |
|
|
|
ca37d2134d
|
Web: Files: Applied API changes on server in files filtering
|
2020-10-07 16:41:05 +03:00 |
|
TatianaLopaeva
|
da23f36f09
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 16:02:18 +03:00 |
|
TatianaLopaeva
|
34506827b5
|
Update yarn.lock
|
2020-10-07 15:53:29 +03:00 |
|
TatianaLopaeva
|
449bc0e0b2
|
Web: Files: Deleted unnecessary fontSize
|
2020-10-07 15:32:03 +03:00 |
|
TatianaLopaeva
|
17b8a00a62
|
Web: Files: Deleted unnecessary box
|
2020-10-07 15:21:46 +03:00 |
|
|
|
fc71716044
|
Web: Files: fixed SectionFilter import
|
2020-10-07 15:21:26 +03:00 |
|
TatianaLopaeva
|
de7e4fe062
|
Merge branch 'feature/files' into feature/empty-screen
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
|
2020-10-07 15:14:54 +03:00 |
|
Artem Tarasov
|
84bb49c0e3
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-07 15:14:26 +03:00 |
|
Ilya Oleshko
|
94d2ae1d07
|
Web: Files : Selectors : Added missing property
|
2020-10-07 14:46:59 +03:00 |
|
TatianaLopaeva
|
9ac0d6f73a
|
Web: Files: Changed margin
|
2020-10-07 14:42:09 +03:00 |
|
Vladislav Makhov
|
e7fc2fef13
|
Add Recent to the tree node.
|
2020-10-07 14:26:08 +03:00 |
|
Artem Tarasov
|
36158ded1d
|
Web: Files: fixed inability to navigate from TreeSettings to TreeFolders
|
2020-10-07 14:12:45 +03:00 |
|
|
|
c879c55009
|
Web: Files: fixed SharingPanel selectors
|
2020-10-07 14:05:14 +03:00 |
|
|
|
3fd94c1db9
|
Web: Files: fixed OperationsPanel selectors
|
2020-10-07 14:04:48 +03:00 |
|
|
|
ddc953bcf5
|
Web: Files: fixed NewFilesPanel selectors
|
2020-10-07 14:04:31 +03:00 |
|
|
|
9a87a89d0c
|
Web: Files: fixed VersionHistory selectors
|
2020-10-07 14:04:13 +03:00 |
|
|
|
f737bb1deb
|
Web: Files: fixed SectionHeaderContent selectors
|
2020-10-07 14:03:56 +03:00 |
|
|
|
254c158bef
|
Web: Files: fixed VersionRow selectors
|
2020-10-07 14:03:40 +03:00 |
|
|
|
ea11614b86
|
Web: Files: fixed Settings selectors
|
2020-10-07 14:03:22 +03:00 |
|
|
|
0d2eec0647
|
Web: Files: fixed SectionBodyContent selectors
|
2020-10-07 14:03:03 +03:00 |
|
|
|
06bc431f3e
|
Web: Files: fixed Home selectors
|
2020-10-07 14:02:42 +03:00 |
|
|
|
c789743835
|
Web: Files: fixed SectionPagingContent selectors
|
2020-10-07 14:02:19 +03:00 |
|
|
|
da1249cf4a
|
Web: Files: fixed SectionHeaderContent selectors
|
2020-10-07 14:00:46 +03:00 |
|
|
|
190460a797
|
Web: Files: fixed SectionFilterContent selectors
|
2020-10-07 14:00:28 +03:00 |
|
|
|
74dda40b90
|
Web: Files: fixed SectionBodyContent selectors
|
2020-10-07 14:00:05 +03:00 |
|
|
|
b265a01603
|
Web: Files: fixed FilesTileContent selectors
|
2020-10-07 13:59:36 +03:00 |
|
|
|
446c4575d3
|
Web: Files: fixed FilesRowContent selectors
|
2020-10-07 13:59:15 +03:00 |
|
|
|
2667c4928c
|
Web: Files: fixed DocEditor selectors
|
2020-10-07 13:58:54 +03:00 |
|
|
|
d5ed8c78e1
|
Web: Files: fixed EmptyTrashDialog selectors
|
2020-10-07 13:58:37 +03:00 |
|
|
|
8ee8bc2369
|
Web: Files: fixed DownloadDialog selectors
|
2020-10-07 13:58:16 +03:00 |
|
|
|
10fcad6c0e
|
Web: Files: fixed DeleteDialog selectors
|
2020-10-07 13:57:47 +03:00 |
|
|
|
44b525a042
|
Web: Files: fixed MainButton selectors
|
2020-10-07 13:57:19 +03:00 |
|
|
|
8a132dbd62
|
Web: Files: fixed TreeSettings selectors
|
2020-10-07 13:56:47 +03:00 |
|
|
|
478a7909fc
|
Web: Files: fixed TreeFolders selectors
|
2020-10-07 13:55:56 +03:00 |
|
|
|
ba3c40634d
|
Web: Files: added new selectors
|
2020-10-07 13:55:05 +03:00 |
|
|
|
e76e50dc79
|
Web: ServiceWorkers: Turned off debug mode
|
2020-10-07 13:43:51 +03:00 |
|
|
|
7d958b7f9b
|
Web: Files: Restored Suspense
|
2020-10-07 13:39:07 +03:00 |
|
Artem Tarasov
|
a49b2581d9
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/store/files/reducers.js
|
2020-10-07 13:24:20 +03:00 |
|
|
|
11348e5fba
|
Update yarn.lock files
|
2020-10-07 12:58:38 +03:00 |
|
|
|
2e74a1bde3
|
Web: Replaced some code tot selectors
|
2020-10-07 12:47:55 +03:00 |
|
Ilya Oleshko
|
19f5206e3f
|
Web: Files : Home : Fixed existing items check on add temp item on create
|
2020-10-07 11:45:20 +03:00 |
|
Ilya Oleshko
|
066a396dbd
|
Web: Files : Home : Fixed double add temp item on create
|
2020-10-07 11:33:10 +03:00 |
|
TatianaLopaeva
|
ee6f71d6ae
|
Web: Files: Refactoring
|
2020-10-07 11:03:19 +03:00 |
|
TatianaLopaeva
|
da9611bd4b
|
Merge branch 'feature/files' into feature/empty-screen
|
2020-10-07 10:58:27 +03:00 |
|
TatianaLopaeva
|
650b5d076a
|
Web: Files: Refactoring
|
2020-10-07 10:57:05 +03:00 |
|
|
|
ac7eda1b93
|
Web: Files: fixed filter
|
2020-10-06 22:56:22 +03:00 |
|
Ilya Oleshko
|
2632a0d3da
|
Web: Files : Home : Fixed loopTree after create or update items at row
|
2020-10-06 21:48:55 +03:00 |
|
|
|
201126834f
|
Web: Files: fixed url filter, fixed selectedFolder error
|
2020-10-06 19:33:41 +03:00 |
|
Artem Tarasov
|
ef602b578f
|
Web: Files: fixed selected tree node on click in row
|
2020-10-06 17:07:58 +03:00 |
|
TatianaLopaeva
|
88d6a3ad07
|
Web: Files: Re-wrote styles for SectionBody and deleted unnecessary for EmptyFolderContainer widthProp
|
2020-10-06 16:04:33 +03:00 |
|
TatianaLopaeva
|
b76bf8f3a0
|
Web: Files: Re-wrote styles EmptyFoldersContainer
|
2020-10-06 15:39:28 +03:00 |
|
|
|
a664bc9795
|
Web: Files: fixed Home selectors, added new selectors
|
2020-10-06 15:35:46 +03:00 |
|
|
|
fa4f3d5d7b
|
Web: Files: renamed setNewTreeFilesBadge action to setUpdateTree
|
2020-10-06 15:35:12 +03:00 |
|
|
|
5ae3b98548
|
Web: Files: fixed article body selectors, added redux to TreeFolders.js
|
2020-10-06 15:32:57 +03:00 |
|
Vladislav Makhov
|
e265dbf7c5
|
fix index by agreement
|
2020-10-06 15:03:29 +03:00 |
|
Ilya Oleshko
|
2732f892da
|
Web: Files : Home : Added events for rename and create, fixed loop folder data
|
2020-10-06 14:57:16 +03:00 |
|
Ilya Oleshko
|
a522433ed7
|
Web: Files : Home : Added selectors for fileRow
|
2020-10-06 14:56:31 +03:00 |
|
Diana
|
5c2b6debac
|
fix migrations
|
2020-10-06 14:39:44 +03:00 |
|
Vladislav Makhov
|
1992be53b8
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/yarn.lock
|
2020-10-06 11:40:12 +03:00 |
|
|
|
8d7cf4f2dc
|
Web: Replaced getCurrentModule with getCurrentProduct selector
|
2020-10-05 20:56:36 +03:00 |
|
|
|
c336279bf1
|
Web: Files: Fixed IsAdmin issues
|
2020-10-05 20:38:45 +03:00 |
|
|
|
bf20339e47
|
Web: Files: fixed upload folder
|
2020-10-05 17:17:08 +03:00 |
|
Vladislav Makhov
|
6d3bb5fd0e
|
Refactoring
|
2020-10-05 16:08:24 +03:00 |
|
Vladislav Makhov
|
5d1a84737c
|
Fix selected tree node initialization during first render
|
2020-10-05 16:06:26 +03:00 |
|
|
|
63ee865d98
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/utils/index.js
|
2020-10-05 15:37:09 +03:00 |
|
|
|
978b67f7a7
|
Update yarn.lock files
|
2020-10-05 14:46:07 +03:00 |
|
Vladislav Makhov
|
d6e5f1171d
|
Add reselect lib
|
2020-10-05 14:17:01 +03:00 |
|
|
|
53365f4c27
|
Merge branch 'feature/loading-acceleration' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/loading-acceleration
|
2020-10-05 14:01:39 +03:00 |
|
|
|
9269465e59
|
Web: Files: moved upload to actions
|
2020-10-05 14:01:32 +03:00 |
|
|
|
d00d16ee02
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/src/components/pages/Wizard/index.js
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/src/api/settings/index.js
# web/ASC.Web.Common/src/pages/login/index.js
# web/ASC.Web.Common/src/store/auth/reducer.js
# web/ASC.Web.Common/src/utils/index.js
# web/ASC.Web.Common/yarn.lock
|
2020-10-05 13:32:26 +03:00 |
|
|
|
9c6812a9c3
|
EF: refactoring
|
2020-10-05 13:02:28 +03:00 |
|
|
|
9b5f32be30
|
Merge branch 'feature/schema' of github.com:ONLYOFFICE/AppServer into feature/schema
|
2020-10-05 12:27:33 +03:00 |
|
|
|
07263e58e8
|
EF: removed partial
Files: removed DbEncryptedData.cs
|
2020-10-05 12:27:15 +03:00 |
|
Vladislav Makhov
|
cfdfcf44ca
|
Remove unnecessary code
|
2020-10-05 11:04:15 +03:00 |
|
Vladislav Makhov
|
5afa1aa96a
|
Add possibility to remove via icon
|
2020-10-05 10:56:27 +03:00 |
|
|
|
3947b45177
|
Merge branch 'feature/loading-acceleration' of github.com:ONLYOFFICE/AppServer into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-02 18:36:11 +03:00 |
|
Ilya Oleshko
|
80066c1877
|
Web: Files : Home : Fixed mapStateToProps with new selectors
|
2020-10-02 17:36:47 +03:00 |
|
Ilya Oleshko
|
adfb3ccc4f
|
Web: Files : Home : Fixed simple selectors
|
2020-10-02 17:35:57 +03:00 |
|
Ilya Oleshko
|
70fb72e628
|
Web: Files : Home : Added simple selectors, fixed mapStateToProps
|
2020-10-02 16:21:36 +03:00 |
|
Vladislav Makhov
|
119409958d
|
Add checking event is in Favorite dir or not
|
2020-10-02 15:23:35 +03:00 |
|
Vladislav Makhov
|
51eee12e90
|
Remove unnecessary code
|
2020-10-02 14:37:38 +03:00 |
|
Vladislav Makhov
|
b60c186417
|
Remove unnecessary code
|
2020-10-02 14:37:12 +03:00 |
|
Vladislav Makhov
|
0da00c3760
|
Refactoring
|
2020-10-02 14:36:45 +03:00 |
|
Vladislav Makhov
|
0d2f199572
|
Remove mock
|
2020-10-02 14:36:10 +03:00 |
|
Vladislav Makhov
|
14677d0b6b
|
Refactoring
|
2020-10-02 13:25:20 +03:00 |
|
Vladislav Makhov
|
93e9113a76
|
Add several thunks
|
2020-10-02 10:46:44 +03:00 |
|
Vladislav Makhov
|
dae2cf4f80
|
Add func's to add/remove item from fav's
|
2020-10-02 10:38:39 +03:00 |
|
Vladislav Makhov
|
298f342a5e
|
Add temporary "star" mock
|
2020-10-02 10:36:34 +03:00 |
|
Vladislav Makhov
|
157369bfb9
|
Add several reducers
|
2020-10-02 10:35:17 +03:00 |
|
Vladislav Makhov
|
520443f09d
|
Add several selectors
|
2020-10-02 10:34:57 +03:00 |
|
|
|
7bbba5f158
|
Web: People: Re-written Home/Body with selectors and reselect + refactoring
|
2020-10-01 22:01:52 +03:00 |
|
Diana
|
04ee542f22
|
fix migrations, models, added migration and model schema TelegramDbContext
|
2020-10-01 20:08:55 +03:00 |
|
|
|
c008acee57
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/src/components/Article/MainButton/index.js
# products/ASC.People/Client/src/components/pages/Profile/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
|
2020-10-01 17:32:12 +03:00 |
|
|
|
b5d6f589c8
|
fix Migration
|
2020-10-01 13:17:00 +03:00 |
|
|
|
6bad98e277
|
Merge branch 'master' into feature/schema
# Conflicts:
# config/appsettings.json
# products/ASC.Files/Server/ASC.Files.csproj
# web/ASC.Web.Studio/ASC.Web.Studio.csproj
|
2020-10-01 12:25:07 +03:00 |
|
|
|
0bd5099c00
|
Removed Migrations()
|
2020-10-01 11:39:21 +03:00 |
|
SuhorukovAnton
|
59e3c629b1
|
fix-messages: IDE0058
|
2020-10-01 10:58:57 +03:00 |
|
SuhorukovAnton
|
cb2e656e21
|
fix-messages: IDE0066
|
2020-10-01 10:57:35 +03:00 |
|
|
|
1b15795d7a
|
Web: Files: fixed fetchFiles action, refactoring
|
2020-10-01 10:41:00 +03:00 |
|
TatianaLopaeva
|
b33328218a
|
Update yarn.lock files
|
2020-10-01 09:37:25 +03:00 |
|
|
|
ccd1aef9f8
|
Web: Re-written NavMenu with selectors and reselect
|
2020-10-01 01:25:08 +03:00 |
|
|
|
2f1d43df7b
|
Merge branch 'feature/files' into feature/loading-acceleration
|
2020-09-30 21:11:08 +03:00 |
|
SuhorukovAnton
|
edbc0f247c
|
fix-messages: IDE0022
|
2020-09-30 17:47:42 +03:00 |
|
Artem Tarasov
|
14f0d0f2be
|
update yarn.lock
|
2020-09-30 15:00:27 +03:00 |
|
SuhorukovAnton
|
ba1ed22345
|
fix-messages: IDE0058
|
2020-09-30 14:50:39 +03:00 |
|
Ilya Oleshko
|
a9163c06be
|
Web: Files : Fixed open files after create
|
2020-09-30 11:57:22 +03:00 |
|
Vladislav Makhov
|
7e14f4418b
|
Add actions to work with Favorites
|
2020-09-30 11:27:50 +03:00 |
|
Vladislav Makhov
|
8f240a4914
|
Add reducers to work with Favorites
|
2020-09-30 11:27:32 +03:00 |
|
Artem Tarasov
|
c68b6d6b7f
|
update yarn.lock
|
2020-09-30 10:53:51 +03:00 |
|
Diana
|
9e32aaca03
|
migration process
|
2020-09-29 20:17:06 +03:00 |
|
Diana
|
7888c8d501
|
added schema for mysql and npgsql
|
2020-09-29 20:12:07 +03:00 |
|
|
|
4ac2767afb
|
Web: Files: removed useless actions, fixed clearProgressData
|
2020-09-29 18:24:49 +03:00 |
|
|
|
f96e5cee1a
|
Web: Files: Replaced RequestLoader to showLoader/hideLoader function calls
|
2020-09-29 17:40:42 +03:00 |
|
Vladislav Makhov
|
7bd39e2152
|
Extend several actions & selectors
|
2020-09-29 16:52:05 +03:00 |
|
Vladislav Makhov
|
993a5a58ad
|
Add Favorites to the tree node
|
2020-09-29 16:50:08 +03:00 |
|
SuhorukovAnton
|
31cc18f568
|
fix-messages: IDE1006
|
2020-09-29 15:27:28 +03:00 |
|
SuhorukovAnton
|
9b6ccc19f0
|
fix-messages: IDE0074
|
2020-09-29 14:51:34 +03:00 |
|
|
|
80853762b1
|
Web: Files: Fixed mapDispatchToProps
|
2020-09-29 14:47:29 +03:00 |
|
|
|
86207e27fc
|
Web: Applied prettier styled and removed debugger
|
2020-09-29 14:46:28 +03:00 |
|
|
|
981e7646ca
|
Web: Files: Fixed opening DocEditor
|
2020-09-29 14:21:37 +03:00 |
|
Vladislav Makhov
|
5309d8ecf6
|
Add Favorites empty screen picture
|
2020-09-29 13:34:59 +03:00 |
|
SuhorukovAnton
|
1da0de1200
|
fix-messages: IDE0065
|
2020-09-29 13:28:03 +03:00 |
|
SuhorukovAnton
|
135a845eaf
|
fix-messages: IDE0063
|
2020-09-29 12:16:07 +03:00 |
|
SuhorukovAnton
|
b7cc10c13a
|
fix-messages: IDE0054
|
2020-09-29 12:03:37 +03:00 |
|
SuhorukovAnton
|
2d34d70a4e
|
fix-messages: IDE0051 and IDE0052
|
2020-09-29 11:57:37 +03:00 |
|
|
|
ad4b28d1f2
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/public/index.html
# products/ASC.Files/Client/src/App.js
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/Home/Section/Header/index.js
# products/ASC.People/Client/src/components/pages/Profile/Section/Body/ProfileInfo/ProfileInfo.js
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/index.js
|
2020-09-29 11:48:36 +03:00 |
|
Vladislav Makhov
|
4d45163704
|
Add Favorites options to dropdown menu
|
2020-09-29 11:41:02 +03:00 |
|
TatianaLopaeva
|
ea2f5ec097
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-29 09:06:16 +03:00 |
|
SuhorukovAnton
|
d866eccade
|
fix-messages: IDE0044
|
2020-09-28 18:42:03 +03:00 |
|
SuhorukovAnton
|
29ec562a78
|
fix-messages: IDE0038
|
2020-09-28 18:21:29 +03:00 |
|
Ilya Oleshko
|
ac9262f4c9
|
Web: Files : Fixed editor url, always last
|
2020-09-28 17:46:27 +03:00 |
|
SuhorukovAnton
|
e3e12c7fb0
|
fix-messages: IDE0030
|
2020-09-28 17:31:07 +03:00 |
|
Ilya Oleshko
|
9933b768d0
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 17:23:32 +03:00 |
|
Ilya Oleshko
|
e4764828f3
|
Web: Files: Editor : Fixed frame height for tablet
|
2020-09-28 17:23:11 +03:00 |
|
SuhorukovAnton
|
ba07caf1c8
|
fix-messages: IDE0017
|
2020-09-28 17:22:46 +03:00 |
|
SuhorukovAnton
|
3b0a86a536
|
fix-messages: IDE0016
|
2020-09-28 16:48:27 +03:00 |
|
TatianaLopaeva
|
fbc9e7a354
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-28 16:22:49 +03:00 |
|
Artem Tarasov
|
bb905602de
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 16:19:47 +03:00 |
|
|
|
b05bbc236a
|
Files: fix openedit
|
2020-09-28 16:04:57 +03:00 |
|
TatianaLopaeva
|
eaa24436db
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-28 16:04:54 +03:00 |
|
Ilya Oleshko
|
61655a5790
|
Web: Files: App : Fixed initial requests, removed fetchMyFolder
|
2020-09-28 14:48:25 +03:00 |
|
Artem Tarasov
|
01eae38cec
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 13:48:44 +03:00 |
|
|
|
c593620865
|
Files: fix count
|
2020-09-28 13:41:48 +03:00 |
|
Artem Tarasov
|
6e832d47c2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-28 13:10:23 +03:00 |
|
Artem Tarasov
|
1328eec01b
|
Web: Files: refactoring translate SettingsTree
|
2020-09-28 12:55:59 +03:00 |
|
Ilya Oleshko
|
ecd18e2a13
|
Web: Files: Editor : Fixed frame height for tablet
|
2020-09-28 12:47:12 +03:00 |
|
|
|
2c1d473314
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-09-28 12:29:33 +03:00 |
|
Alexey Kostenko
|
99026e36be
|
Web: Files: Updated toast notifications
|
2020-09-28 11:34:52 +03:00 |
|
|
|
a6180afa35
|
Web: Normalize routing + refactoring
|
2020-09-25 19:14:50 +03:00 |
|
|
|
89df700fb1
|
Files: fix
|
2020-09-25 13:47:21 +03:00 |
|
TatianaLopaeva
|
eac4556983
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-25 10:44:31 +03:00 |
|
|
|
72cf8e4f2b
|
Web: Moved RowsLoader to ASC.Web.Common
|
2020-09-25 10:36:13 +03:00 |
|
|
|
5cef360ade
|
Web: Files: added hideAside prop to PageLayout
|
2020-09-24 15:07:08 +03:00 |
|
|
|
521ed5f24e
|
Web: Files: Replaced HeadlineLoader to ASC.Web.Common variant
|
2020-09-24 14:27:48 +03:00 |
|
|
|
b04f22b6e5
|
Web: Moved TreeFolderLoader to ASC.Web.Common
|
2020-09-24 13:58:18 +03:00 |
|
|
|
f2b0cdf1af
|
Web: Moved HeadlineLoader to ASC.Web.Common
|
2020-09-24 13:37:54 +03:00 |
|
TatianaLopaeva
|
c82b0237d3
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-24 13:06:46 +03:00 |
|
|
|
4c214e2ff2
|
Merge branch 'feature/files' into feature/loading-acceleration
|
2020-09-24 12:56:52 +03:00 |
|
|
|
2c18950df8
|
Web: Files: fixed display of icons for ipad
|
2020-09-24 12:09:01 +03:00 |
|
|
|
885eb4a691
|
Web: Clients: Added #temp-content markup on load and opportunity to hide it + router refactoring
|
2020-09-23 18:42:47 +03:00 |
|
|
|
01abc6d4f1
|
Web: Files: Added default loader before react is ready
|
2020-09-23 17:20:51 +03:00 |
|
|
|
0028707da6
|
Web: Files: Formatted file
|
2020-09-23 17:18:01 +03:00 |
|
TatianaLopaeva
|
1849e3712d
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-23 15:25:23 +03:00 |
|
Artem Tarasov
|
b4fe26e4fe
|
Web: Files: fixed style of TreeFolders and TreeSettings
|
2020-09-23 14:11:35 +03:00 |
|
|
|
a2be460357
|
Merge branch 'feature/files' into feature/loading-acceleration
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-09-22 19:11:45 +03:00 |
|
Artem Tarasov
|
a46bdc9b2b
|
Web: Files: fixed size of sorting block on tablet
|
2020-09-22 17:57:36 +03:00 |
|
|
|
075798b90c
|
moved from release/11 4414f77b
|
2020-09-22 17:17:17 +03:00 |
|
Artem Tarasov
|
16fbaa1ba6
|
Web: Files: fixed styles(color in row, margin in header)
|
2020-09-22 15:16:46 +03:00 |
|
|
|
5778b9bb62
|
Web: Files: Added RowsLoader for files list loading
|
2020-09-22 15:09:06 +03:00 |
|
Alexey Kostenko
|
6689b82d32
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-22 09:31:59 +03:00 |
|
|
|
29fcbcd8ac
|
Web: Files: Added TreeFolderLoader for Article Body
|
2020-09-21 20:25:08 +03:00 |
|
|
|
86c98c319c
|
Web: Files: Removed useless propType
|
2020-09-21 20:24:39 +03:00 |
|
|
|
9a4a940caf
|
Web: Files: Removed useless rect
|
2020-09-21 20:24:14 +03:00 |
|
|
|
58b7048cbc
|
Web: Files: Removed useless rect
|
2020-09-21 20:23:29 +03:00 |
|
|
|
826f802530
|
Web: Files: Applied pretty to selectors.js
|
2020-09-21 20:22:54 +03:00 |
|
|
|
a5805b7fe1
|
Web: Files: Added HeadlineLoader for Section Header
|
2020-09-21 20:04:25 +03:00 |
|
|
|
a4ef8c42a2
|
Web: Files: Re-written Files to load content dynamically (applied new Main and NavMenu and ContentLoader)
|
2020-09-21 19:33:38 +03:00 |
|
Artem Tarasov
|
f7afa7ee55
|
Web: Files: fixed rendering error while loading settingsTree
|
2020-09-21 15:36:17 +03:00 |
|
Artem Tarasov
|
9df49dc613
|
Web: Files: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle()
|
2020-09-21 14:54:06 +03:00 |
|
TatianaLopaeva
|
ca420104fc
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
|
2020-09-21 14:54:05 +03:00 |
|
Alexey Kostenko
|
4e1415774d
|
Web: Client: Opening the file immediately after creation
|
2020-09-21 11:06:53 +03:00 |
|
|
|
0000129b3b
|
Merge branch 'master' into feature/release-11.0.0
# Conflicts:
# common/ASC.Core.Common/Context/WorkContext.cs
# common/ASC.Core.Common/Tenants/TenantControlPanelSettings.cs
# common/ASC.Core.Common/Tenants/TenantQuota.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/Encryption/Crypt.cs
# common/ASC.Data.Storage/Encryption/CryptoStreamWrapper.cs
# common/ASC.Data.Storage/Encryption/EncryptionFactory.cs
# common/ASC.Data.Storage/Encryption/EncryptionServiceClient.cs
# common/ASC.Data.Storage/Encryption/EncryptionSettings.cs
# common/ASC.Data.Storage/Encryption/ICrypt.cs
# common/ASC.Data.Storage/Encryption/IEncryptionService.cs
# common/ASC.Data.Storage/Encryption/IMetadata.cs
# common/ASC.Data.Storage/Encryption/IntegrityProtectionException.cs
# common/ASC.Data.Storage/Encryption/Metadata.cs
# common/ASC.Data.Storage/Encryption/StreamWrapper.cs
# config/storage.json
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Core/PublicResources/webstudio_patterns.xml
|
2020-09-20 20:17:12 +03:00 |
|
Artem Tarasov
|
16ff0e6386
|
Web: Files: fixed onExpand SettingsTree
|
2020-09-19 21:55:03 +03:00 |
|
|
|
7b4441676e
|
Update yarn.lock files
|
2020-09-19 18:35:17 +03:00 |
|
|
|
0f00799480
|
Web: Client: Fixed redirect to defaultPage
|
2020-09-19 18:24:48 +03:00 |
|
|
|
4a09b4b5f2
|
Web: fixed body scroll
|
2020-09-18 17:06:35 +03:00 |
|
Artem Tarasov
|
f3b8e4880c
|
Web: Files: refactoring - changing document.title with changeTitleDocument()
|
2020-09-18 11:18:48 +03:00 |
|
|
|
9623029d82
|
Web: Files: Speeded up loading first page + refactoring
|
2020-09-17 12:07:36 +03:00 |
|
TatianaLopaeva
|
a858a3a846
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-09-17 11:25:51 +03:00 |
|
|
|
a4cb368513
|
Update yarn.lock files
|
2020-09-16 18:39:06 +03:00 |
|
|
|
3b691247b2
|
Update yarn.lock files
|
2020-09-15 23:29:13 +03:00 |
|
|
|
986e53608d
|
Update yarn.lock files
|
2020-09-15 22:55:11 +03:00 |
|
|
|
d750335924
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# web/ASC.Web.Components/package.json
|
2020-09-15 22:43:37 +03:00 |
|
|
|
2bad04c058
|
Update yarn.lock files
|
2020-09-15 22:42:42 +03:00 |
|
TatianaLopaeva
|
3eeb24a5b5
|
Merge branch 'feature/files' into feature/payments-enterprise
# Conflicts:
# web/ASC.Web.Common/src/components/StudioLayout/StudioLayout.js
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-09-15 17:52:45 +03:00 |
|
TatianaLopaeva
|
a3adea3c27
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-09-15 17:39:34 +03:00 |
|
Vladislav Makhov
|
a0024722d0
|
Web: Files: Change width values for rows
|
2020-09-15 16:22:41 +03:00 |
|
|
|
4e34836e4e
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-15 15:47:47 +03:00 |
|
|
|
6231d0654f
|
Web: Files: fixed isCanCreate selector to Header
|
2020-09-15 15:47:39 +03:00 |
|
Artem Tarasov
|
861ab54818
|
Web:Files; refactoring styled SettingsTree
|
2020-09-15 14:51:28 +03:00 |
|
Artem Tarasov
|
fc8325f65f
|
Web:Files: refactoring SettingsTree
|
2020-09-14 13:53:37 +03:00 |
|
Alexey
|
69b8d0ec7d
|
Web: Files/People/Components: Content rendered without columns on mobile devices
|
2020-09-14 08:51:54 +03:00 |
|
|
|
65fbf2247e
|
Update yarn.lock files
|
2020-09-11 22:51:28 +03:00 |
|
|
|
09c8febfd3
|
Web: Files: Removed setup wrong title
|
2020-09-11 22:40:52 +03:00 |
|
|
|
de290abd57
|
Web: Files: Replaced invalid characters
|
2020-09-11 22:40:09 +03:00 |
|
|
|
51709f3c6d
|
Web: Files: Changed default cursor in TreeSettings on loading
|
2020-09-11 22:39:22 +03:00 |
|
|
|
a44b4bc60a
|
Web: Files: Fixed setIsLoading is undefined on triangle icon click
|
2020-09-11 22:38:50 +03:00 |
|
|
|
8045eecf1b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/Article/Body/index.js
|
2020-09-11 22:30:09 +03:00 |
|
|
|
c989eaf8a5
|
Web: Files: Changed default cursor in FolderTree on loading
|
2020-09-11 22:04:00 +03:00 |
|
|
|
2ccb4eebac
|
Web: Files: Replaced title (People style)
|
2020-09-11 21:46:51 +03:00 |
|
|
|
4d97d6a7ac
|
Web: Clients: Moved setup title to Article/Body
|
2020-09-11 21:45:46 +03:00 |
|
|
|
49ba2c96db
|
Web: Files: Commented useless code
|
2020-09-11 20:43:40 +03:00 |
|
|
|
219ab9cac2
|
Web: Files: fixed Dnd display logic
|
2020-09-11 12:49:59 +03:00 |
|
|
|
a085b53cb8
|
Web: Files: refactoring isLoading
|
2020-09-11 12:22:18 +03:00 |
|
Artem Tarasov
|
76ad46fed1
|
refactoring, moved onLoading and isLoading to redux
|
2020-09-11 11:25:47 +03:00 |
|
|
|
c2d1df3fc3
|
Files: fix create first document
|
2020-09-10 21:34:23 +03:00 |
|
|
|
188b20ff86
|
Merge branch 'master' into feature/files
|
2020-09-10 17:10:19 +03:00 |
|
|
|
3a85553504
|
Files: GetFolderUrl fix
|
2020-09-10 17:09:27 +03:00 |
|
|
|
ea16508688
|
Merge branch 'master' into feature/files
|
2020-09-10 16:32:12 +03:00 |
|
|
|
2413e22323
|
Files: GetFolderUrl fix
|
2020-09-10 16:31:32 +03:00 |
|
Artem Tarasov
|
6a219488e9
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-10 16:01:30 +03:00 |
|
Artem Tarasov
|
3c4562a03a
|
removed passing onLoading and isLoading in ArticleBodyContent through properties
|
2020-09-10 16:00:02 +03:00 |
|
|
|
3e059081fe
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-10 15:22:54 +03:00 |
|
|
|
36a0bf12f4
|
Web: Files: fixed error handler create file/folder
|
2020-09-10 15:22:44 +03:00 |
|
|
|
f724848195
|
Merge branch 'master' into feature/files
|
2020-09-10 13:45:15 +03:00 |
|
|
|
0a6c2fda18
|
Files: fix FileConverterQueueScope
|
2020-09-10 13:44:38 +03:00 |
|
|
|
7433eea815
|
Web: Clients: SW: Added code for updating SW lifecycle to update the app after user triggered refresh
|
2020-09-10 13:19:06 +03:00 |
|
|
|
23b2a310a0
|
Merge branch 'master' into feature/files
|
2020-09-10 12:35:55 +03:00 |
|
|
|
fb0dec0a16
|
Files: fix
|
2020-09-10 12:30:33 +03:00 |
|
|
|
323823981a
|
Update yarn.lock files
|
2020-09-09 22:25:31 +03:00 |
|
|
|
b3b6fd0938
|
Web: Components: Re-written ModalDialog component with SLOT pattern
|
2020-09-09 21:49:25 +03:00 |
|
|
|
cc9e0e1374
|
Merge branch 'master' into feature/scope
# Conflicts:
# web/ASC.Web.Core/Notify/NotifyConfiguration.cs
|
2020-09-09 18:18:34 +03:00 |
|
SuhorukovAnton
|
5f62bfb00d
|
scope: bugfix
|
2020-09-09 17:02:51 +03:00 |
|
Alexey
|
5843368d4f
|
Web: Files: Increased the width of the "row update text" field
|
2020-09-09 15:41:28 +03:00 |
|
|
|
e0febd8890
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-09-09 13:49:25 +03:00 |
|
|
|
a70b890581
|
Notify: rename
|
2020-09-09 13:43:39 +03:00 |
|
|
|
b674bc2f2f
|
Merge branch 'master' into feature/files
|
2020-09-08 17:36:47 +03:00 |
|
|
|
c87fd2cfdb
|
Files: share fix
|
2020-09-08 17:36:22 +03:00 |
|
|
|
c468c5e6cc
|
Merge branch 'master' into feature/files
|
2020-09-08 17:03:19 +03:00 |
|
|
|
ad51a6bf29
|
Files: fix
|
2020-09-08 17:00:29 +03:00 |
|
|
|
98429ce4ab
|
Merge branch 'master' into feature/files
|
2020-09-08 16:34:21 +03:00 |
|
|
|
92a72d7983
|
Files: Tag. Fix
|
2020-09-08 16:33:39 +03:00 |
|
|
|
765558b7b1
|
Merge branch 'master' into feature/files
|
2020-09-08 16:23:12 +03:00 |
|
|
|
f8b3382a42
|
Files: tagDao. Fix
|
2020-09-08 16:22:45 +03:00 |
|
|
|
893f7be135
|
Merge branch 'master' into feature/files
|
2020-09-08 16:11:09 +03:00 |
|
|
|
187e5de648
|
TagDao: fix
|
2020-09-08 16:10:18 +03:00 |
|
|
|
d30026b82f
|
Merge branch 'master' into feature/files
|
2020-09-08 15:20:05 +03:00 |
|
|
|
f464e031b8
|
Notify: fix
|
2020-09-08 11:42:13 +03:00 |
|
|
|
00f913794d
|
Web: Files: fixed arrow button
|
2020-09-08 11:16:03 +03:00 |
|
|
|
9778b258d7
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-07 18:41:51 +03:00 |
|
|
|
efbebc05b5
|
Update yarn.lock files
|
2020-09-07 18:41:42 +03:00 |
|
|
|
886c7d6464
|
Merge branch 'master' into feature/files
|
2020-09-07 18:16:33 +03:00 |
|
|
|
d9783ecf26
|
Web: Common: fixed sort-combobox styles, added isMobile prop
|
2020-09-07 17:31:36 +03:00 |
|
|
|
96df0ab8ca
|
Api: added payment settings
|
2020-09-07 16:53:39 +03:00 |
|
SuhorukovAnton
|
80198032a4
|
scope: refactoring
|
2020-09-07 15:01:15 +03:00 |
|
|
|
c7cb291668
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-09-07 13:55:24 +03:00 |
|
|
|
a2f050590b
|
Update yarn.lock files
|
2020-09-04 21:04:05 +03:00 |
|
|
|
49f5166517
|
Web: Files: Added route to Error520
|
2020-09-04 20:35:49 +03:00 |
|
|
|
0432158a0f
|
Web: Files: fixed files page crash
|
2020-09-04 19:10:24 +03:00 |
|
|
|
020ccfd7d4
|
Scope: fix
|
2020-09-04 14:33:44 +03:00 |
|
|
|
f48574a809
|
Merge branch 'master' into feature/scope
|
2020-09-04 11:26:03 +03:00 |
|
Artem Tarasov
|
72476521cd
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-02 18:03:27 +03:00 |
|
Artem Tarasov
|
17d5e7fb95
|
refactoring styles
|
2020-09-02 17:58:21 +03:00 |
|
|
|
0eb3b2b4d3
|
Update yarn.lock files
|
2020-09-02 12:30:53 +03:00 |
|
|
|
da50146545
|
Web: Clients: Added useEffect for changeLanguage call if functional components (issue: Warning: Cannot update a component https://fb.me/setstate-in-render)
|
2020-09-02 12:19:21 +03:00 |
|
|
|
6bf251bb8e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 18:34:23 +03:00 |
|
|
|
0152274029
|
Web: Clients: Fixed workbox.expiration.Plugin is not a constructor
|
2020-09-01 18:34:06 +03:00 |
|
Artem Tarasov
|
dfb32288e8
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 18:32:48 +03:00 |
|
Artem Tarasov
|
3778ca9aea
|
refactoring
|
2020-09-01 18:32:15 +03:00 |
|
|
|
00c6ce5e9b
|
Web: Clients: Added api-cache in service-worker for base info for 30 Minutes
|
2020-09-01 18:11:20 +03:00 |
|
|
|
bd6c0d0338
|
Web: Clients: Fixed windows is not defined
|
2020-09-01 18:09:39 +03:00 |
|
|
|
bc8613c4f6
|
Web: Clients: Uncommented self.skipWaiting() on install service-worker
|
2020-09-01 17:53:24 +03:00 |
|
Ilya Oleshko
|
4e663b9514
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 15:25:43 +03:00 |
|
Ilya Oleshko
|
4e7ab40221
|
Web: Files: Home : Added render checking and code formatting
|
2020-09-01 15:25:32 +03:00 |
|
Artem Tarasov
|
c876730130
|
added APIs methods
|
2020-09-01 11:44:43 +03:00 |
|
Artem Tarasov
|
ba42cdcb71
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-01 10:16:53 +03:00 |
|
Artem Tarasov
|
461cb53b4e
|
added getFilesSettings
|
2020-09-01 01:05:28 +03:00 |
|
|
|
29d9f21d05
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# web/ASC.Web.Core/Files/DocumentService.cs
|
2020-08-31 17:45:57 +03:00 |
|
|
|
5f7265931c
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-31 17:45:52 +03:00 |
|
|
|
062a3a793f
|
Update yarn.lock files
|
2020-08-31 17:45:37 +03:00 |
|
|
|
9ee046bb1e
|
Web: Files: fixed empty-screen-container to new article
|
2020-08-31 16:32:44 +03:00 |
|
|
|
f5348c3ccd
|
Files: settings. Added settings, forcesave, thirdparty
|
2020-08-31 15:41:28 +03:00 |
|
|
|
d9f70df70a
|
Update yarn.lock files
|
2020-08-31 12:42:36 +03:00 |
|
|
|
1c5402db37
|
Web: Files: Added Webpack-bundle-analyzer
|
2020-08-31 12:07:58 +03:00 |
|
SuhorukovAnton
|
90f1c4fa3d
|
Merge branch 'master' into feature/scope
|
2020-08-31 11:29:44 +03:00 |
|
SuhorukovAnton
|
132a6b05ae
|
scope: add deconstructs
|
2020-08-31 11:18:07 +03:00 |
|
|
|
1fb90663ee
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-31 10:04:45 +03:00 |
|
|
|
1f32e91d54
|
Web: Files: added widthProp to row
|
2020-08-31 10:03:48 +03:00 |
|
|
|
3da549264e
|
Merge branch 'master' into feature/data-storage-migration
|
2020-08-28 18:46:20 +03:00 |
|
Artem Tarasov
|
0e32424313
|
refactoring
|
2020-08-28 17:42:01 +03:00 |
|
Artem Tarasov
|
4b9631597b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-28 12:15:53 +03:00 |
|
Ilya Oleshko
|
ab16aa979d
|
Web: Files: Home : Fixed auto scroll to body on mobile or tablet devices
|
2020-08-28 12:14:35 +03:00 |
|
Artem Tarasov
|
b859f35e5e
|
implemented access to admin settings by checking the value of the isAdmin property in state.auth.user.isAdmin. Added api methods
|
2020-08-28 12:13:53 +03:00 |
|
Diana
|
7466aed406
|
choice between mysql and postgresql
|
2020-08-28 00:45:07 +03:00 |
|
|
|
17c4cf02fc
|
Merge branch 'master' into feature/files
|
2020-08-27 18:06:05 +03:00 |
|
|
|
be5abb8cd3
|
Files: added settings methods
|
2020-08-27 18:05:21 +03:00 |
|
Artem Tarasov
|
551d171ac1
|
added error403 to Settings, when thirdParty is disabled
|
2020-08-27 18:00:20 +03:00 |
|
maksim
|
8282f3f658
|
fix
|
2020-08-27 17:01:37 +03:00 |
|
Artem Tarasov
|
69a54a0717
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-27 10:39:54 +03:00 |
|
Artem Tarasov
|
84d4446b23
|
added api methods for settings, refactoring
|
2020-08-27 10:38:46 +03:00 |
|
|
|
e1dbf344c7
|
Web: Files: fixed logout to files module
|
2020-08-26 16:26:38 +03:00 |
|
|
|
7fa6111cc3
|
Web: Files: fixed DragAndDrop
|
2020-08-26 15:21:22 +03:00 |
|
Artem Tarasov
|
95d5414718
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-26 13:55:49 +03:00 |
|
Artem Tarasov
|
872d0dae0d
|
Fixed MainButton accessibility when going to Settings
|
2020-08-26 13:55:04 +03:00 |
|
|
|
3fce8d1027
|
Web: Files: fixed row click on mobile
|
2020-08-26 13:36:30 +03:00 |
|
|
|
82af63f80d
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-26 11:35:19 +03:00 |
|
|
|
78e62b36fc
|
Web: Files: removed custom dropzone function, refactoring
|
2020-08-26 11:35:12 +03:00 |
|
Artem Tarasov
|
392896de1f
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-25 15:24:14 +03:00 |
|
Artem Tarasov
|
c584f75c4e
|
fixed node selection when switching between TreeSettings and TreeFolders
|
2020-08-25 15:23:43 +03:00 |
|
|
|
8e88dd8239
|
Web: Files: fixed onLoading prop
|
2020-08-25 11:01:45 +03:00 |
|
SuhorukovAnton
|
055e787d63
|
scope: fix
|
2020-08-24 21:41:06 +03:00 |
|
Artem Tarasov
|
5a494b3c2c
|
refactoring. moved the onLoading function to redux
|
2020-08-24 17:25:41 +03:00 |
|
SuhorukovAnton
|
c96620554d
|
Merge branch 'master' into feature/scope
|
2020-08-24 17:09:42 +03:00 |
|
Artem Tarasov
|
35c1b08547
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-24 12:50:52 +03:00 |
|
Artem Tarasov
|
c385fd3b34
|
fixed selected node SettingsTree
|
2020-08-24 12:50:27 +03:00 |
|
|
|
ccf177bf7b
|
Web: Files: fixed tree badge styles
|
2020-08-24 11:21:28 +03:00 |
|
Artem Tarasov
|
4cbfa4c6ae
|
fixed routing SettingsTree
|
2020-08-24 10:33:16 +03:00 |
|
Artem Tarasov
|
503acfeea1
|
fixed translate SettingsTree
|
2020-08-21 13:38:55 +03:00 |
|
Diana
|
bb5c2a23e7
|
postgree
|
2020-08-21 05:34:37 +03:00 |
|
Artem Tarasov
|
d01dfb0aae
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-20 18:43:20 +03:00 |
|
|
|
fd5a9a74f0
|
Merge branch 'master' into feature/files
|
2020-08-20 17:51:14 +03:00 |
|
|
|
4501d3229a
|
Nuget: replaced thirdparty
|
2020-08-20 17:50:08 +03:00 |
|
|
|
603a8bbbc5
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-20 17:40:52 +03:00 |
|
|
|
2fc42a79e5
|
Web: Files: fixed sharing panels styles
|
2020-08-20 17:39:23 +03:00 |
|
Artem Tarasov
|
141e4ffaec
|
fix style
|
2020-08-20 16:09:46 +03:00 |
|
|
|
15ba6828c5
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2020-08-20 12:43:12 +03:00 |
|
|
|
6ce83a9d3f
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-20 12:17:46 +03:00 |
|
|
|
d5942241e8
|
Web: Clients: Parallelized initial API queries
|
2020-08-20 12:17:36 +03:00 |
|
Artem Tarasov
|
4eace9bae1
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-20 11:27:47 +03:00 |
|
Artem Tarasov
|
f2c39cd592
|
added common settings, translation
|
2020-08-20 11:27:00 +03:00 |
|
|
|
96ec887ffa
|
Web: Files: fixed sharing panel styles
|
2020-08-20 11:19:54 +03:00 |
|
|
|
05bc905831
|
Web: Clients: Fixed regex to transltaion.json files for serviceWorker
|
2020-08-19 21:18:23 +03:00 |
|
|
|
27f52a2dc2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-19 20:00:57 +03:00 |
|
|
|
8d11e1b0c8
|
Web: Clients: Changed interaction with serviceWorker
|
2020-08-19 20:00:41 +03:00 |
|
Artem Tarasov
|
cdbeea4741
|
added translation, admin settings
|
2020-08-19 18:16:31 +03:00 |
|
Artem Tarasov
|
6130af291e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-19 16:14:59 +03:00 |
|
Artem Tarasov
|
4754a84483
|
fixed routing
|
2020-08-19 16:14:21 +03:00 |
|
|
|
56af481750
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-19 10:38:50 +03:00 |
|
|
|
8fb4214a1f
|
Web: Files: added aside panel to context-menu-button, added new translation
|
2020-08-19 10:38:43 +03:00 |
|
Artem Tarasov
|
7d4b18405e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-18 17:27:20 +03:00 |
|
Artem Tarasov
|
1e6a2c37dc
|
added Routing, refactoring
|
2020-08-18 17:23:30 +03:00 |
|
|
|
2b37363939
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-18 17:04:01 +03:00 |
|
|
|
a7aef2667d
|
Web: Files: added translations
|
2020-08-18 17:00:12 +03:00 |
|
Artem Tarasov
|
b4d837320e
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-18 15:55:50 +03:00 |
|
|
|
7a813247af
|
Web: Clients: fixed url to loading translation.json for products
|
2020-08-18 11:18:44 +03:00 |
|
|
|
c16c9b280a
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-08-17 14:19:19 +03:00 |
|
|
|
673860f987
|
Web Files Client: simplified configuration of i18n (+ removed useless requests)
|
2020-08-17 14:17:44 +03:00 |
|
SuhorukovAnton
|
faec4269db
|
Merge branch 'master' into feature/scope
|
2020-08-16 12:23:20 +03:00 |
|
Artem Tarasov
|
e35f7a8ebf
|
fixed styles (svg icons in tree nodes, margin-top)
|
2020-08-14 18:28:01 +03:00 |
|
|
|
7f9dc150ed
|
Files: revert
|
2020-08-14 18:00:40 +03:00 |
|
|
|
f00a964c32
|
Merge branch 'master' into feature/private
# Conflicts:
# common/ASC.Api.Core/Auth/ConfirmAuthHandler.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2020-08-14 17:19:36 +03:00 |
|
Artem Tarasov
|
d969cac7e9
|
created TreeSettings, added translate
|
2020-08-14 17:19:12 +03:00 |
|
|
|
b15ad23ab9
|
Web: Files: fixed styles
|
2020-08-14 17:07:30 +03:00 |
|
maksim
|
c7a3fa85f2
|
Thirdparty: remove reference
|
2020-08-14 16:16:48 +03:00 |
|
maksim
|
c24bdfbbba
|
Merge branch 'master' into feature/thirdparty
|
2020-08-14 16:01:55 +03:00 |
|
maksim
|
4a29a69761
|
feature custom nuget server
|
2020-08-14 13:48:34 +03:00 |
|
|
|
7bd1e7abe1
|
Web: Files: added version api
|
2020-08-14 13:02:23 +03:00 |
|
|
|
6d92275269
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-08-14 11:42:13 +03:00 |
|
|
|
58fffc1756
|
File: fix revision
|
2020-08-14 11:35:34 +03:00 |
|
|
|
9299193f6c
|
Web: Files: fixed embedding link, fixed share link
|
2020-08-13 15:56:24 +03:00 |
|
|
|
0626d82fa8
|
Web: Files: added unblock/check-in api
|
2020-08-13 14:42:29 +03:00 |
|
|
|
2616e8a8dd
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-13 12:02:07 +03:00 |
|
|
|
37df28d1a9
|
Web: Files: fixed badge error
|
2020-08-13 12:02:00 +03:00 |
|
|
|
62c5bd5244
|
Merge branch 'master' into feature/files
|
2020-08-13 11:53:47 +03:00 |
|
|
|
cbf9630d7f
|
File: added Locked, LockedBy
|
2020-08-13 11:52:59 +03:00 |
|
|
|
b60dad90b8
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-08-13 09:59:13 +03:00 |
|
|
|
ef15a36cf8
|
Web: Files: added icons to context menu actions
|
2020-08-13 09:59:05 +03:00 |
|
|
|
d6ff0d6a44
|
Merge branch 'master' into feature/files
|
2020-08-12 18:26:28 +03:00 |
|
|
|
6782269c7f
|
Files: lock file
|
2020-08-12 18:13:52 +03:00 |
|
Ilya Oleshko
|
37fe1cab21
|
Merge branch 'master' into feature/files
|
2020-08-12 18:05:29 +03:00 |
|
|
|
3a37e0839a
|
Files: fix FileShareLink
|
2020-08-12 17:34:54 +03:00 |
|
|
|
c0f82fdf71
|
Web: Files: added Unblock/Check-in
|
2020-08-12 14:39:04 +03:00 |
|
maksim
|
6782b16413
|
fix: replacing projectreference with packagereference
|
2020-08-12 13:34:19 +03:00 |
|
SuhorukovAnton
|
df8b6fd8b0
|
private: firtst version
|
2020-08-12 12:58:08 +03:00 |
|
|
|
181c1e52f4
|
Web: Files: added version history api
|
2020-08-12 11:08:04 +03:00 |
|
|
|
f3749c1c94
|
Web: Files: fixed version styles
|
2020-08-12 10:14:40 +03:00 |
|
Ilya Oleshko
|
30c17e3220
|
Web: Files: VersionHistory: Fixed page wrapper
|
2020-08-11 15:48:37 +03:00 |
|
Ilya Oleshko
|
9d703ec01e
|
Web: Files: Home: Fixed page wrapper
|
2020-08-11 15:48:17 +03:00 |
|
Ilya Oleshko
|
71a2f02cdc
|
Web: Files: Home: Moved function initialization out of render
|
2020-08-11 11:15:54 +03:00 |
|
Ilya Oleshko
|
20d411dfb9
|
Web: Files: Home: Fixed items of GroupButtonsMenu
|
2020-08-11 11:05:06 +03:00 |
|
Ilya Oleshko
|
bcb546ce0e
|
Web: Files: Wdyr not expand by default
|
2020-08-11 10:59:51 +03:00 |
|
|
|
e0795e0f17
|
Web: Files: added translations to sharing panel
|
2020-08-11 10:38:53 +03:00 |
|
|
|
5a3d046287
|
Web: Files: fixed sharing panel styles
|
2020-08-10 16:13:37 +03:00 |
|
|
|
33c45e3486
|
Web: Files: added translations to VersionHistory
|
2020-08-10 15:29:22 +03:00 |
|
|
|
fcda53f1f5
|
Web: Files: fixed scroll in the sharing panel
|
2020-08-10 14:04:42 +03:00 |
|
|
|
010875e7ef
|
Web: Files: removed fetchFiles from filter
|
2020-08-10 11:42:15 +03:00 |
|
|
|
65ef03615e
|
Web: Files: fixed update tree after files operations
|
2020-08-07 17:36:54 +03:00 |
|
|
|
4abfc3385e
|
Web: Files: fixed update tree folders
|
2020-08-07 17:21:51 +03:00 |
|
|
|
7d69c3e7e4
|
Web: Files: added new update logic for badge
|
2020-08-07 16:54:26 +03:00 |
|
|
|
e34be36031
|
Web: Files: fixed focus in the sharing panel
|
2020-08-07 16:52:43 +03:00 |
|
|
|
9ceee0dfc6
|
Web: Files: fixed items select
|
2020-08-06 16:47:28 +03:00 |
|
|
|
53ab16529d
|
Web: Files: fixed close group-button-menu
|
2020-08-06 16:09:20 +03:00 |
|
|
|
6c69ece258
|
Web: Files: added close events by keys, fixed focus in aside
|
2020-08-05 15:17:21 +03:00 |
|
|
|
f8b791fa54
|
Merge branch 'master' into feature/files
|
2020-08-04 10:33:33 +03:00 |
|
|
|
a9e8c89240
|
Files: fix add tag
|
2020-08-04 10:30:09 +03:00 |
|
|
|
7055672075
|
Web: Files: fixed document edit
|
2020-08-04 09:44:22 +03:00 |
|
|
|
483906fed8
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
|
2020-08-03 18:29:41 +03:00 |
|
|
|
1701db1a91
|
Files: fix CompleteVersion
|
2020-08-03 18:28:34 +03:00 |
|
|
|
34c2252b25
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Server/Controllers/FilesController.cs
|
2020-08-02 22:31:52 +03:00 |
|
|
|
6253b151e1
|
fix ChangeHistory, UpdateFile, added UpdateComment
|
2020-08-02 21:48:58 +03:00 |
|
|
|
e4501f3cd6
|
Web: Files: added edit comment panel to VersionHistory
|
2020-07-31 17:24:57 +03:00 |
|
Ilya Oleshko
|
fa8a0b92d8
|
Merge branch 'master' into feature/files
|
2020-07-31 15:05:58 +03:00 |
|
|
|
8ce8aed45d
|
Web: Files: fixed items select
|
2020-07-31 12:14:44 +03:00 |
|
|
|
018298e921
|
Web: Files: fixed row warning
|
2020-07-31 11:31:11 +03:00 |
|
|
|
72bc996a1a
|
Web: Files: added file operations to contextMenu, refactoring
|
2020-07-31 11:14:37 +03:00 |
|
|
|
547852e678
|
Web: Files: added new translations
|
2020-07-31 11:10:16 +03:00 |
|
SuhorukovAnton
|
73fff2e63c
|
Merge branch 'master' into feature/scope
|
2020-07-30 16:39:52 +03:00 |
|
|
|
e85c125900
|
Web: Files: refactoring VersionHistory page, fixed page crash when following a direct url
|
2020-07-30 10:52:19 +03:00 |
|
|
|
7fb40014dd
|
Web: Files: fixed VersionHitory header styles
|
2020-07-30 10:45:59 +03:00 |
|
SuhorukovAnton
|
456866d4d9
|
scope: refactoring
|
2020-07-30 00:57:58 +03:00 |
|
|
|
18b2935c12
|
fix merge
|
2020-07-29 14:52:37 +03:00 |
|
|
|
0231e60cc7
|
Merge branch 'master' into feature/files
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
# web/ASC.Web.Components/src/index.js
|
2020-07-28 17:34:46 +03:00 |
|
|
|
585d98f8f4
|
Files: core. replace
|
2020-07-28 15:45:14 +03:00 |
|
|
|
eabb06f8a8
|
Web: Files: hid the progress settings in the progress bar
|
2020-07-24 13:48:24 +03:00 |
|
|
|
be81ca291d
|
Update yarn.lock files + bump versions
|
2020-07-17 18:03:08 +03:00 |
|
|
|
d094546147
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2020-07-17 17:48:50 +03:00 |
|
|
|
ec20c66c5d
|
Update yarn.lock files
|
2020-07-17 17:43:39 +03:00 |
|
|
|
562abfcdc9
|
DI: refactoring
|
2020-07-17 13:52:28 +03:00 |
|
|
|
fafe83cebd
|
Merge branch 'master' into feature/files
|
2020-07-16 16:53:56 +03:00 |
|
|
|
679e77a3ea
|
Update yarn.lock files
|
2020-07-16 16:09:09 +03:00 |
|
|
|
4681fb0f78
|
fix
|
2020-07-16 16:02:21 +03:00 |
|
|
|
098e872a38
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
|
2020-07-16 15:58:43 +03:00 |
|
|
|
ec8c6a5ddb
|
Fixed security vulnerability in lodash
|
2020-07-16 15:54:04 +03:00 |
|
|
|
78b10ab893
|
Update yarn.lock files
|
2020-07-16 14:55:40 +03:00 |
|
|
|
8d0d5fd908
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# web/ASC.Web.Components/package.json
|
2020-07-16 14:41:32 +03:00 |
|
|
|
ff41b28a64
|
DI: files fix
|
2020-07-16 12:08:20 +03:00 |
|
Alexey
|
b4304d8526
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-16 11:33:17 +03:00 |
|
|
|
a505175b58
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-07-16 11:00:18 +03:00 |
|
|
|
595362b2b3
|
Web: Files: moved files uploader to separate file, moved convert dialog to redux, added routing to MainButton actions
|
2020-07-16 11:00:09 +03:00 |
|
|
|
060a173691
|
Web: Files: fixed Delete progress
|
2020-07-16 10:04:25 +03:00 |
|
|
|
576e8a6de0
|
Files: revert
|
2020-07-16 00:49:25 +03:00 |
|
|
|
ddf5aa6f19
|
Files: additional logging
|
2020-07-15 23:18:35 +03:00 |
|
Alexey
|
965b2e97d3
|
Web: Common: Tile view temporarily hidden
|
2020-07-15 19:05:40 +03:00 |
|
|
|
531b66875f
|
Files: fix
|
2020-07-15 18:27:46 +03:00 |
|
SuhorukovAnton
|
6da23f477b
|
ASC.Files.Core: refactoring
|
2020-07-15 18:07:34 +03:00 |
|
|
|
9ee887d270
|
DocumentService log error
|
2020-07-15 18:06:35 +03:00 |
|
|
|
414e17ac1f
|
DocumentService log error
|
2020-07-15 17:40:58 +03:00 |
|
SuhorukovAnton
|
83a88d0240
|
Merge branch 'master' into feature/ASC.Files.Core
|
2020-07-15 17:38:40 +03:00 |
|
Alexey
|
356a18acc6
|
Web:Files: Added translation to tile view
|
2020-07-15 17:04:29 +03:00 |
|
|
|
a54be3b64c
|
Merge branch 'master' into feature/files
|
2020-07-15 16:57:14 +03:00 |
|
|
|
e10ac2ccfa
|
BaseStartup: refactoring
|
2020-07-15 15:33:44 +03:00 |
|
|
|
baa71247d8
|
Merge branch 'master' into feature/general-startup
|
2020-07-15 13:06:32 +03:00 |
|
Alexey
|
4bf9133851
|
Web: Files: Tile: fix styles and small refactoring
|
2020-07-15 11:31:23 +03:00 |
|
Alexey
|
b573555024
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-15 08:00:04 +03:00 |
|
Alexey
|
e886437d83
|
Web: Files: Fix tile styles
|
2020-07-15 07:30:59 +03:00 |
|
SuhorukovAnton
|
5bf0bd22b6
|
ASC.Files.Core: first version
|
2020-07-14 13:03:53 +03:00 |
|
|
|
bb507b5aeb
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-07-14 10:16:21 +03:00 |
|
|
|
bc671b4332
|
Web: Files: fixed pathParts error
|
2020-07-14 10:14:53 +03:00 |
|
|
|
88e932a0a7
|
Merge branch 'master' into feature/files
|
2020-07-13 16:46:42 +03:00 |
|
|
|
a347f4e4f3
|
fix
|
2020-07-13 16:18:31 +03:00 |
|
Alexey
|
e5b71cff4f
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/actions.js
|
2020-07-13 16:00:32 +03:00 |
|
|
|
a822f9b349
|
Files: fix
|
2020-07-13 15:57:39 +03:00 |
|
|
|
dfd8bbfdb8
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-13 15:28:11 +03:00 |
|
|
|
a0fddf446d
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-07-13 13:17:09 +03:00 |
|
|
|
d109aab32b
|
Web: Files: moved progress to redux
|
2020-07-13 13:17:00 +03:00 |
|
Alexey
|
3ca42459a1
|
Web: Files: Separated the logic of the Filter and ViewSelector
|
2020-07-13 12:10:40 +03:00 |
|
|
|
b7d79e9a2f
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-12 20:48:30 +03:00 |
|
|
|
4efe98ff9e
|
Revert "Fix Re-rendered because of props changes: props.onClick"
This reverts commit 7c8f84ab8b.
|
2020-07-12 20:48:15 +03:00 |
|
Alexey
|
e3294771ce
|
Web: Files: Home: Fixed selection of elements on Tile view
|
2020-07-12 12:49:25 +03:00 |
|
Alexey
|
031788ba50
|
Web: Files: Home: Fixed init styled TileContent outside render
|
2020-07-12 11:52:56 +03:00 |
|
Alexey
|
5b027aa170
|
Web: Files: Home: Removed the header if there are no files or folders. Refactoring
|
2020-07-12 11:37:25 +03:00 |
|
|
|
064160a1ea
|
Files: onedrive
|
2020-07-10 18:37:02 +03:00 |
|
Alexey
|
5423d392f8
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-10 16:01:48 +03:00 |
|
Ilya Oleshko
|
63bf62d331
|
Web: Files: Home: Fixed check event for onEditComplete action
|
2020-07-10 16:00:09 +03:00 |
|
Alexey
|
b99d3c5e7d
|
Web: Files: Tile: Mobile style fix
|
2020-07-10 15:41:06 +03:00 |
|
|
|
45678da8e5
|
Merge branch 'master' into feature/files
|
2020-07-10 14:58:37 +03:00 |
|
|
|
56df9a98ef
|
Files: resources
|
2020-07-10 14:57:42 +03:00 |
|
|
|
6f316242cb
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-10 14:38:44 +03:00 |
|
Ilya Oleshko
|
2ff6c73876
|
Web: Files: Home: Fixed context menu actions for edit
|
2020-07-10 14:40:47 +03:00 |
|
|
|
d8597a8602
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-10 14:15:40 +03:00 |
|
|
|
7c8f84ab8b
|
Fix Re-rendered because of props changes: props.onClick
|
2020-07-10 14:15:30 +03:00 |
|
Alexey
|
dbc98c1a84
|
Web: Files: Home: Fixed onEditComplete function bind for tile
|
2020-07-10 14:05:46 +03:00 |
|
SuhorukovAnton
|
2925ff25b4
|
api-defaultvalue: add System.Text.Json
|
2020-07-10 13:35:24 +03:00 |
|
Ilya Oleshko
|
e55e2414b9
|
Web: Files: Home: Fixed onEditComplete function bind for row
|
2020-07-10 13:14:09 +03:00 |
|
|
|
e48c202528
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-10 11:42:14 +03:00 |
|
|
|
9cbef5763f
|
Web: Files: Added why-did-you-render package (https://github.com/welldone-software/why-did-you-render)
|
2020-07-10 11:42:06 +03:00 |
|
