Commit Graph

12907 Commits

Author SHA1 Message Date
b0f64ca924 Merge branch 'develop' into feature/personal 2021-06-29 14:50:51 +03:00
a3cccc4044 crm: migrate from FromForm to FromBody attribute 2021-06-28 12:42:42 +03:00
3f2dfeb5a9 crm: started migrate from FromForm to FromBody attribute. bugfix 2021-06-25 16:58:42 +03:00
9462cd7bdd Web: Storybook: Update package.json 2021-06-25 14:19:42 +03:00
fbcdba3b17 Merge branch 'develop' into feature/personal 2021-06-25 11:10:49 +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
37a676cb5a Tenant: removed Public, PublicVisibleProducts 2021-06-24 15:55:12 +03:00
a23b23de3c Startup: added ability to skip load products and consumers 2021-06-24 11:15:20 +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
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
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
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
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
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
046eec076a
Merge pull request #284 from ONLYOFFICE/feature/update_packages_in_ASC.Thumbnails
update packages
2021-06-23 14:14:26 +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
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
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
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
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
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