Ilya Oleshko
|
70fb72e628
|
Web: Files : Home : Added simple selectors, fixed mapStateToProps
|
2020-10-02 16:21:36 +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 |
|
|
|
1b15795d7a
|
Web: Files: fixed fetchFiles action, refactoring
|
2020-10-01 10:41:00 +03:00 |
|
TatianaLopaeva
|
01423d1159
|
Merge branch 'feature/files' into featrure/fixe-switching-language
|
2020-10-01 09:38:28 +03:00 |
|
TatianaLopaeva
|
b33328218a
|
Update yarn.lock files
|
2020-10-01 09:37:25 +03:00 |
|
TatianaLopaeva
|
82fac1f54d
|
Deleted unnecessary constant
|
2020-10-01 08:58:17 +03:00 |
|
TatianaLopaeva
|
6cfdee13b0
|
Added language into array of useEffect
|
2020-10-01 08:55:59 +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 |
|
|
|
140d57d5d4
|
Merge branch 'master' into feature/files
|
2020-09-30 18:28:27 +03:00 |
|
|
|
58126fd98d
|
Auth by passwordHash
|
2020-09-30 17:16:48 +03:00 |
|
Ilya Oleshko
|
a9163c06be
|
Web: Files : Fixed open files after create
|
2020-09-30 11:57:22 +03:00 |
|
|
|
4ac2767afb
|
Web: Files: removed useless actions, fixed clearProgressData
|
2020-09-29 18:24:49 +03:00 |
|
|
|
4b302d1634
|
Web: People: Replaced RequestLoader to showLoader/hideLoader function calls
|
2020-09-29 17:43:13 +03:00 |
|
|
|
f96e5cee1a
|
Web: Files: Replaced RequestLoader to showLoader/hideLoader function calls
|
2020-09-29 17:40:42 +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 |
|
|
|
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 |
|
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 |
|
|
|
5ad8730c46
|
Web: People: Fixed open @self profile
|
2020-09-28 16:20:16 +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
|
c8b88c507f
|
Web: People: Updated toast notifications
|
2020-09-28 11:48:35 +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 |
|
|
|
69b21cd7a5
|
Web: People: Fixed routing to GroupAction from Home page
|
2020-09-25 11:04:34 +03:00 |
|
|
|
c5ed32f384
|
Web: People: Fixed routing to view/edit Profile from Home page
|
2020-09-25 10:53:39 +03:00 |
|
TatianaLopaeva
|
eac4556983
|
Merge branch 'feature/files' into feature/payments-enterprise
|
2020-09-25 10:44:31 +03:00 |
|
|
|
63a973375a
|
Web: People: Added RowsLoader to Section Body
|
2020-09-25 10:39:21 +03:00 |
|
|
|
72cf8e4f2b
|
Web: Moved RowsLoader to ASC.Web.Common
|
2020-09-25 10:36:13 +03:00 |
|
Alexey Kostenko
|
69dcd77129
|
Web: People: Moved indication of success of link copy in InviteDialog
|
2020-09-24 16:18:37 +03:00 |
|
|
|
5cef360ade
|
Web: Files: added hideAside prop to PageLayout
|
2020-09-24 15:07:08 +03:00 |
|
|
|
5f632302f9
|
Web: People: Added HeadlineLoader to Section Header
|
2020-09-24 14:35:23 +03:00 |
|
|
|
521ed5f24e
|
Web: Files: Replaced HeadlineLoader to ASC.Web.Common variant
|
2020-09-24 14:27:48 +03:00 |
|
|
|
deabd31690
|
Web: People: Added TreeFolderLoader
|
2020-09-24 14:22:17 +03:00 |
|
|
|
b04f22b6e5
|
Web: Moved TreeFolderLoader to ASC.Web.Common
|
2020-09-24 13:58:18 +03:00 |
|
