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
|
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 |
|
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 |
|
Alexey
|
dffe73d470
|
Merge branch 'feature/files' into feature/customization
|
2020-07-29 08:54:00 +03:00 |
|
|
|
0231e60cc7
|
Merge branch 'master' into feature/files
# Conflicts:
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/src/components/icons/svg/index.js
# web/ASC.Web.Components/src/index.js
|
2020-07-28 17:34:46 +03:00 |
|
|
|
585d98f8f4
|
Files: core. replace
|
2020-07-28 15:45:14 +03:00 |
|
|
|
2371953954
|
Settings: fix greetingsettings
|
2020-07-28 14:41:51 +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 |
|
Alexey
|
e7d3b6000b
|
Web: Client: Settings: Fix mobile styles on customization page
|
2020-07-28 10:17:32 +03:00 |
|
Alexey
|
7982194f5a
|
Web: Client: Settings: Fix language-and-time-zone and customization pages, refactoring
|
2020-07-27 18:13: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 |
|
Alexey
|
3ec06cab83
|
Web: Client: Settings: Fix custom-tiles page, refactoring
|
2020-07-27 17:24:41 +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 |
|
Alexey
|
27055fb58a
|
Web: Client: Settings: Refactoring customization page
|
2020-07-27 14:39:28 +03:00 |
|
Vladislav Makhov
|
1b6d1b24c1
|
Add api post data
|
2020-07-27 14:37:21 +03:00 |
|
Alexey
|
c2ad40995e
|
Web: Client: Settings: Added custom-titles page, updated customization page
|
2020-07-27 09:38:02 +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 |
|
Artem Tarasov
|
aca4ce9c32
|
added checking, refacktoring
|
2020-07-24 15:30:11 +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 |
|
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
|
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 |
|
|
|
3d449d4863
|
web: components: bump version
|
2020-07-24 13:53:03 +03:00 |
|
|
|
779c81037f
|
Web: Components: hid the drop-down in the progress bar
|
2020-07-24 13:51:10 +03:00 |
|
|
|
eabb06f8a8
|
Web: Files: hid the progress settings in the progress bar
|
2020-07-24 13:48:24 +03:00 |
|
