Commit Graph

6416 Commits

Author SHA1 Message Date
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
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
Alexey
b4304d8526 Merge branch 'feature/files' of github.com:ONLYOFFICE/AppServer into feature/files 2020-07-16 11:33:17 +03:00
a505175b58 Merge branch 'feature/files' of https://github.com/ONLYOFFICE/CommunityServer-AspNetCore into feature/files 2020-07-16 11:00:18 +03:00
595362b2b3 Web: Files: moved files uploader to separate file, moved convert dialog to redux, added routing to MainButton actions 2020-07-16 11:00:09 +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
060a173691 Web: Files: fixed Delete progress 2020-07-16 10:04:25 +03:00
576e8a6de0 Files: revert 2020-07-16 00:49:25 +03:00
f18f14fa34 DocumentService: fix 2020-07-16 00:36:48 +03:00
cb1bf99393 Files: fix 2020-07-16 00:25:19 +03:00
f03ab16127 Converter: fix 2020-07-16 00:08:28 +03:00
d99f6ff0a5 Files: additional logging 2020-07-15 23:39:43 +03:00
ddf5aa6f19 Files: additional logging 2020-07-15 23:18:35 +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
Alexey
3fd30e7a83 web: common: bump version 2020-07-15 19:06:14 +03:00
Alexey
965b2e97d3 Web: Common: Tile view temporarily hidden 2020-07-15 19:05:40 +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
531b66875f Files: fix 2020-07-15 18:27:46 +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
9ee887d270 DocumentService log error 2020-07-15 18:06:35 +03:00
Artem Tarasov
3004890d98 fixed paddings 2020-07-15 17:58:33 +03:00