|
|
72ae1f5e9b
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Common/src/api/settings/index.js
|
2020-07-31 16:49:54 +03:00 |
|
Artem Tarasov
|
d8f25319a1
|
fixed redirect drom login page
|
2020-07-31 14:31:46 +03:00 |
|
Artem Tarasov
|
a1d2c2c4f0
|
Merge branch 'master' into feature/Wizard
|
2020-07-30 16:04:11 +03:00 |
|
Ilya Oleshko
|
d575bc610d
|
Merge branch 'master' into feature/new-login-page
|
2020-07-30 16:03:02 +03:00 |
|
Artem Tarasov
|
0cb324682a
|
web: components: bump version
|
2020-07-30 14:17:51 +03:00 |
|
Artem Tarasov
|
3674d56373
|
added display setting for texttooltip
|
2020-07-30 14:16:44 +03:00 |
|
Artem Tarasov
|
84773e6c13
|
Merge branch 'master' into feature/input-password-wizard
|
2020-07-30 13:51:51 +03:00 |
|
Artem Tarasov
|
d09b512126
|
web: components: bump version
|
2020-07-30 13:08:28 +03:00 |
|
Vladislav Makhov
|
3728ab1018
|
Login checkbox: fix console error
|
2020-07-29 21:32:50 +03:00 |
|
Vladislav Makhov
|
871b03a4cf
|
Recover modal: fix console errors
|
2020-07-29 17:44:42 +03:00 |
|
Artem Tarasov
|
f09a959e84
|
fix
|
2020-07-29 14:01:29 +03:00 |
|
Artem Tarasov
|
232351af6c
|
fix
|
2020-07-29 14:00:59 +03:00 |
|
Artem Tarasov
|
2bdac8f586
|
fix
|
2020-07-29 13:50:59 +03:00 |
|
Artem Tarasov
|
4c9a7dadfd
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# web/ASC.Web.Common/src/api/settings/index.js
|
2020-07-29 11:52:18 +03:00 |
|
Artem Tarasov
|
53e8550621
|
fixed style, added props minWidth
|
2020-07-29 11:32:57 +03:00 |
|
Artem Tarasov
|
8015f5bf90
|
web: components: bump version
|
2020-07-29 09:59:58 +03:00 |
|
Artem Tarasov
|
c4ce07bec7
|
fix layout
|
2020-07-29 09:59:39 +03:00 |
|
Artem Tarasov
|
c14d2a47dc
|
Merge branch 'master' into feature/input-password-wizard
# Conflicts:
# web/ASC.Web.Components/package.json
|
2020-07-29 09:39:01 +03:00 |
|
Vladislav Makhov
|
39150efb4f
|
Merge branch 'master' into feature/new-login-page
# Conflicts:
# web/ASC.Web.Common/src/components/Layout/i18n.js
# web/ASC.Web.Common/src/components/Layout/index.js
# web/ASC.Web.Common/src/components/Layout/locales/en/translation.json
# web/ASC.Web.Common/src/components/Layout/locales/ru/translation.json
|
2020-07-27 17:28:28 +03:00 |
|
Vladislav Makhov
|
05ade13438
|
Add UnionIcon
|
2020-07-24 15:02:34 +03:00 |
|
Vladislav Makhov
|
01341cf4ba
|
web: components: bump version
|
2020-07-24 15:02:15 +03:00 |
|
Vladislav Makhov
|
20b67c8261
|
Fix Box export
|
2020-07-24 14:18:03 +03:00 |
|
Vladislav Makhov
|
aa1f8959ab
|
web: components: bump version
|
2020-07-24 14:17:37 +03:00 |
|
Artem Tarasov
|
f6d0e5aab7
|
fix style
|
2020-07-24 12:14:41 +03:00 |
|
Artem Tarasov
|
64d488a550
|
Merge branch 'master' into feature/Wizard
|
2020-07-24 08:49:38 +03:00 |
|
Artem Tarasov
|
fb61263fde
|
web: components: bump version
|
2020-07-23 19:12:42 +03:00 |
|
Artem Tarasov
|
499451892e
|
Merge branch 'master' into feature/input-password-wizard
|
2020-07-23 19:05:56 +03:00 |
|
Artem Tarasov
|
cfd0cf7bb6
|
fix tests
|
2020-07-23 18:45:00 +03:00 |
|
Artem Tarasov
|
da546fbb86
|
web: components: bump version
|
2020-07-23 16:43:51 +03:00 |
|
Artem Tarasov
|
08f5b5e0f8
|
fixed outline, fixed error when file upload refused, export fix
|
2020-07-23 16:42:49 +03:00 |
|
Artem Tarasov
|
5bf6f7de50
|
added onInputFileHandler
|
2020-07-23 16:26:32 +03:00 |
|
Artem Tarasov
|
8fd658ced9
|
added FileInput
|
2020-07-23 15:52:20 +03:00 |
|
Artem Tarasov
|
92a09334a4
|
Merge branch 'master' into feature/Wizard
|
2020-07-23 13:42:21 +03:00 |
|
Artem Tarasov
|
ad65f3eb1b
|
web: components: bump version
|
2020-07-23 13:39:15 +03:00 |
|
Artem Tarasov
|
64083849ff
|
Merge branch 'master' into feature/input-password-wizard
|
2020-07-23 13:38:52 +03:00 |
|
Vladislav Makhov
|
d192f50953
|
Merge branch 'master' into feature/new-login-page
# Conflicts:
# web/ASC.Web.Components/src/components/input-block/index.js
# web/ASC.Web.Components/src/components/password-input/index.js
|
2020-07-22 15:51:48 +03:00 |
|
Artem Tarasov
|
8c5688387b
|
web: components: bump version
|
2020-07-22 13:24:15 +03:00 |
|
Artem Tarasov
|
11fb04e75d
|
added tests
|
2020-07-22 13:23:28 +03:00 |
|
Artem Tarasov
|
1a0de3fe01
|
update readme
|
2020-07-22 13:16:50 +03:00 |
|
Artem Tarasov
|
65c7381eba
|
layout fix
|
2020-07-22 11:34:31 +03:00 |
|
Artem Tarasov
|
d42cffb0ce
|
added prop to show TextTooltip
|
2020-07-22 11:26:42 +03:00 |
|
Artem Tarasov
|
ab2ee3f26f
|
added prop to hide Tooltip
|
2020-07-22 10:10:21 +03:00 |
|
Artem Tarasov
|
626fcda87d
|
added prop to hide newPasswordButton
|
2020-07-22 09:20:20 +03:00 |
|
Artem Tarasov
|
5e3b3228d6
|
web: components: bump version
|
2020-07-21 17:30:21 +03:00 |
|
Artem Tarasov
|
41daa4e157
|
Merge branch 'master' into feature/input-file
|
2020-07-21 17:29:58 +03:00 |
|
Artem Tarasov
|
923c1bf0fa
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# web/ASC.Web.Components/src/components/password-input/index.js
|
2020-07-21 15:14:10 +03:00 |
|
|
|
d085530b8d
|
web: components: bump version
|
2020-07-21 15:02:46 +03:00 |
|
|
|
d4bf98d932
|
Web: Components: Added large size to propTypes
|
2020-07-21 15:02:32 +03:00 |
|
Artem Tarasov
|
1a8aacebdc
|
Merge branch 'master' into feature/Wizard
# Conflicts:
# common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
# common/ASC.Resource.Manager/Startup.cs
# web/ASC.Web.Components/src/components/password-input/index.js
|
2020-07-21 13:13:47 +03:00 |
|
Vladislav Makhov
|
16b12e210a
|
Fix console errors
|
2020-07-20 15:39:46 +03:00 |
|
