|
|
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 |
|
Ilya Oleshko
|
ef545675d2
|
web: components: bump version
|
2020-10-09 17:08:40 +03:00 |
|
Ilya Oleshko
|
a129bda5ee
|
Web: Files : Home : Added share button at row
|
2020-10-09 17:08:29 +03:00 |
|
Ilya Oleshko
|
5e8a4727ac
|
Web: Components : Row : Added contentElement
|
2020-10-09 17:07:35 +03:00 |
|
|
|
a71fd1208b
|
Web: Files: fixed Home render, added new select logic
|
2020-10-09 16:43:50 +03:00 |
|
Artem Tarasov
|
d7d9a55e50
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-09 16:23:41 +03:00 |
|
TatianaLopaeva
|
5f0c974629
|
Web: People: Added console.log
|
2020-10-09 16:16:28 +03:00 |
|
Artem Tarasov
|
128d25ef9b
|
web: common: bump version
|
2020-10-09 16:11:00 +03:00 |
|
Artem Tarasov
|
24c799ed76
|
Web: People: applied ProfileView loader
|
2020-10-09 16:10:29 +03:00 |
|
Artem Tarasov
|
421d71c4fe
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
# Conflicts:
# web/ASC.Web.Common/src/components/Loaders/index.js
|
2020-10-09 15:58:50 +03:00 |
|
Artem Tarasov
|
5a5fb5b036
|
Web: Common: added ProfileViewLoader
|
2020-10-09 15:57:04 +03:00 |
|
|
|
290f7649f1
|
Web: Files: fixed updating of the tree after operations with folders
|
2020-10-09 15:55:30 +03:00 |
|
|
|
1dfd7afe1c
|
Update yarn.lock files
|
2020-10-09 15:07:41 +03:00 |
|
|
|
4a57d0d646
|
web: common: bump version
|
2020-10-09 14:58:32 +03:00 |
|
|
|
a5c77baae0
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-09 14:57:52 +03:00 |
|
|
|
065c8daaa0
|
Web: People: Applied Filter loader
|
2020-10-09 14:57:43 +03:00 |
|
TatianaLopaeva
|
77426da7fe
|
Web: People: Added console.log
|
2020-10-09 14:45:15 +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 |
|
|
|
e01f577f39
|
Web: People: Fixed show loading process
|
2020-10-09 13:37:41 +03:00 |
|
Ilya Oleshko
|
05041a5a77
|
Config: Fixed database name
|
2020-10-09 13:26:17 +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 |
|
|
|
a969f26f05
|
Web: Common: fixed getFoldersTree api
|
2020-10-09 00:23:36 +03:00 |
|
|
|
3385d0b2f5
|
Web: Files: fixed files operations
|
2020-10-08 23:58:21 +03:00 |
|
|
|
cedca7b3c3
|
Web: Common: added rootFolderType to getFoldersTree api
|
2020-10-08 23:56:57 +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
|
0e4698b8f0
|
Merge branch 'feature/selectors-refactoring' of github.com:ONLYOFFICE/AppServer into feature/selectors-refactoring
|
2020-10-08 16:58:39 +03:00 |
|
|
|
4e84d5f5ae
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-10-08 16:58:09 +03:00 |
|
Ilya Oleshko
|
033a67863e
|
Web: Files : Selectors : Fixed isMediaOrImage usage for context menu
|
2020-10-08 16:56:01 +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 |
|
|
|
43a085eb18
|
Merge pull request #88 from ONLYOFFICE/feature/schema
Feature/schema
|
2020-10-08 13:51:06 +03:00 |
|
|
|
4059c94e34
|
Merge pull request #91 from ONLYOFFICE/feature/fix-redirect-after-update-profile
Feature/fix redirect after update profile
|
2020-10-08 13:20:31 +03:00 |
|
|
|
798170e402
|
web: common: bump version
|
2020-10-08 12:43:21 +03:00 |
|
|
|
34575dab83
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-10-08 12:43:07 +03:00 |
|
|
|
e3fde6fd77
|
Web: Common: fixed main height
|
2020-10-08 12:42:59 +03:00 |
|
