Commit Graph

13016 Commits

Author SHA1 Message Date
9462cd7bdd Web: Storybook: Update package.json 2021-06-25 14:19:42 +03:00
Sergey Kirichenko
92684a2b3c
Modify elasticsearch configuration file (#290)
* Fix config elk json file

* Cosmetic modify
2021-06-25 10:14:53 +03:00
Artem Tarasov
af77facf99 Web: Files: Thumbnails: deleted unnecessary code 2021-06-24 19:53:48 +03:00
Artem Tarasov
ac288d3027 Web: Files: Thumbnails: refactoring styles 2021-06-24 19:48:26 +03:00
Artem Tarasov
2c1a39bcdb Web: Files: Thumbnails: refactoring 2021-06-24 19:46:46 +03:00
Artem Tarasov
b65c717fd5 Web: Common: Loaders: fixed TilesLoader for Chrome 2021-06-24 19:34:47 +03:00
Artem Tarasov
e996f17552 Merge branch 'develop' into feature/thumbnails 2021-06-24 16:22:14 +03:00
37a676cb5a Tenant: removed Public, PublicVisibleProducts 2021-06-24 15:55:12 +03:00
Artem Tarasov
8310bff1b7 Web: Files: THumbnails: fixed unable to choose file selection 2021-06-24 15:35:50 +03:00
Artem Tarasov
0403801270 Web: Files: Thumbnails: added validation for thumbnailStatus, fixed styles 2021-06-24 11:33:21 +03:00
6e9d64da7a Merge branch 'develop' into feature/remove_itemList 2021-06-24 11:21:46 +03:00
a23b23de3c Startup: added ability to skip load products and consumers 2021-06-24 11:15:20 +03:00
Artem Tarasov
fdae8372ef Web: Files: Thumbnails: fixed drag style, deleted console.log 2021-06-24 01:52:47 +03:00
Artem Tarasov
ffe1b89569 Merge branch 'develop' into feature/thumbnails 2021-06-24 01:04:45 +03:00
Artem Tarasov
006285fb5c Merge branch 'feature/thumbnails' of github.com:ONLYOFFICE/AppServer into feature/thumbnails 2021-06-24 01:04:22 +03:00
Artem Tarasov
81c6a04b0d Web: Files: Thumbnails: fixed file action 2021-06-24 01:00:51 +03:00
Artem Tarasov
aac415adbb Web: Files: Thumbnails: fixed size of badges 2021-06-24 00:42:50 +03:00
Artem Tarasov
d017052e9b Web: Files: Thumbnails: added usage thumbnailStatus 2021-06-24 00:29:53 +03:00
a4aa4843e8 crm: started migrate from FromForm to FromBody attribute 2021-06-23 22:32:56 +03:00
1e5d4daf84
Merge pull request #272 from ONLYOFFICE/feature/remove_binary_formatter
Feature/remove binary formatter
2021-06-23 21:37:26 +03:00
8998a72d8c Files: fixed build 2021-06-23 20:56:55 +03:00
Artem Tarasov
facdce6de4 Merge branch 'develop' into feature/thumbnails 2021-06-23 20:35:41 +03:00
d41f81e1cd Merge branch 'develop' into feature/remove_binary_formatter 2021-06-23 20:27:10 +03:00
d59f9a2aa2 fixed urls 2021-06-23 20:12:50 +03:00
Artem Tarasov
a7c4f38a89 Merge branch 'develop' into feature/thumbnails 2021-06-23 17:47:14 +03:00
48e6baf1c0
Merge pull request #283 from ONLYOFFICE/feature/ClearEvents
Feature/clear events
2021-06-23 17:16:23 +03:00
0e6078f9e2 Merge branch 'develop' into feature/ClearEvents
# Conflicts:
#	ASC.Web.sln
2021-06-23 17:15:56 +03:00
Artem Tarasov
c9a6f51610 Merge branch 'develop' into feature/thumbnails 2021-06-23 17:01:46 +03:00
Artem Tarasov
1f753cfd6e Web: Files: Thumbnails: added reset selection when clicking on an empty area of the page, fixed the area when clicking on which the file opens 2021-06-23 16:57:42 +03:00
c941468cdb Files: api. Added thumbnailStatus 2021-06-23 16:19:25 +03:00
c8e617d149
Merge pull request #280 from ONLYOFFICE/feature/healthcheck
added health checks
2021-06-23 16:11:26 +03:00
20d1f9a738 merge from develop 2021-06-23 16:10:46 +03:00
Artem Tarasov
01fb0a6621 Web: Files: Thumbnails: deleted unnecessary code 2021-06-23 15:34:30 +03:00
85574630cb Merge branch 'develop' into feature/ClearEvents 2021-06-23 15:30:55 +03:00
c18adc50dc ClearEvents: fixed log and launch 2021-06-23 15:25:17 +03:00
Artem Tarasov
f894d4593f Web: Common: Loaders: fixed TilesLoader 2021-06-23 15:00:49 +03:00
dc15252f2b
Merge pull request #238 from ONLYOFFICE/dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1
Bump redis from 2.8.0 to 3.1.1 in /common/ASC.Socket.IO
2021-06-23 15:00:12 +03:00
7fc9a35b49 Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1 2021-06-23 14:37:03 +03:00
Artem Tarasov
d5ebaa6247 Web: Files: Thumbnails: fixed files style 2021-06-23 14:29:12 +03:00
Artem Tarasov
771ff447b0 Web: Files: Thumbnails: fixed folder style 2021-06-23 14:20:29 +03:00
046eec076a
Merge pull request #284 from ONLYOFFICE/feature/update_packages_in_ASC.Thumbnails
update packages
2021-06-23 14:14:26 +03:00
Artem Tarasov
ed92a79f29 Web: Files: Thumbnails: fixed styles, refactoring 2021-06-23 11:11:35 +03:00
Artem Tarasov
fe1a1e7e5c Web: Files: THumbnails: fixed view of EditingWrapperComponent for new folder 2021-06-23 02:21:27 +03:00
Artem Tarasov
1430dace28 Web: fix after merdge 2021-06-23 00:00:42 +03:00
Artem Tarasov
2d9c33a8c6 Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	packages/asc-web-common/components/PageLayout/index.js
2021-06-22 23:46:35 +03:00
68ec473a6c fix 2021-06-22 21:44:03 +03:00
3788bab48e HealthCheck: fix Studio 2021-06-22 19:55:47 +03:00
d8abde6d88 SSoAuth: fix buid and run 2021-06-22 19:44:09 +03:00
89d9ea6297 Test: fix 2021-06-22 19:15:04 +03:00
912501a2f4 Healthcheck: fix apisystem 2021-06-22 19:09:24 +03:00