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 |
|
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 |
|
|
|
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 |
|
|
|
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 |
|
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 |
|
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 |
|
TatianaLopaeva
|
b33328218a
|
Update yarn.lock files
|
2020-10-01 09:37:25 +03:00 |
|
Artem Tarasov
|
14f0d0f2be
|
update yarn.lock
|
2020-09-30 15:00:27 +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 |
|
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 |
|
Vladislav Makhov
|
5309d8ecf6
|
Add Favorites empty screen picture
|
2020-09-29 13:34:59 +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 |
|
Ilya Oleshko
|
ac9262f4c9
|
Web: Files : Fixed editor url, always last
|
2020-09-28 17:46:27 +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 |
|
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 |
|
|
|
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 |
|
|
|
5cef360ade
|
Web: Files: added hideAside prop to PageLayout
|
2020-09-24 15:07:08 +03:00 |
|
TatianaLopaeva
|
c82b0237d3
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-24 13:06:46 +03:00 |
|
|
|
2c18950df8
|
Web: Files: fixed display of icons for ipad
|
2020-09-24 12:09:01 +03:00 |
|
