Ilya Oleshko
|
4147d2f31a
|
Web: Fixed temp loaders
|
2020-12-07 11:11:04 +03:00 |
|
Ilya Oleshko
|
83466bd638
|
Merge branch 'develop' into bugfix/login-fix
|
2020-12-07 09:52:04 +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 |
|
|
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 |
|
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 |
|
|
d8bd2b7d21
|
Update yarn.lock files
|
2020-11-11 22:03:47 +03:00 |
|
|
c4411f7b00
|
Merge branch 'develop' into hotfix/section-loader
|
2020-11-11 21:54:02 +03:00 |
|
SuhorukovAnton
|
9039c810c5
|
x-www-form-urlencoded: fix
|
2020-11-11 18:36:58 +03:00 |
|
Viktor Fomin
|
d2a30544d6
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-11 17:38:10 +03:00 |
|
Viktor Fomin
|
91bc88ad28
|
Update yarn.lock files
|
2020-11-11 17:37:48 +03:00 |
|
Viktor Fomin
|
2cc252c2ae
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-11 16:42:22 +03:00 |
|
Artem Tarasov
|
006ac1bb19
|
Update yarn.lock files
|
2020-11-11 16:16:30 +03:00 |
|
Alexey Kostenko
|
63dad62226
|
Web: People: Do not show the loader if the data has already been loaded (Switching from the profile page to the main page)
|
2020-11-11 15:46:46 +03:00 |
|
Alexey Kostenko
|
7a6a9b539b
|
Web: People: Fixed loading of the main page when switching from a profile
|
2020-11-11 14:09:40 +03:00 |
|
Viktor Fomin
|
40e2d85dbd
|
Update yarn.lock files
|
2020-11-11 13:27:17 +03:00 |
|
Viktor Fomin
|
0852dd0814
|
Merge branch 'feature/filter-loader' of github.com:ONLYOFFICE/AppServer into feature/filter-loader
|
2020-11-10 18:25:25 +03:00 |
|
Viktor Fomin
|
2ebd7e882c
|
Web: People: fix first loader
|
2020-11-10 18:20:56 +03:00 |
|
Viktor Fomin
|
df4c89cb91
|
Merge branch 'develop' into feature/filter-loader
|
2020-11-10 18:09:58 +03:00 |
|
Viktor Fomin
|
0490c8c3f0
|
Update yarn.lock files
|
2020-11-10 18:08:51 +03:00 |
|
Viktor Fomin
|
a82551568b
|
Web: People: fix props name
|
2020-11-10 17:30:43 +03:00 |
|
SuhorukovAnton
|
6e2860a7e5
|
Merge branch 'develop' into bugfix/x-www-form-urlencoded
|
2020-11-10 14:51:33 +03:00 |
|
SuhorukovAnton
|
44e565ca37
|
x-www-form-urlencoded: add models
|
2020-11-10 13:41:32 +03:00 |
|
Artem Tarasov
|
4031a609b8
|
Merge branch 'develop' into hotfix/documents-bugfix
# Conflicts:
# web/ASC.Web.Common/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
|
2020-11-10 13:34:04 +03:00 |
|