|
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 |
|
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 |
|
Vladislav Makhov
|
c54129bf33
|
Recover: fix translation
|
2020-07-28 13:25:09 +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
|
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 |
|
Vladislav Makhov
|
bda1b1c6a8
|
Fix console errors
|
2020-07-20 16:07:36 +03:00 |
|
Vladislav Makhov
|
36fc8875fb
|
Fix console errors
|
2020-07-20 16:01:59 +03:00 |
|
Vladislav Makhov
|
6b39d62e0b
|
Delete unused code
|
2020-07-20 16:01:11 +03:00 |
|
Vladislav Makhov
|
dabba4514e
|
Fix styles
|
2020-07-20 15:39:33 +03:00 |
|
Vladislav Makhov
|
12bc78f3a9
|
Fix console error
|
2020-07-20 10:17:21 +03:00 |
|
Vladislav Makhov
|
30631f0ce5
|
Fix validate
|
2020-07-18 08:37:25 +03:00 |
|
Vladislav Makhov
|
e769ff55c2
|
Fix styles
|
2020-07-18 08:35:28 +03:00 |
|
Vladislav Makhov
|
5af854226a
|
Fix styles
|
2020-07-14 13:40:56 +03:00 |
|
Vladislav Makhov
|
3b8c2f0e69
|
Fix responsive layout for start login page
Move header logo to a separate component
|
2020-07-13 16:20:02 +03:00 |
|
Vladislav Makhov
|
001c8c2620
|
Fix responsive layout for textarea
|
2020-07-13 14:16:36 +03:00 |
|
Vladislav Makhov
|
22029e6468
|
Fix styles
|
2020-07-10 15:13:08 +03:00 |
|
Vladislav Makhov
|
b3d2db8d10
|
Add error messages
|
2020-07-10 13:48:54 +03:00 |
|
Vladislav Makhov
|
b508ca2cd4
|
Render fixes
|
2020-07-10 13:02:44 +03:00 |
|
Vladislav Makhov
|
229b63e04d
|
Fix button view in aside modal
|
2020-07-10 13:00:59 +03:00 |
|
Vladislav Makhov
|
81f6a041c7
|
return 100% width
|
2020-07-10 10:46:22 +03:00 |
|
Vladislav Makhov
|
73e189583e
|
Fix validate
|
2020-07-08 18:28:04 +03:00 |
|
Vladislav Makhov
|
8c4f94098a
|
Add fields validate
|
2020-07-08 12:47:05 +03:00 |
|
Vladislav Makhov
|
ae7bb806df
|
Add adaptive styles, remove unused code
|
2020-07-08 09:11:51 +03:00 |
|
Vladislav Makhov
|
3016af962c
|
Add input handlers
|
2020-07-07 12:27:01 +03:00 |
|
Vladislav Makhov
|
67cc4f5abc
|
Add props validation
|
2020-07-07 10:43:47 +03:00 |
|
Vladislav Makhov
|
d113f17b2b
|
Add pointer cursor, fix "onRecoverClick" callback event.
|
2020-07-07 10:42:31 +03:00 |
|
Vladislav Makhov
|
bc2f1fa670
|
add mock on send recover
|
2020-07-06 18:08:47 +03:00 |
|
Vladislav Makhov
|
63dc366083
|
Remove unused component from import
|
2020-07-06 16:04:34 +03:00 |
|
Vladislav Makhov
|
f170ce525d
|
Add translation for recover access
|
2020-07-03 16:28:20 +03:00 |
|
Vladislav Makhov
|
2e00b4533f
|
Add console.log
|
2020-07-03 11:40:12 +03:00 |
|
Vladislav Makhov
|
aa4a8e4699
|
Add "recover access" functionality
|
2020-07-03 10:30:38 +03:00 |
|
Vladislav Makhov
|
4f27d908f3
|
Redesign styles
|
2020-07-02 11:44:17 +03:00 |
|
Vladislav Makhov
|
6015a1d101
|
update prop validation
|
2020-06-30 14:37:43 +03:00 |
|
Vladislav Makhov
|
f7799d3bdb
|
Revert "Hide burger menu on Login Page"
This reverts commit fdd2df9265 .
|
2020-06-30 14:35:13 +03:00 |
|
Vladislav Makhov
|
fdd2df9265
|
Hide burger menu on Login Page
|
2020-06-30 13:18:26 +03:00 |
|
Vladislav Makhov
|
df996552c3
|
Make Header component is available on login page
|
2020-06-30 06:26:31 +03:00 |
|
|
c248db6cf8
|
Web: Common: fixed profile avatar size
|
2020-02-18 14:16:03 +03:00 |
|
|
c69a24f524
|
Merge branch 'master' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore
|
2020-02-17 08:57:28 +03:00 |
|
|
d3344d08c4
|
Web: Common: fixed clicked logo color
|
2020-02-17 08:57:11 +03:00 |
|
Ilya Oleshko
|
4321480ba7
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-14 16:29:33 +03:00 |
|
Ilya Oleshko
|
c711bd1254
|
Web: Common: Layout: Fixed reload on ProfileMenu items click
|
2020-02-14 16:28:53 +03:00 |
|
|
973beff6eb
|
Web: Common: added link to logo icons
|
2020-02-14 16:04:45 +03:00 |
|
Ilya Oleshko
|
a594a67bab
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-14 12:22:33 +03:00 |
|
Ilya Oleshko
|
ae73b2696d
|
Web: Common: Layout: Fixed log display
|
2020-02-14 12:22:15 +03:00 |
|
|
3c0af2f86c
|
Web: Common: added logo click, added display of the full logo in the absence of a title
|
2020-02-14 11:11:34 +03:00 |
|
Ilya Oleshko
|
9b04501b43
|
Web: Common: Layout: Fixed styling icons of modules
|
2020-02-14 09:36:14 +03:00 |
|
|
2f0339ed7d
|
Web: Common: use utils media size
|
2020-02-13 13:59:26 +03:00 |
|
|
9ee1729b78
|
web: Common: Fixed header height
|
2020-02-13 12:37:49 +03:00 |
|
|
cca1c70522
|
Merge branch 'feature/redesign' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/redesign
|
2020-02-13 11:39:18 +03:00 |
|
|
db0c592f82
|
Web: Common: fixed module title line-height
|
2020-02-13 11:39:10 +03:00 |
|
|
133ba4f715
|
Merge branch 'feature/redesign' of github.com:ONLYOFFICE/AppServer into feature/redesign
|
2020-02-13 11:12:58 +03:00 |
|
|
507cd94e98
|
Merge branch 'master' into feature/redesign
# Conflicts:
# web/ASC.Web.Common/package.json
|
2020-02-13 11:09:37 +03:00 |
|
|
b5510540aa
|
Web: Common: added logo to header
|
2020-02-13 10:38:49 +03:00 |
|
Ilya Oleshko
|
e99d1acc3c
|
Web: Common: Layout: Added use of icons from module
|
2020-02-12 16:18:23 +03:00 |
|
|
e5d198d8c3
|
ASC.Web.Common: changed header and navigation on desktop view
|
2020-02-10 11:56:27 +03:00 |
|
Ilya Oleshko
|
82b2e7ece7
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-02-05 15:43:45 +03:00 |
|
Ilya Oleshko
|
6ac5a59d8f
|
Web: Common: Layout: Fixed ProfileMenu usage
|
2020-02-05 15:41:52 +03:00 |
|
Daniil Senkiv
|
dcc7460a25
|
Web.Common: removed blue border on tap from touch devices
|
2020-02-03 16:07:20 +03:00 |
|
Daniil Senkiv
|
0cb31bfa24
|
Web.Common, People.Client: triggered updating modules language after changing user language
|
2020-01-23 10:58:08 +03:00 |
|
Daniil Senkiv
|
d4e083cfaa
|
Web.Common: Layout: fixed render ProfileActions component after changing language
|
2020-01-22 18:04:48 +03:00 |
|
Ilya Oleshko
|
84973627c2
|
Web: Common: Layout: Fixed ProfileMenu usage
|
2020-01-20 10:40:20 +03:00 |
|
|
c281e25ef3
|
ASC.Web.Common: Layout: fixed NavItem hover styles and onBadgeClick
|
2020-01-14 16:45:46 +03:00 |
|
Ilya Oleshko
|
8ae0bf7a2c
|
Web: Common: Layout: Fixed Badge component styling
|
2020-01-14 14:56:16 +03:00 |
|
Ilya Oleshko
|
805b337101
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-01-13 15:36:51 +03:00 |
|
Ilya Oleshko
|
8a6af22aa0
|
Web: Common: Layout: Fixed Badge component usage
|
2020-01-13 15:36:10 +03:00 |
|
Daniil Senkiv
|
1147eb4684
|
Web.Common: Layout: fixed style for NavItem component
|
2020-01-13 15:32:54 +03:00 |
|
|
a424b5cf67
|
web: Common: Added withProvider decorator for storybook
|
2020-01-10 16:58:46 +03:00 |
|
Ilya Oleshko
|
e1a2d295d1
|
Web: Common: Layout: Added backdrop for ProfileActions on touch devices
|
2019-12-27 11:46:50 +03:00 |
|
Daniil Senkiv
|
9c60f10deb
|
web.common: applied Link to Layout sub-components
|
2019-12-25 11:30:29 +03:00 |
|
Daniil Senkiv
|
d103b5003d
|
web.common: Layout: NavItem: applied Link component for wrapper, revert (37732015b3 )
|
2019-12-24 12:03:01 +03:00 |
|
Daniil Senkiv
|
37732015b3
|
web.common: Layout: NavItem: applied Link component
|
2019-12-24 11:53:34 +03:00 |
|
|
0133c45840
|
ASC.Web.Common: Layout, PageLayout : indentation corrected
|
2019-12-23 16:41:52 +03:00 |
|
|
79931ef547
|
ASC.Web.Common: Layout: fix nav-item style
|
2019-12-23 15:53:10 +03:00 |
|
|
8c1e7933de
|
ASC.Web.Common: Layout: fix header style
|
2019-12-23 15:52:30 +03:00 |
|
|
a808e803aa
|
ASC.Web.Common: Layout: fix opened logo style
|
2019-12-23 15:52:04 +03:00 |
|
|
445fd9c1c8
|
ASC.Web.Common: Layout: hover delay increased
|
2019-12-23 15:51:08 +03:00 |
|
|
b686e99f16
|
web: Common: Moved Layout and PageLayout to asc-web-common
|
2019-12-20 14:35:53 +03:00 |
|