|
480d3dd0f6
|
Merge pull request #47 from ONLYOFFICE/feature/general-startup
Feature/general startup
|
2020-07-15 16:45:23 +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 |
|
|
d50ead401b
|
Merge branch 'master' into feature/new-login-page
|
2020-07-15 15:27: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 |
|
|
47e597d3b0
|
Autofac: fix
|
2020-07-15 14:18:47 +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
|
765a209de5
|
Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard
|
2020-07-15 11:54:58 +03:00 |
|
Artem Tarasov
|
6d2deca3c6
|
layout fix
|
2020-07-15 11:47:21 +03:00 |
|
|
4e5c187851
|
EF: DateTime? hack
|
2020-07-15 11:38:00 +03:00 |
|
Vladislav Makhov
|
55a0c01183
|
Fix styles
|
2020-07-15 10:12:49 +03:00 |
|
|
f8b026a7b9
|
Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard
|
2020-07-15 00:05:26 +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 |
|
SuhorukovAnton
|
5bf0bd22b6
|
ASC.Files.Core: first version
|
2020-07-14 13:03:53 +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 |
|
|
3d7e1f114c
|
Merge pull request #46 from ONLYOFFICE/feature/api-defaultvalue
Feature/api defaultvalue
|
2020-07-13 16:41:31 +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 |
|
|
a347f4e4f3
|
fix
|
2020-07-13 16:18:31 +03:00 |
|
|
a822f9b349
|
Files: fix
|
2020-07-13 15:57:39 +03:00 |
|
|
dfd8bbfdb8
|
Merge branch 'master' into feature/api-defaultvalue
|
2020-07-13 15:28:11 +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 |
|
|
cd3240a7f6
|
Removed LimitedConcurrencyLevelTaskScheduler
|
2020-07-13 14:11:36 +03:00 |
|
Vladislav Makhov
|
c085d3c00d
|
Fix styles
|
2020-07-13 12:28:13 +03:00 |
|
|
54fde4a5a4
|
Merge branch 'feature/Wizard' of github.com:ONLYOFFICE/AppServer into feature/Wizard
|
2020-07-13 12:15:22 +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 |
|
|
064160a1ea
|
Files: onedrive
|
2020-07-10 18:37:02 +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 |
|
|
56df9a98ef
|
Files: resources
|
2020-07-10 14:57:42 +03:00 |
|
|
732307a217
|
ResManager: fix
|
2020-07-10 14:57:04 +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 |
|
SuhorukovAnton
|
2925ff25b4
|
api-defaultvalue: add System.Text.Json
|
2020-07-10 13:35:24 +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 |
|