Commit Graph

13224 Commits

Author SHA1 Message Date
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
dd64101332 remove itemList 2021-06-18 15:56:15 +03:00
Sergey Kirichenko
7af9bb08c9
Fix elasticsearch configure (#285) 2021-06-18 14:30:11 +03:00
0005169b2b Web: Common: fixed dragCondition 2021-06-18 14:10:20 +03:00
7905b07c0c Web: Files: added dragCondition to Selecto 2021-06-18 13:53:32 +03:00
00cc15fbf5 Merge branch 'develop' into feature/ClearEvents 2021-06-18 12:21:54 +03:00
d0b813cc71 update packages 2021-06-18 12:11:25 +03:00
Artem Tarasov
83549b62cd Merge branch 'develop' into feature/thumbnails
# Conflicts:
#	packages/asc-web-common/api/files/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
2021-06-18 12:02:10 +03:00
f70794a717 Merge branch 'develop' into feature/changing-selectbox-library 2021-06-18 11:58:06 +03:00
30e143eedf subproject update 2021-06-18 11:57:04 +03:00
d3113fdc2e Merge branch 'develop' into dependabot/npm_and_yarn/common/ASC.Socket.IO/redis-3.1.1 2021-06-18 11:32:55 +03:00
443da941be Web: Files: fixed select for thirdparty folders 2021-06-18 11:00:31 +03:00
3d3a8a2d6a Merge branch 'develop' into feature/remove_binary_formatter 2021-06-18 10:49:07 +03:00
a226cca872 Files: update document templates 2021-06-18 10:45:45 +03:00
b7ce849e32 Web: Components: Theme: Fixed line height for ComboBox component 2021-06-18 09:57:02 +03:00
Artem Tarasov
d2f77fb06a Web: Files: Thumbnails: fixed styles tile, refactoring, added thumbnailUrl 2021-06-18 02:02:30 +03:00
Artem Tarasov
5034495b28 Web: Files: Thumbnails: added ThumbnailsStore, api for create thumbs 2021-06-18 01:13:49 +03:00
249af955d1 Web: Files: added onSelect function for selectbox 2021-06-17 18:46:22 +03:00
df70473ce5 Merge branch 'develop' into feature/changing-selectbox-library 2021-06-17 17:19:17 +03:00
b088c925d6 Merge branch 'develop' into feature/personal
# Conflicts:
#	products/ASC.Files/Client/src/components/dialogs/ConnectDialog/index.js
#	products/ASC.Files/Client/src/pages/Home/index.js
#	products/ASC.Files/Client/src/store/FilesStore.js
2021-06-17 15:47:33 +03:00