|
|
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 |
|
Ilya Oleshko
|
fa8a0b92d8
|
Merge branch 'master' into feature/files
|
2020-07-31 15:05:58 +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 |
|
|
|
5cd4a1aaa8
|
Web: Common: fixed SelectedFrame select target
|
2020-07-30 11:55:36 +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 |
|
|
|
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 |
|
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 |
|
|
|
226dfc79df
|
Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files
|
2020-07-24 10:35:05 +03:00 |
|
|
|
f8345f18ce
|
Web: Common: fixed SelectedFrame, added scrolling, fixed selection in tile display
|
2020-07-24 10:34:53 +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 |
|
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 |
|
Alexey
|
965b2e97d3
|
Web: Common: Tile view temporarily hidden
|
2020-07-15 19:05:40 +03:00 |
|
Vladislav Makhov
|
a7b0968252
|
Add social buttons mock
|
2020-07-15 16:18:09 +03:00 |
|
Alexey
|
dd000d197d
|
Web: Common: Removed viewSelector from people module
|
2020-07-15 16:12:10 +03:00 |
|
Vladislav Makhov
|
55a0c01183
|
Fix styles
|
2020-07-15 10:12:49 +03:00 |
|
Alexey
|
e886437d83
|
Web: Files: Fix tile styles
|
2020-07-15 07:30:59 +03:00 |
|
Vladislav Makhov
|
5af854226a
|
Fix styles
|
2020-07-14 13:40:56 +03:00 |
|
Vladislav Makhov
|
806f64abae
|
Fix styles and responsive layout
|
2020-07-14 12:55:09 +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 |
|
Alexey
|
41f59c9130
|
Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files
|
2020-07-13 16:00:51 +03:00 |
|
Ilya Oleshko
|
2d8b694374
|
Web: Common: Fixed order of returning filter props, add new
|
2020-07-13 15:56:24 +03:00 |
|
Alexey
|
665915804e
|
Web: Common: Fixed mobile view selector
|
2020-07-13 15:53:29 +03:00 |
|
Vladislav Makhov
|
001c8c2620
|
Fix responsive layout for textarea
|
2020-07-13 14:16:36 +03:00 |
|
Alexey
|
3ca42459a1
|
Web: Files: Separated the logic of the Filter and ViewSelector
|
2020-07-13 12:10:40 +03:00 |
|
Artem Tarasov
|
491a3d32da
|
added routing after completed Wizard
|
2020-07-10 18:08:22 +03:00 |
|
Vladislav Makhov
|
52dde654b8
|
Fix validate
|
2020-07-10 15:15:38 +03:00 |
|
Vladislav Makhov
|
22029e6468
|
Fix styles
|
2020-07-10 15:13:08 +03:00 |
|
Vladislav Makhov
|
900755fb37
|
Rename translate parameter
|
2020-07-10 14:21:28 +03:00 |
|
Vladislav Makhov
|
4e37091d9b
|
Add email field validation
|
2020-07-10 14:02:44 +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 |
|
|
|
d0f66c66e7
|
Web: Files: Implemented CompleteVersion
|
2020-07-09 22:26:43 +03:00 |
|
Vladislav Makhov
|
d8a97b0457
|
Add translation for placeholder
|
2020-07-09 11:30:13 +03:00 |
|
Vladislav Makhov
|
73e189583e
|
Fix validate
|
2020-07-08 18:28:04 +03:00 |
|
Artem Tarasov
|
6c01f7392f
|
added method setPortalOwner
|
2020-07-08 18:15:50 +03:00 |
|
Vladislav Makhov
|
8c4f94098a
|
Add fields validate
|
2020-07-08 12:47:05 +03:00 |
|
Artem Tarasov
|
07089f2fc7
|
added api methods
|
2020-07-08 11:29:44 +03:00 |
|
Vladislav Makhov
|
d6ae6ae2c0
|
Fix password tooltip
Add translations
|
2020-07-08 09:41:26 +03:00 |
|
Vladislav Makhov
|
ae7bb806df
|
Add adaptive styles, remove unused code
|
2020-07-08 09:11:51 +03:00 |
|
|
|
a18212da87
|
Web: Files: added files convert to row, fixed api
|
2020-07-07 17:55:01 +03:00 |
|
Artem Tarasov
|
779eb155b5
|
added action getPortalCultures, fix routing
|
2020-07-07 14:50:31 +03:00 |
|
Vladislav Makhov
|
200b027092
|
Add translation, fix styles
|
2020-07-07 14:17:26 +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 |
|
|
|
925654c3f6
|
Web: Common: added convert api
|
2020-07-07 10:27:04 +03:00 |
|
Vladislav Makhov
|
44c9c728c3
|
Fix title styles
|
2020-07-06 19:19:55 +03:00 |
|
Vladislav Makhov
|
bc2f1fa670
|
add mock on send recover
|
2020-07-06 18:08:47 +03:00 |
|
Artem Tarasov
|
1a730f0750
|
fix redirect to /wizard
|
2020-07-06 18:08:34 +03:00 |
|
Vladislav Makhov
|
13a1218dd9
|
fix z-index
|
2020-07-06 16:12:19 +03:00 |
|
Vladislav Makhov
|
209262b622
|
Add "Register", fix styles
|
2020-07-06 16:06:37 +03:00 |
|
Vladislav Makhov
|
63dc366083
|
Remove unused component from import
|
2020-07-06 16:04:34 +03:00 |
|
Artem Tarasov
|
e1ce565504
|
added condition loading Wizard in PrivateRoute
|
2020-07-06 11:00:56 +03:00 |
|
Vladislav Makhov
|
f170ce525d
|
Add translation for recover access
|
2020-07-03 16:28:20 +03:00 |
|
Artem Tarasov
|
6f456eaa4e
|
cleanup
|
2020-07-03 12:20:07 +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 |
|
