|
|
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 |
|
|
|
ce15c26c50
|
Web: Files: added display of privacy room files
|
2021-06-23 17:02:06 +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 |
|
|
|
c8184e9dc0
|
Web: Files: fixed privacy bugs
|
2021-06-23 15:39:43 +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 |
|
|
|
282738cb13
|
Merge branch 'develop' into feature/personal
|
2021-06-22 18:44:12 +03:00 |
|
|
|
bb321da952
|
Merge pull request #282 from ONLYOFFICE/feature/changing-selectbox-library
Feature/changing selectbox library
|
2021-06-22 18:38:24 +03:00 |
|
Artem Tarasov
|
28614d8f39
|
Web: Files: THumbnails: fixed opened folder when click on context menu
|
2021-06-22 15:14:02 +03:00 |
|
|
|
2cdcd36020
|
Web: Commented annoying logs
|
2021-06-22 13:43:18 +03:00 |
|
|
|
8963df11c3
|
Merge branch 'feature/personal' of https://github.com/ONLYOFFICE/AppServer into feature/personal
|
2021-06-22 13:41:22 +03:00 |
|
|
|
b1662e7ac6
|
Web: Init maintenance displaying
|
2021-06-22 13:41:11 +03:00 |
|
Artem Tarasov
|
2b2fddf857
|
Web: Files: Thumbnails: fixed double opening context menu
|
2021-06-22 12:51:44 +03:00 |
|
Artem Tarasov
|
f78aee3f15
|
Merge branch 'develop' into feature/thumbnails
|
2021-06-22 12:16:36 +03:00 |
|
|
|
6d21bb2209
|
File: status fix
|
2021-06-22 11:42:29 +03:00 |
|
|
|
43fe4995f4
|
Web: Files: fixed SharingPanel translations
|
2021-06-22 10:29:29 +03:00 |
|
|
|
e27cee4535
|
Web: Common: fixed selection
|
2021-06-22 09:56:48 +03:00 |
|
|
|
50a2b4b4d1
|
Merge branch 'develop' into feature/changing-selectbox-library
|
2021-06-22 08:56:51 +03:00 |
|
Artem Tarasov
|
baf5cfa069
|
Web: Files: Thumbnails: fixed context menu
|
2021-06-19 10:12:39 +03:00 |
|
Artem Tarasov
|
bb8f09a725
|
Web: Files: Thumbnails: fix call createThumbnails
|
2021-06-19 10:04:08 +03:00 |
|
Artem Tarasov
|
a81ba032fa
|
Web: Files: Thumbnails: removed ThumbnailsStore, createThumbnails func moved to FilesStore, applied createThumbnails func
|
2021-06-19 09:48:30 +03:00 |
|
|
|
b5076ed81c
|
File: fix status
|
2021-06-18 23:35:33 +03:00 |
|
|
|
4a4cab5352
|
Files: FileHelper decorator
|
2021-06-18 23:31:46 +03:00 |
|
|
|
d783bd8ab4
|
crm: fixed warnings
|
2021-06-18 20:38:32 +03:00 |
|
|
|
ad8a769cb4
|
Merge branch 'develop' into feature/changing-selectbox-library
|
2021-06-18 17:18:28 +03:00 |
|
|
|
a55544454a
|
Web: Common: added support scroll to selectbox, fixed styles
|
2021-06-18 17:17:59 +03:00 |
|
