|
d094546147
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/yarn.lock
|
2020-07-17 17:48:50 +03:00 |
|
|
ea318c3b05
|
Merge branch 'master' into feature/new-login-page
|
2020-07-17 17:44:28 +03:00 |
|
|
ec20c66c5d
|
Update yarn.lock files
|
2020-07-17 17:43:39 +03:00 |
|
|
c4f3ef8003
|
Fixed ReferenceError: babelHelpers is not defined (Changed package version to fixed)
|
2020-07-17 17:43:24 +03:00 |
|
Artem Tarasov
|
305edd419c
|
isDisabled fix
|
2020-07-17 15:58:28 +03:00 |
|
Artem Tarasov
|
e524adc21a
|
added tests
|
2020-07-17 15:28:58 +03:00 |
|
Artem Tarasov
|
aae292ca41
|
added PropTypes
|
2020-07-17 15:16:14 +03:00 |
|
Artem Tarasov
|
121a00f330
|
added readme
|
2020-07-17 14:33:59 +03:00 |
|
|
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
|
374b968e17
|
Merge branch 'feature/new-login-page' of github.com:ONLYOFFICE/AppServer into feature/new-login-page
|
2020-07-17 10:50:12 +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 |
|
|
636e50682b
|
Merge pull request #55 from ONLYOFFICE/feature/field-container-label-view
Feature/field container label view
|
2020-07-17 09:58:23 +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 |
|
|
fafe83cebd
|
Merge branch 'master' into feature/files
|
2020-07-16 16:53:56 +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 |
|
|
679e77a3ea
|
Update yarn.lock files
|
2020-07-16 16:09:09 +03:00 |
|
Vladislav Makhov
|
20fcb5dab7
|
Merge branch 'master' into feature/field-container-label-view
|
2020-07-16 16:07:48 +03:00 |
|
|
4681fb0f78
|
fix
|
2020-07-16 16:02:21 +03:00 |
|
|
098e872a38
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Client/yarn.lock
# products/ASC.People/Client/yarn.lock
# web/ASC.Web.Client/yarn.lock
# web/ASC.Web.Common/package.json
# web/ASC.Web.Common/yarn.lock
# web/ASC.Web.Components/package.json
# web/ASC.Web.Components/yarn.lock
|
2020-07-16 15:58:43 +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 |
|
|
78b10ab893
|
Update yarn.lock files
|
2020-07-16 14:55:40 +03:00 |
|
|
0e351b88d7
|
web: components: bump version
|
2020-07-16 14:41:56 +03:00 |
|
|
8d0d5fd908
|
Merge branch 'master' into feature/files
# Conflicts:
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/ASC.Files.Core/Core/FileStorageService.cs
# web/ASC.Web.Components/package.json
|
2020-07-16 14:41:32 +03:00 |
|
|
f2413a5554
|
Merge pull request #50 from ONLYOFFICE/feature/password-input-simple-view
Feature/password input simple view
|
2020-07-16 14:37:01 +03:00 |
|
|
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 |
|