Ilya Oleshko
|
cfc40a6487
|
Merge pull request #63 from ONLYOFFICE/feature/new-login-page
Feature/new login page
|
2020-07-31 14:49:18 +03:00 |
|
Vladislav Makhov
|
6463e30762
|
Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page
|
2020-07-31 13:24:08 +03:00 |
|
Vladislav Makhov
|
1f93279d13
|
Code format
|
2020-07-31 13:23:53 +03:00 |
|
Ilya Oleshko
|
d575bc610d
|
Merge branch 'master' into feature/new-login-page
|
2020-07-30 16:03:02 +03:00 |
|
Ilya Oleshko
|
9515f755f4
|
Merge pull request #59 from ONLYOFFICE/feature/input-password-wizard
Feature/input password wizard
|
2020-07-30 16:00:37 +03:00 |
|
Artem Tarasov
|
9d4874cd1a
|
Merge branch 'feature/input-password-wizard' of github.com:ONLYOFFICE/AppServer into feature/input-password-wizard
|
2020-07-30 14:19:26 +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 |
|
Ilya Oleshko
|
cb585ac360
|
Merge branch 'master' into feature/input-password-wizard
|
2020-07-30 13:42:19 +03:00 |
|
Ilya Oleshko
|
ed9d92340a
|
Merge pull request #62 from ONLYOFFICE/hotfix/button
Hotfix/button
|
2020-07-30 13:41:06 +03:00 |
|
Vladislav Makhov
|
175b0f7bda
|
fix styles
|
2020-07-30 13:25:40 +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 |
|
Vladislav Makhov
|
13a4bae881
|
Fix toastr
|
2020-07-29 17:13:40 +03:00 |
|
|
|
18b2935c12
|
fix merge
|
2020-07-29 14:52:37 +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 |
|
Ilya Oleshko
|
77b9836f63
|
Merge branch 'master' into feature/new-login-page
|
2020-07-29 13:50:03 +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 |
|
|
|
585d98f8f4
|
Files: core. replace
|
2020-07-28 15:45:14 +03:00 |
|
|
|
156f7cb534
|
Docker: fix files.
|
2020-07-28 14:21:41 +03:00 |
|
Vladislav Makhov
|
4aed1a7a09
|
Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page
|
2020-07-28 13:32:36 +03:00 |
|
Vladislav Makhov
|
c54129bf33
|
Recover: fix translation
|
2020-07-28 13:25:09 +03:00 |
|
|
|
c325cb139d
|
Settings: added authproviders and login.ashx
|
2020-07-28 11:13:49 +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 |
|
Ilya Oleshko
|
587f25bd56
|
Merge pull request #60 from ONLYOFFICE/feature/header-unauth-view
Feature/header unauth view
|
2020-07-27 17:02:21 +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 |
|
|
|
f9dc19526c
|
Added sendjoininvite, sendadmmail
|
2020-07-24 17:01:20 +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
|
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 |
|
