|
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 |
|
Ilya Oleshko
|
df7a8c6515
|
Web: People: Home : Fixed status display
|
2020-10-05 14:59:42 +03:00 |
|
|
978b67f7a7
|
Update yarn.lock files
|
2020-10-05 14:46:07 +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 |
|
TatianaLopaeva
|
37e195ba53
|
Web: Re-wrote condition if the nameSchemaId is not set
|
2020-10-05 09:48:11 +03:00 |
|
|
9d32d7629a
|
Web: People: Re-written Home/Header with selectors and reselect + refactoring
|
2020-10-02 18:34:50 +03:00 |
|
TatianaLopaeva
|
7bbc5bb693
|
Web: Added mapDispatchToProps at ProfileInfo
|
2020-10-02 15:47:13 +03:00 |
|
|
7bbba5f158
|
Web: People: Re-written Home/Body with selectors and reselect + refactoring
|
2020-10-01 22:01:52 +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 |
|
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 |
|
Artem Tarasov
|
8db1420cdd
|
Merge branch 'master' into feature/hash-password
|
2020-09-30 17:24:51 +03:00 |
|
|
58126fd98d
|
Auth by passwordHash
|
2020-09-30 17:16:48 +03:00 |
|
Artem Tarasov
|
14f0d0f2be
|
update yarn.lock
|
2020-09-30 15:00:27 +03:00 |
|
Artem Tarasov
|
c68b6d6b7f
|
update yarn.lock
|
2020-09-30 10:53:51 +03:00 |
|
|
4b302d1634
|
Web: People: Replaced RequestLoader to showLoader/hideLoader function calls
|
2020-09-29 17:43:13 +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 |
|
|
5ad8730c46
|
Web: People: Fixed open @self profile
|
2020-09-28 16:20:16 +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 |
|
|
a6180afa35
|
Web: Normalize routing + refactoring
|
2020-09-25 19:14:50 +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 |
|
|
63a973375a
|
Web: People: Added RowsLoader to Section Body
|
2020-09-25 10:39:21 +03:00 |
|
Alexey Kostenko
|
69dcd77129
|
Web: People: Moved indication of success of link copy in InviteDialog
|
2020-09-24 16:18:37 +03:00 |
|
|
5f632302f9
|
Web: People: Added HeadlineLoader to Section Header
|
2020-09-24 14:35:23 +03:00 |
|
|
deabd31690
|
Web: People: Added TreeFolderLoader
|
2020-09-24 14:22:17 +03:00 |
|
|
97539afc02
|
Web: People: Added HeadlineLoader
|
2020-09-24 13:42:32 +03:00 |
|
|
4c214e2ff2
|
Merge branch 'feature/files' into feature/loading-acceleration
|
2020-09-24 12:56:52 +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 |
|
Artem Tarasov
|
dc57312bf8
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-23 14:12:26 +03:00 |
|
Artem Tarasov
|
20dc47473c
|
Web: People: fixed style of TreeMenu
|
2020-09-23 14:12:03 +03:00 |
|
Alexey Kostenko
|
95179a967f
|
Web: People: Removed unnecessary request to get invite link when visiting People page
|
2020-09-23 10:16:03 +03:00 |
|
Artem Tarasov
|
b2013f4dc2
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-09-22 17:58:17 +03:00 |
|
Artem Tarasov
|
9a6110ea9e
|
Web: People: fixed size of sorting block on tablet
|
2020-09-22 17:57:54 +03:00 |
|
Alexey Kostenko
|
744f7cdfb6
|
Web: People: Removed forced copying of invitation link when opening ModalDialog
|
2020-09-22 16:14:35 +03:00 |
|
Artem Tarasov
|
964cd4a0ec
|
Web: People: deleted unusing variable
|
2020-09-22 15:42:57 +03:00 |
|
Artem Tarasov
|
9a2f04008d
|
Web: People: fixed styles
|
2020-09-22 15:18:36 +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 |
|
Artem Tarasov
|
caea60046f
|
Web: People: refactoring: added utils.js, replaced changeDocumentTitle() with setDocumentTitle()
|
2020-09-21 14:54:35 +03:00 |
|
Alexey Kostenko
|
cd7d714476
|
Web: People: Fix loader style
|
2020-09-21 12:17:56 +03:00 |
|
Artem Tarasov
|
5f3a4c83e8
|
Web: People: fixed replacement of group members when adding
|
2020-09-19 23:26:11 +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 |
|
|
9a092cb8ec
|
moved from release/11 4414f77b
|
2020-09-18 17:45:59 +03:00 |
|