|
40702707bd
|
refactoring
|
2022-09-14 14:21:25 +03:00 |
|
|
384f83f10e
|
Merge branch 'develop' into feature/room-security
|
2022-09-14 13:02:33 +03:00 |
|
|
372f5e9f3a
|
fix startup
|
2022-09-14 12:01:32 +03:00 |
|
|
412ee040a4
|
startup quota
|
2022-09-14 11:56:00 +03:00 |
|
|
90c3cd29ba
|
fix
|
2022-09-13 22:35:54 +03:00 |
|
|
af6fa993e6
|
Payments: added quota feature type
|
2022-09-13 18:18:43 +03:00 |
|
|
071f882d53
|
Payments: customerId = email
|
2022-09-13 17:29:38 +03:00 |
|
|
d24f9db4c7
|
Quota: migration
|
2022-09-13 17:29:01 +03:00 |
|
|
1f07a7ddad
|
Merge branch 'develop' into feature/remove-waste
|
2022-09-13 17:14:49 +03:00 |
|
|
795e76f9d5
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-13 16:42:09 +03:00 |
|
|
7ccfe9547f
|
Web.Api: refactor, changed links logic
|
2022-09-13 16:01:04 +03:00 |
|
|
12c7a28c21
|
Core: fix
|
2022-09-13 15:11:09 +03:00 |
|
|
b43ca7368e
|
Quota: fix
|
2022-09-13 01:35:12 +03:00 |
|
|
14dfc1f5a7
|
Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota
|
2022-09-13 00:41:59 +03:00 |
|
|
068e3c051b
|
Quota: Quota limit string -> long
|
2022-09-13 00:40:10 +03:00 |
|
|
bc738ab5ea
|
fix
|
2022-09-12 19:41:16 +03:00 |
|
|
f7fd831a17
|
Merge branch 'develop' into feature/ip-security
|
2022-09-12 13:31:13 +03:00 |
|
|
705ca6fee1
|
fix
|
2022-09-12 11:04:30 +03:00 |
|
|
23731e8eab
|
UserQuota: fix
|
2022-09-10 18:07:50 +03:00 |
|
|
46ad007012
|
Migration: remove EnsureCreated
|
2022-09-10 17:16:32 +03:00 |
|
|
1ab51406cd
|
Merge branch 'develop' into feature/user-quota
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
|
2022-09-09 18:47:38 +03:00 |
|
|
2f0c494cda
|
Files: added multiplie invintation link
|
2022-09-09 18:07:04 +03:00 |
|
|
6f710be0c2
|
Quota: refactoring
|
2022-09-09 17:39:28 +03:00 |
|
|
4b3f9f7e29
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
# Conflicts:
# packages/client/src/components/dialogs/index.js
|
2022-09-09 17:34:19 +03:00 |
|
|
ae825d8f7e
|
Api.Core: refactor
|
2022-09-09 17:32:10 +03:00 |
|
|
f16da6e3ad
|
refactor
|
2022-09-09 17:31:56 +03:00 |
|
|
c2cbd25c4c
|
redditmq: fixed config setup
|
2022-09-09 15:56:24 +03:00 |
|
|
acbacaf9ef
|
Quota: removed MaxFileSize column
|
2022-09-09 15:13:54 +03:00 |
|
|
d838c937cc
|
Feed: moved portion size to config
|
2022-09-09 13:38:13 +03:00 |
|
|
25ae19d601
|
Merge branch 'develop' into feature/remove-waste
|
2022-09-09 11:52:13 +03:00 |
|
|
87cfb294ab
|
Quota: CountRoomFeature
|
2022-09-09 10:27:35 +03:00 |
|
|
354c4a69ab
|
Quota: refactoring
|
2022-09-08 19:57:36 +03:00 |
|
|
f3a05087fa
|
fix
|
2022-09-08 18:39:53 +03:00 |
|
|
882445e371
|
Quota: add user quota
|
2022-09-08 17:42:36 +03:00 |
|
|
26df50c457
|
remove unused projects
|
2022-09-08 17:05:35 +03:00 |
|
|
bf5ce9cdb0
|
Quota: admin replaced with manager
|
2022-09-08 16:35:52 +03:00 |
|
|
1d96505631
|
remove waste asc.textile
|
2022-09-08 15:32:54 +03:00 |
|
|
888744a586
|
rabbitmq: extended config
|
2022-09-08 14:20:01 +03:00 |
|
|
3fab5e883b
|
remove waste asc.ipSecurity
|
2022-09-08 13:50:43 +03:00 |
|
|
02d4be8950
|
remove waste asc.feed
|
2022-09-08 10:52:51 +03:00 |
|
|
83f4545f02
|
Quota: refactoring
|
2022-09-08 10:23:26 +03:00 |
|
|
375853bf8e
|
Quota: removed hasMigrationFeature
|
2022-09-07 19:35:07 +03:00 |
|
|
fabb3ceac5
|
remove waste asc.federatedLogin
|
2022-09-07 18:36:52 +03:00 |
|
|
b7d0a532ca
|
Api.Core: refactor, removed unnecessary
|
2022-09-07 18:23:54 +03:00 |
|
|
706d1b257d
|
remove waste asc.eventBus.extensions.logger
|
2022-09-07 18:13:51 +03:00 |
|
|
8a115f1084
|
remove waste asc.adta.storage
|
2022-09-07 17:44:50 +03:00 |
|
|
e2dc47adea
|
Quota: merge autobackup and restore feature
|
2022-09-07 16:43:37 +03:00 |
|
|
4b183c2fa1
|
Quota: removed open feature
|
2022-09-07 16:28:52 +03:00 |
|
|
58b9eb3172
|
Quota: refactoring
|
2022-09-07 16:26:03 +03:00 |
|
|
b76cde8b04
|
remove waste asc.data.reassings
|
2022-09-07 15:50:17 +03:00 |
|
|
f54f31a3d1
|
remove waste asc.core.common
|
2022-09-07 15:45:23 +03:00 |
|
|
9988e86a8c
|
Quota: return used user space
|
2022-09-07 13:44:59 +03:00 |
|
|
519afffa58
|
Merge branch 'develop' into feature/backup_remove_waste_modules
|
2022-09-07 11:35:40 +03:00 |
|
|
1008e1c47e
|
Quota: added users quota row table
|
2022-09-07 02:10:58 +03:00 |
|
|
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 |
|
|
c096c05032
|
Merge branch 'develop' into feature/room-security
|
2022-09-06 13:51:36 +03:00 |
|
|
46d0b89433
|
Merge pull request #788 from ONLYOFFICE/feature/rooms-feed
Feature/rooms feed
|
2022-09-06 14:46:49 +04:00 |
|
|
fb4e996196
|
Merge branch 'develop' into feature/room-security
|
2022-09-06 13:36:03 +03:00 |
|
|
31297798aa
|
refactor
|
2022-09-06 13:32:37 +03:00 |
|
|
1d75a5adc3
|
refactor
|
2022-09-06 13:26:08 +03:00 |
|
|
e15d0163a2
|
Api.Core: removed unnecessary
|
2022-09-06 13:02:12 +03:00 |
|
|
941689b6ca
|
Quota: refactoring
|
2022-09-06 12:14:08 +03:00 |
|
|
1a1b2c68b0
|
backend: refactoring start application
|
2022-09-06 11:29:01 +03:00 |
|
Vashchuk Nikita
|
cdb3b2ce65
|
- added functionality for adding ip restrictions for users and admins separately
- added functionality for reading CIDR notations
- modified EFmodel
|
2022-09-05 15:48:41 +04:00 |
|
|
442dd6df95
|
Quota: refactoring
|
2022-09-05 14:45:20 +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 |
|
|
cda1d1ff8c
|
Feed: added usings
|
2022-09-02 19:00:01 +03:00 |
|
|
df9a92e5b4
|
Feed: changed filter
|
2022-09-02 18:59:52 +03:00 |
|
|
e17d7cf95a
|
Feed: added module
|
2022-09-02 18:58:08 +03:00 |
|
|
abd9c47b26
|
Feed: added constants
|
2022-09-02 18:57:51 +03:00 |
|
|
9f4d38951c
|
Feed: added AsNoTracking
|
2022-09-02 11:31:04 +03:00 |
|
|
88e38e82e2
|
Merge branch 'develop' into feature/rooms-feed
|
2022-09-01 20:25:11 +03:00 |
|
|
50175aad40
|
Web.Api: added id, withRelated for feed filter
|
2022-09-01 20:22:59 +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 |
|
|
91d396c026
|
Feed: refactor
|
2022-09-01 18:19:38 +03:00 |
|
|
e966afb49a
|
Feed: fix
|
2022-09-01 18:19:22 +03:00 |
|
|
effe113ff0
|
Feed: refactor
|
2022-09-01 18:19:17 +03:00 |
|
|
cdad8da572
|
remove waste asc.common
|
2022-09-01 11:16:46 +03:00 |
|
|
df96629834
|
Core: fixed user cache
|
2022-08-31 21:06:26 +03:00 |
|
|
481223a51b
|
Files: added context id
|
2022-08-31 20:02:56 +03:00 |
|
|
118ba04fae
|
remove waste asc.auditTrail
|
2022-08-31 18:07:19 +03:00 |
|
|
4758472a01
|
remove waste ASC.Api.Core
|
2022-08-31 18:03:29 +03:00 |
|
|
a48b836633
|
Feed: added rooms module, refactor
|
2022-08-31 16:08:14 +03:00 |
|
|
ea2d97b6f5
|
Api: removed unused columns
|
2022-08-30 19:01:12 +03:00 |
|
|
54ff8de78b
|
Quota: moved UserQuotaSettings
|
2022-08-30 16:03:14 +03:00 |
|
|
eccca5ea5f
|
remove waste modules
|
2022-08-30 14:16:41 +03:00 |
|
|
d426b2f5d2
|
FederatedLogin: deleted unnecessary
|
2022-08-30 13:08:55 +03:00 |
|
|
c162a56834
|
Quota: fix
|
2022-08-30 12:00:44 +03:00 |
|
|
bf7f4f04da
|
Merge branch 'develop' into feature/user-quota
|
2022-08-30 11:04:49 +03:00 |
|
|
2146cd7020
|
Quota: fix ldap quota
|
2022-08-30 11:00:37 +03:00 |
|
|
74a2006420
|
Quota: no quota
|
2022-08-29 22:15:06 +03:00 |
|
|
15f5b67008
|
FederationLogin: refactor
|
2022-08-29 22:08:55 +03:00 |
|
|
02bbe35933
|
Quota: fix api
|
2022-08-29 20:35:16 +03:00 |
|
|
933a4129fa
|
Quota: string representation of quota
|
2022-08-29 20:20:58 +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 |
|
|
d70bf58c0a
|
Quota: ldap user quota limit
|
2022-08-29 14:07:52 +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 |
|
|
8f248f6ac2
|
Push: fix
|
2022-08-23 23:35:26 +03:00 |
|
|
632d7fbc41
|
Firebase: model
|
2022-08-23 20:03:02 +03:00 |
|
|
1ae7d3b11d
|
Api: push controller. Removed projects
|
2022-08-23 18:03:00 +03:00 |
|
TimofeyBoyko
|
355b6dd350
|
Common:ASC.WebPlugins: add yarn lock
|
2022-08-23 18:01:35 +03:00 |
|
TimofeyBoyko
|
7042dca053
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-23 14:38:45 +03:00 |
|
|
26d493f498
|
Push: fix
|
2022-08-23 14:28:42 +03:00 |
|
TimofeyBoyko
|
f86a533ea3
|
Add backend for web plugins
|
2022-08-23 14:22:49 +03:00 |
|
|
20dcd59616
|
Merge branch 'develop' into feature/push
|
2022-08-23 13:24:36 +03:00 |
|
|
971d4960c1
|
Push: fix
|
2022-08-23 13:23:00 +03:00 |
|
|
0f29181bb3
|
Core: added migrations
|
2022-08-23 13:16:13 +03:00 |
|
|
7f38657ce6
|
Push: global usings
|
2022-08-23 13:10:37 +03:00 |
|
|
c8e4ea7cec
|
Push: Newtonsoft.Json -> System.Text.Json
|
2022-08-23 12:05:09 +03:00 |
|
|
737359b21a
|
Merge branch 'develop' into feature/stripe
|
2022-08-23 12:05:06 +03:00 |
|
|
1c7d7fee77
|
Push: fix
|
2022-08-23 10:42:49 +03:00 |
|
|
953faf550e
|
Quota: user quota init
|
2022-08-23 09:44:07 +03:00 |
|
|
b761071b7e
|
Merge branch 'develop' into feature/webhook-fix
|
2022-08-22 14:15:14 +03:00 |
|
|
4870031c1a
|
Api: webhooks retry
|
2022-08-22 14:00:57 +03:00 |
|
|
22213a25a7
|
Webhook: filter
|
2022-08-22 11:00:55 +03:00 |
|
|
9b5e966559
|
removed unused DisposableHttpContext
|
2022-08-19 13:56:32 +03:00 |
|
|
585a9f8d00
|
Webhooks: fix
|
2022-08-18 22:06:51 +03:00 |
|
|
5b8374daa0
|
refactoring
|
2022-08-18 19:00:22 +03:00 |
|
|
753284b312
|
Webhook: added name. renamed config_id
|
2022-08-18 16:41:53 +03:00 |
|
|
301ac773af
|
CoreCommon: checking quotas before update (TODO)
|
2022-08-18 14:17:55 +03:00 |
|
|
68330b11e7
|
PortalController: currency for current region by IP
|
2022-08-18 14:17:55 +03:00 |
|
|
1bcd0c524c
|
Webhoks: added automapper
|
2022-08-18 12:34:48 +03:00 |
|
|
d26f045e8e
|
Webhooks: added enabled and delivery columns
|
2022-08-18 12:03:13 +03:00 |
|
|
2b6c4b127a
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Server/Api/ThirdpartyController.cs
|
2022-08-17 13:58:00 +03:00 |
|
|
88c3a92876
|
Backup: fixed mail
|
2022-08-17 12:38:51 +03:00 |
|
|
4cdce5b713
|
Webhook: async
|
2022-08-17 12:18:50 +03:00 |
|
|
6ec79e015e
|
Webhook: splited event in two columns
|
2022-08-16 17:47:40 +03:00 |
|
|
12760ef28f
|
Webhook: merged services. Added Polly.
|
2022-08-16 13:36:48 +03:00 |
|
|
c03a12209e
|
fixed total
|
2022-08-15 17:31:27 +03:00 |
|
|
92942fbcf6
|
People: fix
|
2022-08-15 14:30:50 +03:00 |
|
|
ce5009d0c6
|
Push: fixes
|
2022-08-15 14:27:54 +03:00 |
|
|
46caff0b0c
|
Push: post merge fixes
|
2022-08-15 01:00:11 +03:00 |
|
|
0973f4e8d1
|
Files: removed .result
|
2022-08-12 16:26:57 +03:00 |
|
|
a941da35b4
|
removed ignored files
|
2022-08-12 16:11:25 +03:00 |
|
|
b6559781ea
|
CoreCommon: update subscription
|
2022-08-12 15:57:35 +03:00 |
|
|
ef7419c9ae
|
CoreCommon: payment url with quantity of products
|
2022-08-12 15:57:35 +03:00 |
|
|
f43a228477
|
CoreCommon: default quota - trial with 100mb file size, 100 gb storage, 1 admin
|
2022-08-12 15:57:35 +03:00 |
|
|
d00205106f
|
CoreCommon: delete support feature from quota
|
2022-08-12 15:57:34 +03:00 |
|
|
8908521291
|
CoreCommon: delete domain feature from quota (f3f3ed96ae )
|
2022-08-12 15:57:34 +03:00 |
|
|
f563202326
|
Api: get stripe prices
|
2022-08-12 15:57:34 +03:00 |
|
|
3c926c4011
|
Api: backUrl for stripe link
|
2022-08-12 15:57:33 +03:00 |
|
|
6f98ad9c5f
|
CoreCommon: get stripe portal link
|
2022-08-12 15:57:33 +03:00 |
|
|
a140de338b
|
CoreCommon: email in payment
|
2022-08-12 15:57:33 +03:00 |
|
|
7ffdb8bb44
|
CoreCommon: id as primary key in TariffRow table
|
2022-08-12 15:57:32 +03:00 |
|
|
44b75f71f9
|
CoreCommon: fix parse payment
|
2022-08-12 15:57:32 +03:00 |
|
|
9fcefe157d
|
Api: added method portal/payment/url
|
2022-08-12 15:57:32 +03:00 |
|
|
c697a12f80
|
CoreCommon: fix test arg
|
2022-08-12 15:57:32 +03:00 |
|
|
bcc5b220a8
|
CoreCommon: switch to stripe
|
2022-08-12 15:57:31 +03:00 |
|
|
bcd7711e24
|
CoreCommon: sync request to billing
|
2022-08-12 15:57:31 +03:00 |
|
|
90c19508ea
|
CoreCommon: tariff contains a list of quotas
|
2022-08-12 15:57:31 +03:00 |
|
|
751c76c015
|
CoreCommon: Prolongable field in Tariff is not used
|
2022-08-12 15:57:30 +03:00 |
|
|
64782b49bf
|
CoreCommon: Year field in TenantQuota is not used
|
2022-08-12 15:57:30 +03:00 |
|
|
9025541b0a
|
CoreCommon: Year3 field in TenantQuota is not used
|
2022-08-12 15:57:30 +03:00 |
|
|
91c03420e1
|
CoreCommon: EnableMailServer field in TenantQuota is not used
|
2022-08-12 15:57:29 +03:00 |
|
|
055ad130b4
|
CoreCommon: CountRoom as a new field in TenantQuota
|
2022-08-12 15:57:29 +03:00 |
|
|
891f9bf0f1
|
CoreCommon: ActiveUsers as feature value
|
2022-08-12 15:57:29 +03:00 |
|
|
74460213a8
|
CoreCommon: MaxTotalSize as feature value
|
2022-08-12 15:57:28 +03:00 |
|
|
56ad5e6d5a
|
CoreCommon: default data for quota (a861268e4f )
|
2022-08-12 15:57:28 +03:00 |
|
|
4218e45601
|
CoreCommon: rename AvangateId field to ProductId
|
2022-08-12 15:57:28 +03:00 |
|
|
40e58d73b2
|
CoreCommon: removed autorenewal field
|
2022-08-12 15:57:27 +03:00 |
|
|
655cccb5c1
|
add "AddBaseDbContextPool"
|
2022-08-12 15:06:49 +03:00 |
|
|
670fa09923
|
Returned settings.
|
2022-08-12 13:50:34 +03:00 |
|
|
6c2b49470c
|
WEb: Fixed after merge.
|
2022-08-12 13:25:29 +03:00 |
|
|
23b059c0cc
|
fix
|
2022-08-11 22:35:53 +03:00 |
|
|
2314d6fc47
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-11 22:33:13 +03:00 |
|
|
020fa7dcda
|
Merge branch 'develop' into feature/push
|
2022-08-11 17:15:37 +03:00 |
|
|
4463fc6e8f
|
Merge branch 'develop' into feature/docspace-backup
# Conflicts:
# packages/asc-web-common/api/settings/index.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/auto-backup/sub-components/ButtonContainer.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectConnectionContainer.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/DirectThirdPartyConnection.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/FormConnection.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/common-container/GetThirdPartyStoragesOptions.js
# packages/client/src/pages/PortalSettings/categories/data-management/backup/consumer-storage-settings/InputsMethods.js
# packages/common/components/Loaders/AutoBackupLoader/StyledAutoBackup.js
# packages/common/components/Loaders/AutoBackupLoader/index.js
# packages/common/components/Loaders/DataBackupLoader/StyledDataBackup.js
# packages/common/components/Loaders/DataBackupLoader/index.js
# packages/common/components/Loaders/RestoreBackupLoader/StyledRestoreBackup.js
# packages/common/components/Loaders/RestoreBackupLoader/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFileInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# products/ASC.Files/Client/src/components/panels/SelectFolderInput/index.js
# products/ASC.Files/Client/src/components/panels/SelectionPanel/SelectionPanelBody.js
# products/ASC.Files/Server/GlobalUsings.cs
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
# web/ASC.Web.Client/src/components/pages/Settings/Layout/Article/Body/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/StyledBackup.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/auto-backup/sub-components/ThirdPartyStorageModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/AmazonSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/GoogleCloudSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/RackspaceSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/consumer-storage-settings/SelectelSettings.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/ThirdPartyStorageModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/AmazonStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/GoogleCloudStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/RackspaceStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/manual-backup/sub-components/storages/SelectelStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/DocumentsModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyResourcesModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/ThirdPartyStoragesModule.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/AmazonStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/GoogleCloudStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/RackspaceStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/sub-components/storages/SelectelStorage.js
# web/ASC.Web.Client/src/components/pages/Settings/index.js
# web/ASC.Web.Client/src/components/pages/Settings/utils/settingsTree.js
# web/ASC.Web.Client/src/store/BackupStore.js
|
2022-08-11 17:10:37 +03:00 |
|
|
48d8e16d49
|
Merge branch 'feature/sso' of https://github.com/ONLYOFFICE/AppServer into feature/sso
|
2022-08-10 15:33:13 +03:00 |
|
|
97aee7f8c2
|
SSO: fix login
|
2022-08-10 15:33:02 +03:00 |
|
|
2e06c8fd58
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/sso
# Conflicts:
# build/install/win/DocSpace.aip
|
2022-08-10 09:57:03 +03:00 |
|
|
ea2f03331b
|
refactoring
|
2022-08-09 19:13:07 +03:00 |
|
|
bfe43ebe96
|
SSO: fix login
|
2022-08-09 16:53:22 +03:00 |
|
|
baaec9dcef
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# common/ASC.Socket.IO/.yarn/install-state.gz
# common/ASC.SsoAuth/.yarn/install-state.gz
# common/ASC.UrlShortener/.yarn/install-state.gz
# common/ASC.WebDav/.yarn/install-state.gz
|
2022-08-09 16:27:35 +03:00 |
|
|
6db28a8a86
|
warm up service: added logs
|
2022-08-09 12:51:32 +03:00 |
|
|
5f69b6bc0c
|
warm up services
|
2022-08-09 10:28:44 +03:00 |
|
|
f496771391
|
warm up services
|
2022-08-09 09:49:05 +03:00 |
|
|
562eb6144d
|
SSO: fix login
|
2022-08-09 01:26:27 +03:00 |
|
|
870c3cf3c4
|
warm up services
|
2022-08-08 19:25:22 +03:00 |
|
|
9ce72036ec
|
fix
|
2022-08-08 18:32:46 +03:00 |
|
|
d26eee0424
|
Async: fix webhook
|
2022-08-05 18:47:33 +03:00 |
|
|
59160afcdc
|
SSO: fix template path
|
2022-08-05 17:29:17 +03:00 |
|
|
92fa19ec82
|
Webhook: fix iasyncenumerable
|
2022-08-04 18:59:21 +03:00 |
|
|
26b79aa67b
|
Added install-state.gz to .gitignore
|
2022-08-03 17:22:10 +03:00 |
|
|
bb80d28945
|
Merge branch 'develop' into feature/async-fix
# Conflicts:
# products/ASC.Files/Core/ApiModels/ResponseDto/FolderDto.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/AbstractDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FolderDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/LinkDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
# products/ASC.Files/Core/Core/EF/FilesDbContext.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/FileSecurity.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Box/BoxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Dropbox/DropboxFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderAccountDao.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/SharePoint/SharePointFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/Sharpbox/SharpBoxFolderDao.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
|
2022-08-02 17:03:50 +03:00 |
|
|
9d3bc076b9
|
Merge pull request #747 from ONLYOFFICE/feature/fix-api
Feature/fix api
|
2022-08-02 11:59:47 +03:00 |
|
|
a4ea50c760
|
split AuditReportCreator
|
2022-08-01 17:23:50 +03:00 |
|
|
7000cd55f6
|
Merge branch 'develop' into refactoring/client
|
2022-08-01 15:59:18 +03:00 |
|
|
07e8e49579
|
Web: Fix Frontend.Translations.Tests run
|
2022-08-01 15:55:39 +03:00 |
|
|
58d3407729
|
fix
|
2022-08-01 13:58:14 +03:00 |
|
|
ceae4ff07d
|
packages updated
|
2022-08-01 13:58:12 +03:00 |
|
|
3c3234b6c2
|
Merge branch 'develop' into feature/fix-api
|
2022-08-01 13:51:05 +03:00 |
|
|
4559942c30
|
fix confrim links
|
2022-08-01 13:50:31 +03:00 |
|
|
9df9195cff
|
suppress warning
|
2022-08-01 13:41:33 +03:00 |
|
|
ef48119187
|
Update .yarn/install-state.gz
|
2022-07-29 22:38:54 +03:00 |
|
|
1ae3cce198
|
ASC.WebDav: Upgrade yarn to v3.2.2
|
2022-07-29 22:28:13 +03:00 |
|
|
5237c5ae98
|
ASC.UrlShortener: Upgrade yarn to v3.2.2
|
2022-07-29 22:26:54 +03:00 |
|
|
50ed43af17
|
ASC.SsoAuth: Upgrade yarn to v3.2.2
|
2022-07-29 22:25:53 +03:00 |
|
|
b2454b35ce
|
ASC.Socket.IO: Upgrade yarn to v3.2.2
|
2022-07-29 22:24:09 +03:00 |
|
|
fe5c8b0b13
|
fixed tests and tools
|
2022-07-29 20:23:19 +03:00 |
|
|
615448319a
|
fix mapper
|
2022-07-29 18:39:57 +03:00 |
|
|
9d69882cf3
|
removed BaseDbContext
|
2022-07-29 15:53:29 +03:00 |
|
|
6fd385e026
|
Merge branch 'develop' into feature/docspace-backup
|
2022-07-29 11:13:42 +03:00 |
|
|
dba122eb96
|
Common, files: added dbcontext pool
|
2022-07-28 21:00:49 +03:00 |
|
|
8d89d8e8f2
|
Common: added dbcontext pool
|
2022-07-28 15:29:03 +03:00 |
|
|
998366ab6f
|
EventBus: fixed ProtobufSerializer
|
2022-07-27 20:24:18 +03:00 |
|
|
997e20898a
|
EF: added support of dbcotextpool
|
2022-07-27 20:12:08 +03:00 |
|
|
2c4d415a35
|
fix restore
|
2022-07-27 17:07:02 +03:00 |
|
|
a8ee357ae8
|
fix
|
2022-07-27 15:39:53 +03:00 |
|
|
33769036d5
|
fix
|
2022-07-26 14:53:36 +03:00 |
|
|
3d22992b7d
|
Migrations: rename
|
2022-07-26 14:52:53 +03:00 |
|