|
|
ed50f3bc98
|
Update yarn.lock files
|
2020-10-16 16:38:11 +03:00 |
|
Ilya Oleshko
|
c8cfe099ce
|
Web: Files : RowContent : Disable file actions inside recycle
|
2020-10-16 16:33:25 +03:00 |
|
|
|
2ea8e5cf1c
|
Web: Files: Applied prettier style fix
|
2020-10-16 16:27:22 +03:00 |
|
TatianaLopaeva
|
14af00ffd7
|
Web: Added styles and changed images by layout
|
2020-10-16 16:21:33 +03:00 |
|
Vladislav Makhov
|
e58a88af29
|
Fix code after merge
|
2020-10-16 16:16:51 +03:00 |
|
Ilya Oleshko
|
312856acf1
|
Web: Files : RowContent : Auto formatting, disable file actions inside recycle
|
2020-10-16 16:12:37 +03:00 |
|
Ilya Oleshko
|
5c4df62c77
|
Web: Files : Body : Not render share button in recycle
|
2020-10-16 16:11:30 +03:00 |
|
|
|
d636c68ae6
|
Web: Files: fixed share translation
|
2020-10-16 16:09:59 +03:00 |
|
Ilya Oleshko
|
d5d4418536
|
Web: Files : NewFilesPanel : Fixed file open
|
2020-10-16 15:42:07 +03:00 |
|
Ilya Oleshko
|
74cae29b38
|
Web: Files : Selectors : Fixed filesList selector
|
2020-10-16 15:41:21 +03:00 |
|
|
|
30f301435e
|
Web: Files: fixed the update of the badge in the tree
|
2020-10-16 15:06:49 +03:00 |
|
Artem Tarasov
|
89b2ace28b
|
Web: Files: treeFolders: fixed badge display
|
2020-10-16 14:33:54 +03:00 |
|
Vladislav Makhov
|
3491938aa4
|
Merge branch 'feature/files' into feature/files-favorites
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# 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/Section/Header/index.js
# products/ASC.Files/Client/src/components/pages/Home/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
# web/ASC.Web.Common/src/api/files/index.js
|
2020-10-16 14:33:20 +03:00 |
|
Ilya Oleshko
|
bdad54951a
|
Web: Files : NewFilesPanel : Fixed mapState error, temporary disabled open file inside panel
|
2020-10-16 14:08:52 +03:00 |
|
Vladislav Makhov
|
3e3fce0638
|
Fix code after merge
|
2020-10-16 12:55:56 +03:00 |
|
|
|
4b2f687cab
|
Web: Files: Skip useless API requests on Editor opening
|
2020-10-16 12:15:54 +03:00 |
|
|
|
99ae158992
|
Web: Files: Removed useless API request call
|
2020-10-16 12:09:17 +03:00 |
|
Vladislav Makhov
|
ccab1949d5
|
Merge branch 'feature/files' into feature/files-recent
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-16 11:28:31 +03:00 |
|
|
|
fa54990786
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-15 19:04:19 +03:00 |
|
|
|
6e7e09b91b
|
Revert "Web: Files: moved SimpleFilesRow to a separate file, removed the bind"
This reverts commit 43dc6d81a5.
|
2020-10-15 18:08:09 +03:00 |
|
|
|
ff1c1765b5
|
Web: Clients: Turned off Suspense fallback
|
2020-10-15 18:07:23 +03:00 |
|
|
|
43dc6d81a5
|
Web: Files: moved SimpleFilesRow to a separate file, removed the bind
|
2020-10-15 14:40:17 +03:00 |
|
Ilya Oleshko
|
3e66f95546
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-15 13:39:31 +03:00 |
|
TatianaLopaeva
|
14bb36900c
|
Update yarn.lock files
|
2020-10-15 11:22:58 +03:00 |
|
Artem Tarasov
|
3ee236c25b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-15 10:56:57 +03:00 |
|
Artem Tarasov
|
6e6bcbd92f
|
Web: Files: TreeFolders: badge for showing new elements moved to component TreeMenu
|
2020-10-15 10:55:01 +03:00 |
|
Artem Tarasov
|
8930f98cdd
|
Web: Files: settings: fixed to display loader
|
2020-10-15 10:52:51 +03:00 |
|
|
|
0fdd5dac10
|
Web: Files: added reselect to getSelection selector
|
2020-10-15 10:22:06 +03:00 |
|
Vladislav Makhov
|
02faf2a407
|
Refactoring
|
2020-10-14 19:01:53 +03:00 |
|
Ilya Oleshko
|
55fbdf2fe9
|
Web: Files : Body : Fixed tooltip after merge
|
2020-10-14 18:09:24 +03:00 |
|
Vladislav Makhov
|
207de2413d
|
Fix remove from favorites
|
2020-10-14 18:04:47 +03:00 |
|
|
|
ea97ca05c2
|
Update yarn.lock files
|
2020-10-14 17:57:29 +03:00 |
|
Ilya Oleshko
|
5a75c16794
|
Web: Files : Header : Fixed menuItems
|
2020-10-14 17:40:39 +03:00 |
|
Ilya Oleshko
|
991e28ab86
|
Web: Files : Home : Fixed shared icon styles
|
2020-10-14 17:39:56 +03:00 |
|
Ilya Oleshko
|
51fd3ef672
|
Web: Files : Selectors : Added selectors
|
2020-10-14 17:38:45 +03:00 |
|
Vladislav Makhov
|
6a6efd1109
|
Add translate
|
2020-10-14 17:30:37 +03:00 |
|
Vladislav Makhov
|
7d6d7d2bc8
|
Revert "Fix filter search"
This reverts commit 783c81fdb4.
|
2020-10-14 17:23:24 +03:00 |
|
|
|
5cf2798aa4
|
Web: Files: fixed opening SharingPanel
|
2020-10-14 17:22:20 +03:00 |
|
Vladislav Makhov
|
5fe6fd0497
|
Remove filter reset
|
2020-10-14 17:22:17 +03:00 |
|
|
|
a6c29d8931
|
Web: Files: moved getTooltipLabel to selectors, refactoring
|
2020-10-14 16:09:15 +03:00 |
|
Vladislav Makhov
|
9fa9560d8e
|
Filter reset while select another node.
|
2020-10-14 14:11:22 +03:00 |
|
Vladislav Makhov
|
4531619362
|
Merge branch 'feature/files' into feature/files-favorites
|
2020-10-14 13:45:13 +03:00 |
|
Vladislav Makhov
|
783c81fdb4
|
Fix filter search
|
2020-10-14 13:17:44 +03:00 |
|
|
|
3ce984b374
|
Web: Files: removed useless code from DocEditor
|
2020-10-14 12:57:00 +03:00 |
|
|
|
00e6ddcd97
|
Web: Files: rename isCanCreate to canCreate, fixed merge
|
2020-10-14 12:46:56 +03:00 |
|
|
|
bac77e0ebd
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/Article/MainButton/index.js
|
2020-10-13 18:17:31 +03:00 |
|
|
|
49f5a52433
|
Update yarn.lock files
|
2020-10-13 16:52:17 +03:00 |
|
|
|
8205c230c7
|
Web: Clients: Added displaying Loader.Filter for MainButton
|
2020-10-13 16:43:41 +03:00 |
|
|
|
2fa205cb6f
|
Web: Clients: Fixed catching of initial API errors
|
2020-10-13 16:31:21 +03:00 |
|
|
|
746ecc7f40
|
Web: Clients: Fixed applying single cursor on loading
|
2020-10-13 16:20:49 +03:00 |
|
|
|
5d76e7e6b0
|
Web: Redesigned displaying of loading processes
|
2020-10-13 15:51:14 +03:00 |
|
|
|
bcbefb8f26
|
Merge branch 'feature/files' into feature/selectors-refactoring
# Conflicts:
# products/ASC.Files/Client/src/components/Article/Body/TreeSettings.js
# products/ASC.Files/Client/src/components/pages/Settings/Section/Body/index.js
# products/ASC.Files/Client/src/components/pages/Settings/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/src/store/files/reducers.js
# products/ASC.Files/Client/src/store/files/selectors.js
|
2020-10-13 15:08:22 +03:00 |
|
Vladislav Makhov
|
632f83927b
|
Merge branch 'feature/files' into feature/files-favorites
|
2020-10-13 14:26:31 +03:00 |
|
|
|
0ae5ec1b1b
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 14:02:11 +03:00 |
|
|
|
b53e34a0f0
|
Web: Removed useless Link duplicates
|
2020-10-13 14:02:04 +03:00 |
|
Artem Tarasov
|
a4a959f972
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-10-13 13:43:16 +03:00 |
|
Artem Tarasov
|
2623c91e80
|
Web: Files: fixed render loader
|
2020-10-13 13:42:28 +03:00 |
|
|
|
3d34978bf0
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-13 13:39:10 +03:00 |
|
|
|
1d4b3785bb
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-10-13 13:31:24 +03:00 |
|
|
|
0712677297
|
Web: Common: fixed MediaViewer close, fixed share dropdown styles
|
2020-10-13 13:30:26 +03:00 |
|
Vladislav Makhov
|
6bcfcc4987
|
Merge branch 'feature/files' into feature/files-recent
|
2020-10-13 13:16:37 +03:00 |
|
Artem Tarasov
|
e2bb4a8405
|
Web: Files: TreeSettings: fixed render of settings before receiving a response from the server
|
2020-10-13 13:15:17 +03:00 |
|
Artem Tarasov
|
33d0322fb4
|
Web: Files: TreeSettings: refactoring
|
2020-10-13 12:50:39 +03:00 |
|
TatianaLopaeva
|
579d543292
|
Merge branch 'feature/files' into feature/fix-changing-language
|
2020-10-13 12:38:46 +03:00 |
|
TatianaLopaeva
|
4ef2db2ed0
|
Web: Update yarn.lock
|
2020-10-13 12:37:34 +03:00 |
|
Ilya Oleshko
|
abee1c8a8e
|
Merge branch 'feature/files' into feature/selectors-refactoring
|
2020-10-13 12:10:55 +03:00 |
|
Ilya Oleshko
|
2f88af1137
|
Web: Files : Home : Added isEdit condition for render share button
|
2020-10-13 11:58:28 +03:00 |
|
TatianaLopaeva
|
f0299db016
|
Update yarn.lock
|
2020-10-13 11:14:09 +03:00 |
|
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 |
|
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 |
|
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 |
|
|
|
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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
