|
bf04081756
|
Merge pull request #54 from ONLYOFFICE/feature/ASC.Files.Core
Feature/asc.files.core
|
2020-07-16 14:32:34 +03:00 |
|
Vladislav Makhov
|
85dcdb5689
|
Merge branch 'master' into feature/password-input-simple-view
|
2020-07-16 14:32:11 +03:00 |
|
|
224454fe3f
|
Merge branch 'master' into feature/ASC.Files.Core
|
2020-07-16 14:28:39 +03:00 |
|
|
773820cce7
|
Merge branch 'master' of github.com:ONLYOFFICE/AppServer
|
2020-07-16 14:27:42 +03:00 |
|
Vladislav Makhov
|
8a907a0df7
|
Fix hover color
|
2020-07-16 14:27:42 +03:00 |
|
|
281b7a4406
|
Docker: fix
|
2020-07-16 14:27:30 +03:00 |
|
|
b7ae6089fa
|
Merge pull request #49 from ONLYOFFICE/feature/Button-large
Feature/button large
|
2020-07-16 14:02:56 +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 |
|
|
ff41b28a64
|
DI: files fix
|
2020-07-16 12:08:20 +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 |
|
|
8669f065af
|
Merge pull request #48 from ONLYOFFICE/feature/text-input-large
Feature/text input large
|
2020-07-15 18:22:26 +03:00 |
|
SuhorukovAnton
|
6da23f477b
|
ASC.Files.Core: refactoring
|
2020-07-15 18:07:34 +03:00 |
|
Artem Tarasov
|
3004890d98
|
fixed paddings
|
2020-07-15 17:58:33 +03:00 |
|
SuhorukovAnton
|
83a88d0240
|
Merge branch 'master' into feature/ASC.Files.Core
|
2020-07-15 17:38:40 +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 |
|
|
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 |
|