Commit Graph

4045 Commits

Author SHA1 Message Date
562abfcdc9 DI: refactoring 2020-07-17 13:52:28 +03:00
Artem Tarasov
8ab56cbb18 Merge branch 'master' into feature/input-file 2020-07-17 12:49:25 +03:00
Artem Tarasov
397b12973f added text-overflow 2020-07-17 12:16:53 +03:00
Artem Tarasov
d782575f42 fix onInput 2020-07-17 11:49:54 +03:00
Artem Tarasov
1232398789 added input accept props 2020-07-17 11:34:52 +03:00
Artem Tarasov
1919277107 added onInputFile handler 2020-07-17 11:31:23 +03:00
Vladislav Makhov
787b3c2a80 Merge branch 'master' into feature/new-login-page
# Conflicts:
#	web/ASC.Web.Components/src/components/password-input/index.js
#	web/ASC.Web.Components/src/components/password-input/password-input.stories.js
2020-07-17 10:34:33 +03:00
Artem Tarasov
3d6e2c667f fixed hover style 2020-07-17 10:15:58 +03:00
Artem Tarasov
496457c427 warning, error, active, hover style 2020-07-16 23:32:18 +03:00
Artem Tarasov
7be7073908 added styles for border 2020-07-16 17:40:45 +03:00
Artem Tarasov
8e817c7c91 Merge branch 'master' into feature/input-file 2020-07-16 16:42:50 +03:00
Artem Tarasov
b599d5f163 added styles for property size 2020-07-16 16:38:34 +03:00
Vladislav Makhov
20fcb5dab7 Merge branch 'master' into feature/field-container-label-view 2020-07-16 16:07:48 +03:00
42b0275f5c web: components: bump version 2020-07-16 15:54:52 +03:00
f0b50f7185 web: common: bump version 2020-07-16 15:54:24 +03:00
ec8c6a5ddb Fixed security vulnerability in lodash 2020-07-16 15:54:04 +03:00
Vladislav Makhov
95f96d9a7c web: components: bump version 2020-07-16 15:44:46 +03:00
Vladislav Makhov
01867762f0 Update README.md 2020-07-16 15:44:28 +03:00
Vladislav Makhov
587058c4c1 Add visibility of field label section 2020-07-16 15:44:15 +03:00
Vladislav Makhov
85dcdb5689 Merge branch 'master' into feature/password-input-simple-view 2020-07-16 14:32:11 +03:00
Vladislav Makhov
8a907a0df7 Fix hover color 2020-07-16 14:27:42 +03:00
Artem Tarasov
045688390b Merge branch 'master' into feature/input-file 2020-07-16 13:09:37 +03:00
Artem Tarasov
4fb3b16fd2 add scale 2020-07-16 13:08:09 +03:00
Artem Tarasov
e42d5d2c3f icon position fix 2020-07-16 12:37:22 +03:00
Artem Tarasov
b5c066c957 fixed Loader size and position 2020-07-16 12:31:18 +03:00
Artem Tarasov
5a5ebe651e fixed Loader in Button and propTypes 2020-07-16 12:10:50 +03:00
Vladislav Makhov
d258a640c0 web: components: bump version 2020-07-16 11:59:31 +03:00
Vladislav Makhov
fd6d90a797 Fix styles 2020-07-16 11:59:17 +03:00
Vladislav Makhov
423f148cfb Update icon pic 2020-07-16 11:58:58 +03:00
Artem Tarasov
eb97b2f212 created Component FileInput 2020-07-16 11:42:10 +03:00
Vladislav Makhov
2ffb65eec8 Fix icon 2020-07-16 10:53:12 +03:00
Vladislav Makhov
545a5d0431 Update README.md 2020-07-16 10:38:13 +03:00
Vladislav Makhov
2a4df5fd55 Add simple view option 2020-07-16 10:30:30 +03:00
Artem Tarasov
cdf487bc74 Merge branch 'master' into feature/Button-large 2020-07-15 22:17:48 +03:00
Artem Tarasov
e2b9789e6f added test for large prop 2020-07-15 19:14:00 +03:00
Artem Tarasov
c6b81a3aac added description property size="large" in readme 2020-07-15 19:00:36 +03:00
Artem Tarasov
550da8cbe7 fix padding 2020-07-15 18:49:12 +03:00
Artem Tarasov
3004890d98 fixed paddings 2020-07-15 17:58:33 +03:00
Artem Tarasov
4b942c6964 added min-width 2020-07-15 17:34:01 +03:00
Vladislav Makhov
e5bdfe32d7 Merge branch 'master' into feature/text-input-large 2020-07-15 17:24:33 +03:00
Artem Tarasov
db7669eccd added button size large in all.button.stories.js 2020-07-15 17:20:11 +03:00
Artem Tarasov
4ee0cee88d added large button size 2020-07-15 17:17:37 +03:00
Vladislav Makhov
5393bec4af web: components: bump version 2020-07-15 17:17:18 +03:00
Vladislav Makhov
1c0db2edfd Update README.md 2020-07-15 17:09:29 +03:00
Vladislav Makhov
eac05e5750 Add large prop 2020-07-15 17:07:58 +03:00
Vladislav Makhov
a7b0968252 Add social buttons mock 2020-07-15 16:18:09 +03:00
e10ac2ccfa BaseStartup: refactoring 2020-07-15 15:33:44 +03:00
7f095f03d1 Merge branch 'master' into feature/Wizard
# Conflicts:
#	common/ASC.Resource.Manager/Startup.cs
#	config/kafka.json
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.Designer.cs
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.de.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.es.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.fr.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.it.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.resx
#	web/ASC.Web.Core/PublicResources/UserControlsCommonResource.ru.resx
#	web/ASC.Web.Core/TariffSettings.cs
2020-07-15 15:23:28 +03:00
Artem Tarasov
2469126f7a hidden input license file 2020-07-15 14:26:49 +03:00
Artem Tarasov
7e3ba192b1 fixed file name in input type=file 2020-07-15 14:01:29 +03:00
baa71247d8 Merge branch 'master' into feature/general-startup 2020-07-15 13:06:32 +03:00
533935906f Resource: fix 2020-07-15 12:55:31 +03:00
Artem Tarasov
6d2deca3c6 layout fix 2020-07-15 11:47:21 +03:00
Vladislav Makhov
55a0c01183 Fix styles 2020-07-15 10:12:49 +03:00
Artem Tarasov
84ca1146a0 layout fix 2020-07-14 17:46:00 +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
505e98b1a1 Add textAlign prop (left as default) 2020-07-14 12:54:11 +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
7dd8308069 Fix height scale 2020-07-13 14:15:44 +03:00
Vladislav Makhov
c085d3c00d Fix styles 2020-07-13 12:28:13 +03:00
Artem Tarasov
80a5e224e8 added PropTypes and deleted console.log 2020-07-12 12:34:42 +03:00
Artem Tarasov
0e2da28101 added getPortalSettings after wizard completed 2020-07-10 19:00:21 +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
Artem Tarasov
f8e9cfc5f0 added onKeyPressHandler 2020-07-10 13:10: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
Artem Tarasov
486dbe1fb5 layout fix 2020-07-10 11:26:16 +03:00
Vladislav Makhov
81f6a041c7 return 100% width 2020-07-10 10:46:22 +03:00
SuhorukovAnton
f8e42cbd08 api-defaultvalue: add JsonPropertyNames 2020-07-09 22:06:08 +03:00
SuhorukovAnton
28e70e91f6 api-defaultvalue: add JsonPropertyNames 2020-07-09 18:37:36 +03:00
Artem Tarasov
92fdf4c41d added Toast 2020-07-09 17:57:53 +03:00
Artem Tarasov
5d1043af13 added Loader 2020-07-09 15:11:08 +03:00
Artem Tarasov
11be0a1ef3 added in PasswordInput NewPasswordButtonVisible from /new-login-page 2020-07-09 14:12:53 +03:00
Artem Tarasov
27ddc44211 added truncate label timezone 2020-07-09 12:47:07 +03:00
Artem Tarasov
8cacf241d5 fix 2020-07-09 11:42:28 +03:00
Vladislav Makhov
d8a97b0457 Add translation for placeholder 2020-07-09 11:30:13 +03:00
5988855b61 Fix License 2020-07-08 18:30:23 +03:00
Vladislav Makhov
73e189583e Fix validate 2020-07-08 18:28:04 +03:00
Vladislav Makhov
142f4c10fa Update README.md 2020-07-08 18:27:50 +03:00
Artem Tarasov
6c01f7392f added method setPortalOwner 2020-07-08 18:15:50 +03:00
Vladislav Makhov
2013cf61da Add hasError prop 2020-07-08 16:57:34 +03:00
Artem Tarasov
6dd5c338fe fix translation and layout 2020-07-08 15:34:29 +03:00
SuhorukovAnton
8b5ab8c9a4 api-defaultvalue: delete DataContracts 2020-07-08 13:10:09 +03:00
Artem Tarasov
86be9d522b render optimization 2020-07-08 13:04:23 +03:00
Vladislav Makhov
8c4f94098a Add fields validate 2020-07-08 12:47:05 +03:00
Artem Tarasov
b3fe0f3fbc added .DS_Store in .gitignore 2020-07-08 11:44:06 +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
SuhorukovAnton
9d069de30a general-startup: transform GeneralStartup to BaseStartup 2020-07-07 23:00:39 +03:00
Artem Tarasov
621d04db58 added select language 2020-07-07 16:24:57 +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
SuhorukovAnton
a43c14dcb3 Merge branch 'master' into feature/api-defaultvalue 2020-07-07 12:38:35 +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
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
7cccd43f22 fix 2020-07-06 15:14:20 +03:00
Artem Tarasov
c0e5626c1f deleted unnecessary func and action in Wizard 2020-07-06 14:26:47 +03:00
Artem Tarasov
75b591ff1e added tooltip and translation Password 2020-07-06 13:38:25 +03:00
Artem Tarasov
83fc1b18c6 added Loader in Wizard page 2020-07-06 12:57:43 +03:00
Artem Tarasov
e1ce565504 added condition loading Wizard in PrivateRoute 2020-07-06 11:00:56 +03:00
SuhorukovAnton
00558dd95f general-startup: fix 2020-07-06 10:56:17 +03:00
SuhorukovAnton
71d90ebfa2 general-startup: fix 2020-07-03 18:57:59 +03:00
Vladislav Makhov
f170ce525d Add translation for recover access 2020-07-03 16:28:20 +03:00
SuhorukovAnton
2f5491f1ba general-startup: first version 2020-07-03 14:47:27 +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
SuhorukovAnton
6647217371 api-defaultvalue: fix 2020-07-02 23:51:18 +03:00
da9423bfdc Wizard: api 2020-07-02 17:11:59 +03:00
Artem Tarasov
be462db7d9 Fixed styles, add fakeToken in auth/reducer, added redirect to Wizard in PrivateRoute 2020-07-02 16:56:00 +03:00
Vladislav Makhov
4f27d908f3 Redesign styles 2020-07-02 11:44:17 +03:00
Artem Tarasov
94ee712c0e fixed warning 2020-06-30 17:29:54 +03:00
SuhorukovAnton
0ec331db76 api-defaultvalue: fix 2020-06-30 16:56:38 +03:00
Artem Tarasov
7326d54e96 added file upload 2020-06-30 14:43:24 +03:00
Vladislav Makhov
6015a1d101 update prop validation 2020-06-30 14:37:43 +03:00
Artem Tarasov
3286df2572 added Redux 2020-06-30 14:35:16 +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
5d9b713859 Add possibility to hide password generation button 2020-06-30 10:31:12 +03:00
Vladislav Makhov
bea394c230 Fix margin top 2020-06-30 09:48:06 +03:00
Vladislav Makhov
8742342873 Remove cancel button from modal 2020-06-30 08:13:12 +03:00
Vladislav Makhov
199d266f18 Fix header style in modal window 2020-06-30 08:12:21 +03:00
Vladislav Makhov
582f6b1110 Fix font style 2020-06-30 08:01:54 +03:00
Vladislav Makhov
1ea6db8538 Update password field using PasswordInput component 2020-06-30 07:28:04 +03:00
Vladislav Makhov
97fa7010ea Set scale prop at the "sign in" button 2020-06-30 06:48:14 +03:00
Vladislav Makhov
a93ee38107 Rename remember text 2020-06-30 06:45:30 +03:00
Vladislav Makhov
fb386a8783 Change "forgot password" styles 2020-06-30 06:44:08 +03:00
Vladislav Makhov
8eaf1f02b7 Make greetingTitle black 2020-06-30 06:39:14 +03:00
Vladislav Makhov
df996552c3 Make Header component is available on login page 2020-06-30 06:26:31 +03:00
Artem Tarasov
80a6811f4f fixed export Box Component 2020-06-29 18:09:27 +03:00
Artem Tarasov
ed48224a7d added Redux Wizard 2020-06-29 18:07:05 +03:00
b035a6347e Notify: fix 2020-06-29 17:49:15 +03:00
Vladislav Makhov
05263bf36e Remove logo from FormContainer 2020-06-29 17:12:32 +03:00
feedc8a1b0 Core: fix 2020-06-29 16:53:55 +03:00
eb6be17333 Backup: removed notify reference 2020-06-29 12:32:43 +03:00
Artem Tarasov
14ddcfac38 Added translation 2020-06-29 11:34:32 +03:00
57454bae0c References updated 2020-06-28 16:55:21 +03:00
461fc55f22
Merge pull request #45 from ONLYOFFICE/feature/backup
Feature/backup
2020-06-28 16:23:36 +03:00
155e0b2c9b Backup: fix 2020-06-28 14:46:16 +03:00
Artem Tarasov
efd6e652da deleted sub-components 2020-06-26 17:57:08 +03:00
Artem Tarasov
d911f80342 Added GroupButton for TimeZones and Languages 2020-06-26 17:47:09 +03:00
Artem Tarasov
03a355be7f added input file 2020-06-26 17:10:32 +03:00
Artem Tarasov
f412dcea1d added Modal Window 2020-06-26 13:57:05 +03:00
Artem Tarasov
07e306c6db added alternative display if owner exists 2020-06-26 11:44:32 +03:00
eafafef8df Thumb: fix 2020-06-26 11:02:21 +03:00
29a0e752bb Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
#	web/ASC.Web.Api/Controllers/PortalController.cs
2020-06-25 19:21:42 +03:00
Artem Tarasov
9cfa89c076 Added layout for mobile devices 2020-06-25 17:47:55 +03:00
23945aeb24 Api: backup removed 2020-06-25 16:25:03 +03:00
b01b3d85f8 Backup: fix 2020-06-25 16:10:28 +03:00
d53b11967a Merge branch 'master' into feature/backup 2020-06-25 15:37:53 +03:00
1871959768 fix 2020-06-25 15:17:22 +03:00
2fe2c2167b Merge branch 'master' into feature/thumbnails
# Conflicts:
#	ASC.Web.sln
2020-06-25 15:01:38 +03:00
d14313c6c1 References updated 2020-06-25 14:38:34 +03:00
Artem Tarasov
31361df8ed Wizard page design fix 2020-06-25 12:33:10 +03:00
SuhorukovAnton
e21d99e361 Thumbnails: fix 2020-06-23 14:19:12 +03:00
SuhorukovAnton
cce4d5fa7a Thumbnails: delete unnecessary 2020-06-23 14:14:13 +03:00
SuhorukovAnton
4e839c9b11 Backup: transfer to ASC.Data.Backup 2020-06-23 13:48:36 +03:00
f43816738b Files: fix 2020-06-22 21:58:16 +03:00
SuhorukovAnton
6f4bd59c6d Thumbnails: refactoring 2020-06-21 14:45:31 +03:00
Artem Tarasov
36f11ff673 Created page Wizard 2020-06-19 16:47:41 +03:00
SuhorukovAnton
103de233e9 Thumbnails: fix 2020-06-17 14:00:28 +03:00
SuhorukovAnton
5fbe80d32a Thumbnails: first version 2020-06-16 14:55:46 +03:00
38c40eec05 Merge branch 'master' into feature/backup 2020-06-15 18:40:26 +03:00
9276bfd384 Backup: fix 2020-06-15 18:33:53 +03:00
Ilya Oleshko
e2cef60f0f web: components: bump version 2020-06-11 15:55:13 +03:00
Ilya Oleshko
9ab3b7557b web: common: bump version 2020-06-11 15:55:03 +03:00
Ilya Oleshko
a1f3b4bde0 Web: Removed faker package, updated yarn lock and fixed stories 2020-06-11 15:54:53 +03:00
7ee4237af4 Update storybook packages (Fix ReDoS vulnerability in websocket-extensions) 2020-06-11 15:13:43 +03:00
SuhorukovAnton
ab6588d99b Backup: bagfix and refactoring 2020-06-10 15:35:10 +03:00
3c66bbb607 Merge branch 'master' into feature/backup 2020-06-09 10:48:07 +03:00
635ff124fb Json: fixed enum 2020-06-05 14:05:42 +03:00
f59be0f44b Merge branch 'master' into feature/backup 2020-06-04 17:12:34 +03:00
b569245076 rever logger 2020-06-04 16:47:27 +03:00
b55cc7c697 Startup: added command line 2020-06-04 16:26:31 +03:00
794486f335 Notify: temp log 2020-06-04 16:04:17 +03:00
4ea72a0e65 Merge branch 'master' into feature/backup
# Conflicts:
#	ASC.Web.sln
2020-06-04 14:39:40 +03:00
SuhorukovAnton
26f2107590 Backup: refactoring 2020-06-04 13:47:22 +03:00
a14049e88f Settings: fixed GetSupportedCultures 2020-06-03 18:51:01 +03:00
SuhorukovAnton
89368aed8b Backup: refactoring 2020-06-03 12:15:05 +03:00
a1778b5cdf Packages updated 2020-06-01 14:36:23 +03:00
SuhorukovAnton
9655101d2b Backup: add DIHelper's methods and fix startup 2020-05-28 16:28:51 +03:00
e7ecaefa3c Added JsonStringEnumConverter 2020-05-27 16:19:58 +03:00
22ae4383b6 UrlShortener: fix 2020-05-22 13:58:12 +03:00
1700ba1965 UrlShortener: config 2020-05-22 12:41:14 +03:00
ecd66902a0 Merge branch 'master' into feature/system-json 2020-05-18 14:16:03 +03:00