Commit Graph

2574 Commits

Author SHA1 Message Date
ddeb4157ad Quota: used field 2022-09-06 23:30:19 +03:00
2c758355bc Quota: added used field 2022-09-06 18:35:30 +03:00
941689b6ca Quota: refactoring 2022-09-06 12:14:08 +03:00
7b623c4e30 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
#	packages/client/src/pages/PortalSettings/utils/settingsTree.js
#	packages/common/store/AuthStore.js
#	packages/components/slider/index.js
#	web/ASC.Web.Api/Api/Settings/SettingsController.cs
2022-09-05 10:19:52 +03:00
36714b4130 Api: added payment/request 2022-09-04 18:30:32 +03:00
7895a214c9
Merge pull request #780 from ONLYOFFICE/feature/private-virtual-rooms
Feature/private virtual rooms
2022-09-01 19:34:12 +04:00
df96629834 Core: fixed user cache 2022-08-31 21:06:26 +03:00
ea2d97b6f5 Api: removed unused columns 2022-08-30 19:01:12 +03:00
d426b2f5d2 FederatedLogin: deleted unnecessary 2022-08-30 13:08:55 +03:00
15f5b67008 FederationLogin: refactor 2022-08-29 22:08:55 +03:00
3db342ffec Merge branch 'develop' into feature/private-virtual-rooms 2022-08-29 17:39:57 +03:00
34969029a0 fixed warnings 2022-08-29 15:27:50 +03:00
9154b971c0 Merge branch 'develop' into feature/stripe
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
#	packages/common/api/settings/index.js
#	packages/common/components/Loaders/index.js
2022-08-29 13:06:44 +03:00
ed5f62a877 Merge branch 'develop' into feature/docspace-backup
# Conflicts:
#	packages/client/src/pages/PortalSettings/index.js
2022-08-26 18:48:20 +03:00
TimofeyBoyko
f92ffe10e5 Plugin: delete useless save 2022-08-26 17:13:22 +03:00
TimofeyBoyko
4c4fa75af9 Plugins: add validation for uploading file 2022-08-26 16:49:41 +03:00
TimofeyBoyko
30906a305f Plugins: fix warnings 2022-08-26 14:05:13 +03:00
TimofeyBoyko
908349a111 Plugins: remfraf dist after start 2022-08-26 14:04:50 +03:00
TimofeyBoyko
3803163ff3 Merge branch 'develop' into feature/system-plugin-v2 2022-08-26 13:26:41 +03:00
TimofeyBoyko
bf170b594e Plugins: delete useless code 2022-08-26 13:22:13 +03:00
TimofeyBoyko
0748afe854 Plugins: add logs, config and change service start 2022-08-26 12:51:43 +03:00
641695ec51 Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController 2022-08-25 23:09:12 +03:00
834a52707f FederatedLogin: fix 2022-08-25 18:31:07 +03:00
d8ff05f7c6
Merge branch 'develop' into feature/docspace-backup 2022-08-25 16:34:59 +03:00
TimofeyBoyko
413f27a794 Plugins: import path to plugins from config file 2022-08-25 15:31:01 +03:00
0c596956f6 Merge branch 'develop' into feautre/private-virtual-rooms 2022-08-25 15:30:11 +03:00
TimofeyBoyko
07b9ffdcf7 Plugins: app new path to plugins store 2022-08-25 14:49:17 +03:00
TimofeyBoyko
bf87e9c4b1 Plugins: add error text for upload route 2022-08-25 14:03:19 +03:00
ff8e3c38e9 removed unnecessary 2022-08-25 13:54:11 +03:00
0a29eb33f7 Quota: fix 2022-08-25 13:41:52 +03:00
4dcd9be041 fix: removed IOptionsSnapshot 2022-08-25 13:29:08 +03:00
TimofeyBoyko
44ad3d4d90 Plugins: add validate by uniq file name 2022-08-25 12:17:05 +03:00
9b22d27306 Files: added keys check 2022-08-25 11:55:54 +03:00
TimofeyBoyko
f1d6d40123 Plugins: add file validate by mimetype 2022-08-25 11:54:10 +03:00
TimofeyBoyko
a4a0aa5d2b Plugins: disable CORS 2022-08-25 10:53:14 +03:00
7854acbac0 CoreCommon: return payment link if available only 2022-08-25 09:47:07 +03:00
6cededcfba CoreCommon: check exists payment id in quota 2022-08-25 09:16:09 +03:00
551ba285d6 CoreCommon: do not modify the source quota when multiplying 2022-08-25 09:15:59 +03:00
TimofeyBoyko
cb38d1ec60 Plugins: update response 2022-08-24 19:53:00 +03:00
TimofeyBoyko
a996f2ca9c Plugins: add guard for check enable plugin-system from config 2022-08-24 19:13:32 +03:00
7a9e46bf54 Quota: refactoring 2022-08-24 19:05:15 +03:00
TimofeyBoyko
1192e149ad Plugins: delete license from package.json files 2022-08-24 14:40:38 +03:00
TimofeyBoyko
ae34adc8e1 Plugins: Delete README.md 2022-08-24 14:38:13 +03:00
9523560b16 Push: fix api 2022-08-24 14:26:45 +03:00
ae49029f91 Push: fix api 2022-08-24 13:21:18 +03:00
TimofeyBoyko
ea113737d0 Common:ASC.WebPlugins: change port from 3000 to 5014 2022-08-24 12:36:12 +03:00
TimofeyBoyko
e755200787 Common:ASC.WebPlugins:SQL: rename table 2022-08-24 12:35:49 +03:00
ed41675476 Firebase: optimization 2022-08-24 12:34:30 +03:00
5967f4db97 Merge branch 'feature/push' of https://github.com/ONLYOFFICE/DocSpace into feature/push 2022-08-24 00:11:05 +03:00
d282aa74f7 Push: fixed message sending function 2022-08-24 00:10:37 +03:00