Artem Tarasov
|
c6d1198ae0
|
deleted console.log, simple condition
|
2020-08-12 16:38:34 +03:00 |
|
Artem Tarasov
|
1503bc105b
|
fix link
|
2020-08-12 11:54:08 +03:00 |
|
Artem Tarasov
|
c4ba6adee2
|
fixed an error related to requesting the state.wizard.wizardCompleted key in PublicRoute. Fixed translation and layout
|
2020-08-06 00:01:41 +03:00 |
|
Artem Tarasov
|
5c8efbd7c5
|
upload license
|
2020-08-05 15:27:28 +03:00 |
|
Artem Tarasov
|
8257c957cb
|
fix upload license
|
2020-08-04 16:39:05 +03:00 |
|
Artem Tarasov
|
5ccc0fc21c
|
upload fix
|
2020-08-04 11:48:43 +03:00 |
|
Artem Tarasov
|
bdeedbbb42
|
added seLicense()
|
2020-08-03 22:36:13 +03:00 |
|
Artem Tarasov
|
555eac84b8
|
add method getIsRequiredLicense
|
2020-08-03 22:04:49 +03:00 |
|
Artem Tarasov
|
afc8803ff4
|
added timezone transfer
|
2020-08-03 16:14:05 +03:00 |
|
Artem Tarasov
|
90cda6ef62
|
fixed redirect to /login
|
2020-08-03 10:57:58 +03:00 |
|
|
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 |
|
Vladislav Makhov
|
1f93279d13
|
Code format
|
2020-07-31 13:23:53 +03:00 |
|
Artem Tarasov
|
2e42c813b8
|
fixed actions
|
2020-07-30 13:50:13 +03:00 |
|
Vladislav Makhov
|
175b0f7bda
|
fix styles
|
2020-07-30 13:25:40 +03:00 |
|
Vladislav Makhov
|
13a4bae881
|
Fix toastr
|
2020-07-29 17:13:40 +03:00 |
|
Artem Tarasov
|
e949ff75ba
|
added Layout
|
2020-07-29 13:05:23 +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 |
|
Vladislav Makhov
|
c54129bf33
|
Recover: fix translation
|
2020-07-28 13:25:09 +03:00 |
|
Vladislav Makhov
|
8d41d2dbc2
|
Register: add translations
|
2020-07-28 11:07:34 +03:00 |
|
Vladislav Makhov
|
5ef9d20f64
|
Register: add working with api
|
2020-07-28 11:07:12 +03:00 |
|
Vladislav Makhov
|
1f1a6891b2
|
Style fixes
|
2020-07-28 10:29:55 +03:00 |
|
Vladislav Makhov
|
ddf497bac4
|
Merge differences from master after header fix
|
2020-07-28 10:24:53 +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
|
cfdf71157f
|
Fix
|
2020-07-27 16:41:15 +03:00 |
|
Vladislav Makhov
|
86170f2923
|
Fix styles
|
2020-07-27 16:36:02 +03:00 |
|
Vladislav Makhov
|
3fdfb6211d
|
Fix translation
|
2020-07-27 15:51:04 +03:00 |
|
Vladislav Makhov
|
1b6d1b24c1
|
Add api post data
|
2020-07-27 14:37:21 +03:00 |
|
Vladislav Makhov
|
64e0a940e1
|
PropTypes
|
2020-07-24 16:20:35 +03:00 |
|
Vladislav Makhov
|
c07f4cf713
|
Set mock
|
2020-07-24 16:04:54 +03:00 |
|
Vladislav Makhov
|
7a3ff1c401
|
Fix validate
|
2020-07-24 15:50:54 +03:00 |
|
Vladislav Makhov
|
5315eb3bfc
|
Fix styles
|
2020-07-24 15:47:08 +03:00 |
|
Vladislav Makhov
|
362f1cca02
|
Fix render
|
2020-07-24 15:35:24 +03:00 |
|
Vladislav Makhov
|
b3abfa05cc
|
Add recover access
|
2020-07-24 15:31:23 +03:00 |
|
Vladislav Makhov
|
68f3139c46
|
Add translations
|
2020-07-24 15:12:31 +03:00 |
|
Vladislav Makhov
|
749702248d
|
Refactor
|
2020-07-24 14:49:01 +03:00 |
|
Vladislav Makhov
|
53cb292fa9
|
Fix styles
|
2020-07-24 14:48:54 +03:00 |
|
Vladislav Makhov
|
e751296adb
|
Unauth header init
|
2020-07-24 14:21:13 +03:00 |
|
Vladislav Makhov
|
14867e5af2
|
Fix view
|
2020-07-23 16:35:04 +03:00 |
|
Vladislav Makhov
|
54117509ff
|
Fix styles
|
2020-07-23 16:07:35 +03:00 |
|
Vladislav Makhov
|
2d5c92b628
|
Move props to a separate file
|
2020-07-23 15:54:55 +03:00 |
|
Vladislav Makhov
|
c146edbc3a
|
Refactoring
|
2020-07-23 15:39:19 +03:00 |
|
Vladislav Makhov
|
7d3d79eb5d
|
Fix styles
|
2020-07-23 15:37:35 +03:00 |
|
Vladislav Makhov
|
3adb650e12
|
Add translations
|
2020-07-23 15:22:24 +03:00 |
|
Vladislav Makhov
|
ae59b91a85
|
Add register modal dialog
|
2020-07-23 15:22:09 +03:00 |
|
Vladislav Makhov
|
0c905a3e7a
|
Rename modal-dialog.js to forgot-password-modal-dialog.js
|
2020-07-23 15:20:59 +03:00 |
|
Vladislav Makhov
|
a92dec4449
|
Add register visibility
|
2020-07-23 09:50:42 +03:00 |
|
Vladislav Makhov
|
967757b348
|
Fix styles
|
2020-07-22 13:47:56 +03:00 |
|
Vladislav Makhov
|
a4d1481faf
|
tabIndex fix
|
2020-07-20 17:41:17 +03:00 |
|
Vladislav Makhov
|
19355a9a58
|
Fix autofocus
|
2020-07-20 17:23:47 +03:00 |
|