|
|
c9293ac86d
|
Merge branch 'develop' into feature/workspaces
# Conflicts:
# packages/asc-web-common/src/components/FilterInput/FilterInput.js
# packages/asc-web-common/src/components/FilterInput/sub-components/SortComboBox.js
# packages/asc-web-common/src/components/PageLayout/index.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-header.js
# packages/asc-web-common/src/components/PageLayout/sub-components/article-main-button.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-body.js
# packages/asc-web-common/src/components/PageLayout/sub-components/section-header.js
# packages/asc-web-common/src/components/PrivateRoute/PrivateRoute.js
# products/ASC.Files/Client/package.json
# products/ASC.Files/Client/src/components/Article/Body/TreeFolders.js
# products/ASC.Files/Client/src/components/pages/DocEditor/index.js
# products/ASC.Files/Client/src/components/pages/Home/Section/Filter/index.js
# products/ASC.Files/Client/src/components/panels/OperationsPanel/index.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/SharingRow.js
# products/ASC.Files/Client/src/components/panels/SharingPanel/index.js
# products/ASC.Files/Client/src/index.js
# products/ASC.Files/Client/src/store/files/actions.js
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/package.json
# products/ASC.People/Client/src/components/pages/Home/Section/Body/index.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/ContactField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/DateField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/EmailField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/RadioField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextChangeField.js
# products/ASC.People/Client/src/components/pages/ProfileAction/Section/Body/FormFields/TextField.js
# products/ASC.People/Client/src/index.js
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/package.json
# web/ASC.Web.Client/src/App.js
# web/ASC.Web.Client/src/components/pages/Confirm/index.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/activateEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeEmail.js
# web/ASC.Web.Client/src/components/pages/Confirm/sub-components/changeOwner.js
# web/ASC.Web.Client/src/helpers/confirmRoute.js
# web/ASC.Web.Client/src/index.js
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
# web/ASC.Web.Login/src/LoginContent.jsx
# web/ASC.Web.Login/src/sub-components/register-container.js
# yarn.lock
|
2020-12-15 18:40:27 +03:00 |
|
Ilya Oleshko
|
460b1ec0d9
|
Web: People : Home : Fixed fetch users after profile navigation
|
2020-12-11 16:03:48 +03:00 |
|
TatianaLopaeva
|
aa6eebb51b
|
Web: Files/People: Home: Fixed the displaying load of section header
|
2020-12-11 14:21:37 +03:00 |
|
|
|
356ace1c57
|
Merge branch 'develop' into bugfix/upload-with-convertation
|
2020-12-10 19:14:58 +03:00 |
|
|
|
0b0d7187e0
|
Update yarn.lock files
|
2020-12-10 18:45:49 +03:00 |
|
Alexey Kostenko
|
abda53a082
|
Web: Files/People/Common: Fixed header styles
|
2020-12-10 13:31:53 +03:00 |
|
Alexey Kostenko
|
1a53841499
|
Web: Files/People/Common: Fixed header style
|
2020-12-10 09:48:35 +03:00 |
|
|
|
4d88b2fc28
|
Update yarn.lock files
|
2020-12-08 18:37:19 +03:00 |
|
|
|
ce4a3e3338
|
Update yarn.lock files
|
2020-12-08 18:17:46 +03:00 |
|
|
|
7d3dde38c4
|
Update yarn.lock files
|
2020-12-08 15:26:54 +03:00 |
|
Ilya Oleshko
|
d2719e1cd9
|
Web: Fixed usage lodash/isEqual on fast-deep-equal
|
2020-12-08 14:09:46 +03:00 |
|
Ilya Oleshko
|
bd13067d0b
|
Web: Added fast-deep-equal
|
2020-12-08 14:08:26 +03:00 |
|
|
|
c48b5783f1
|
People: search ignore case
|
2020-12-07 19:56:59 +03:00 |
|
Ilya Oleshko
|
4147d2f31a
|
Web: Fixed temp loaders
|
2020-12-07 11:11:04 +03:00 |
|
|
|
71b6e9f27d
|
Web: Files: init Files build and loading (Moved out from CRA)
|
2020-12-07 10:49:07 +03:00 |
|
Ilya Oleshko
|
83466bd638
|
Merge branch 'develop' into bugfix/login-fix
|
2020-12-07 09:52:04 +03:00 |
|
|
|
70aa6c023d
|
Web: Added dynostore for people reducers loading
|
2020-12-06 20:15:01 +03:00 |
|
|
|
0784453daf
|
Fix errors on login and logout
|
2020-12-04 14:21:51 +03:00 |
|
Ilya Oleshko
|
d03584fcdd
|
Web: Fixed isAuthenticated logic
|
2020-12-04 11:38:15 +03:00 |
|
|
|
a39192ff21
|
Web: Common: added new containers styles, added classNames to people and files containers
|
2020-12-03 18:03:05 +03:00 |
|
|
|
1ed59c1694
|
Web: People: init People build and loading (Moved out from CRA)
|
2020-12-03 13:09:33 +03:00 |
|
|
|
f10f6b8d3b
|
Update yarn.lock files
|
2020-11-30 15:11:23 +03:00 |
|
|
|
4ad116937a
|
Merge branch 'develop' into bugfix/fix-empty-screen-description
|
2020-11-30 13:27:35 +03:00 |
|
|
|
c029a2df04
|
Web: People: fixed text alignment
|
2020-11-30 12:15:45 +03:00 |
|
|
|
8c965fa4e1
|
Web: People: changed empty screen description, fixed icons alignment
|
2020-11-28 13:44:31 +03:00 |
|
|
|
a0adc29899
|
Web: People: fixed alignment and color of icons
|
2020-11-28 13:15:30 +03:00 |
|
|
|
83e4db1e7f
|
Web: People: removed useless buttons styles
|
2020-11-28 13:05:10 +03:00 |
|
|
|
2b7480a200
|
Web: People: fixed headers fontWeight
|
2020-11-28 13:03:53 +03:00 |
|
|
|
afc280904b
|
Web: People: fixed passwordSettings minLength
|
2020-11-26 12:27:09 +03:00 |
|
|
|
4a1023808c
|
People: filter groups
|
2020-11-24 16:13:49 +03:00 |
|
|
|
b2832468c4
|
Frontend: client's code re-organization
|
2020-11-24 13:18:23 +03:00 |
|
|
|
beee70cd15
|
yarn workspaces init commit
|
2020-11-21 16:07:23 +03:00 |
|
Artem Tarasov
|
f2d15f07f8
|
Web: People: Filter: changed translation of elements in the sorting list
|
2020-11-20 12:43:35 +03:00 |
|
|
|
6cb92946be
|
fix uploadmemberphoto
|
2020-11-17 18:01:34 +03:00 |
|
Alexey Kostenko
|
3702bd597d
|
Web: Common: Refactoring HOC withLayoutSize
|
2020-11-17 10:32:02 +03:00 |
|
Alexey Kostenko
|
c6d4b5bf60
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-17 08:11:35 +03:00 |
|
Alexey Kostenko
|
99ae4dba20
|
Web: People: Changed Consumer to HOC
|
2020-11-17 06:39:08 +03:00 |
|
|
|
cd523404f1
|
Merge branch 'develop' into refactoring/scope
|
2020-11-16 17:09:19 +03:00 |
|
Alexey Kostenko
|
af8ce86d2d
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-16 12:36:55 +03:00 |
|
|
|
68483bc979
|
Merge branch 'develop' into refactoring/scope
# Conflicts:
# common/ASC.FederatedLogin/LoginProviders/BoxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DocuSignLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/DropboxLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/GoogleLoginProvider.cs
# common/ASC.FederatedLogin/LoginProviders/OneDriveLoginProvider.cs
# web/ASC.Web.Api/Controllers/PortalController.cs
# web/ASC.Web.Api/Startup.cs
|
2020-11-13 16:03:17 +03:00 |
|
Alexey Kostenko
|
df060ba8a2
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-13 10:58:34 +03:00 |
|
Viktor Fomin
|
fc33f10e37
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-13 10:30:09 +03:00 |
|
|
|
2ec76cae70
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-12 18:03:10 +03:00 |
|
Viktor Fomin
|
4c398104cb
|
Update yarn.lock files
|
2020-11-12 15:06:18 +03:00 |
|
Alexey Kostenko
|
913c45a00b
|
Merge branch 'develop' into hotfix/filter-input-hotfix
|
2020-11-12 14:40:46 +03:00 |
|
Viktor Fomin
|
9890f1cc43
|
Update yarn.lock files
|
2020-11-12 13:37:13 +03:00 |
|
Viktor Fomin
|
0bb00e39db
|
Web: People: added header loader
|
2020-11-12 13:31:19 +03:00 |
|
Alexey Kostenko
|
366989ea9c
|
Web: People: Added sectionWidth prop to filterInput
|
2020-11-12 11:23:08 +03:00 |
|
Viktor Fomin
|
3dc69fc9e8
|
Web: People: added group loader
|
2020-11-12 00:12:28 +03:00 |
|
Viktor Fomin
|
45e9ab5aea
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-11 23:26:03 +03:00 |
|
