|
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 |
|
|
52cd479c5c
|
Merge pull request #279 from ONLYOFFICE/feature/tree-menu-bugfix
Feature/tree menu bugfix
|
2021-06-17 15:36:00 +03:00 |
|
Artem Tarasov
|
6c61ee105c
|
Merge branch 'develop' into feature/tree-menu-bugfix
|
2021-06-17 15:02:41 +03:00 |
|
Artem Tarasov
|
a8fe50142c
|
Web: Tree: fixed position of scrollbar on tablet
|
2021-06-17 15:01:35 +03:00 |
|
|
741de9f2f7
|
Web: Files: added react-selecto library
|
2021-06-17 14:36:45 +03:00 |
|
|
0aa2eb3e85
|
Web: Files: removed react-selectable-fast library
|
2021-06-17 14:27:41 +03:00 |
|
|
6118e95028
|
Merge branch 'develop' into feature/personal
|
2021-06-17 14:25:09 +03:00 |
|
Sergey Kirichenko
|
a91ea81e89
|
Modify elasticsearch configuration (#281)
* Modify elasticsearch config
* Modify version ELK
* Cosmetic modify
|
2021-06-17 12:49:39 +03:00 |
|
|
a3298a49ac
|
Web: Files: fixed createTreeFolders
|
2021-06-17 12:04:01 +03:00 |
|
|
d7c8f22ea3
|
Merge branch 'develop' into feature/tree-menu-bugfix
|
2021-06-17 11:09:19 +03:00 |
|
|
8fc9bef6c6
|
Core: fix cache
|
2021-06-16 22:25:02 +03:00 |
|
|
b6d4408ce0
|
Files: fixed subfolders method
|
2021-06-16 21:53:56 +03:00 |
|
|
a8527e1a57
|
WebApi: sendsms, setphone
|
2021-06-16 20:46:24 +03:00 |
|
|
01639a56cc
|
RazorCompileOnBuild:false<
GenerateMvcApplicationPartsAssemblyAttributes:false
|
2021-06-16 20:08:26 +03:00 |
|
|
53ee0ef484
|
fixed warnings
|
2021-06-16 18:00:27 +03:00 |
|
|
3018e1822f
|
crm: fix path
|
2021-06-16 17:30:31 +03:00 |
|
|
e314f6ff1c
|
Merge pull request #245 from ONLYOFFICE/feature/crm-migrate
Feature/crm migrate
|
2021-06-16 17:02:46 +03:00 |
|
|
5fcbdbd7dd
|
added health checks
|
2021-06-16 16:54:36 +03:00 |
|
|
1250201319
|
Web: Files: fixed upload progress
|
2021-06-16 14:31:13 +03:00 |
|
|
0ff78c5192
|
Merge branch 'develop' into feature/tree-menu-bugfix
|
2021-06-16 13:47:56 +03:00 |
|
|
7d0a1d340d
|
Web: Files: fixed files render, removed log
|
2021-06-16 13:47:15 +03:00 |
|
|
b738bbc268
|
Web: Files: fixed files render
|
2021-06-16 13:38:18 +03:00 |
|
|
469678ac85
|
Api: fix settings
|
2021-06-16 13:03:41 +03:00 |
|
|
db7cfacd62
|
Files: remove warnings
|
2021-06-15 22:46:26 +03:00 |
|
|
429f5a1ea2
|
Smtp: fix warning
|
2021-06-15 21:40:36 +03:00 |
|
|
91e4d844fb
|
Files: fix download
|
2021-06-15 21:40:12 +03:00 |
|
|
7d59d8f3a6
|
Web: Files: fixed deleteThirdParty
|
2021-06-15 18:59:07 +03:00 |
|
|
d2fa149247
|
Jenkins: fix
|
2021-06-15 17:32:25 +03:00 |
|
|
456a82a3fc
|
Web: Files: fixed tree menu update
|
2021-06-15 17:23:07 +03:00 |
|
|
58deff8f26
|
Merge pull request #277 from ONLYOFFICE/hotfix/package_version_increment
package version increment
|
2021-06-15 17:21:33 +03:00 |
|
|
ee029d557b
|
fixed tests
|
2021-06-15 17:20:53 +03:00 |
|
|
73547f421e
|
Common: install newtonsoft
|
2021-06-15 16:44:53 +03:00 |
|
|
ad52d25d28
|
Web: Files: added tree menu update after folder deletion
|
2021-06-15 16:12:15 +03:00 |
|
|
dc1afaeafc
|
Merge branch 'develop' into hotfix/package_version_increment
|
2021-06-15 16:01:19 +03:00 |
|
|
9c5dee7752
|
Index: separate configs
|
2021-06-15 15:57:16 +03:00 |
|
|
605d5ce043
|
removed unused references
|
2021-06-15 15:52:29 +03:00 |
|
|
c09a637758
|
Web: Files: changed the logic of opening the folder tree
|
2021-06-15 14:59:51 +03:00 |
|