|
|
0a955950e6
|
fix
|
2022-10-19 17:11:52 +03:00 |
|
|
|
2b95553037
|
another fix quota
|
2022-10-19 16:22:13 +03:00 |
|
|
|
22a24de659
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-19 15:31:14 +03:00 |
|
|
|
0ad23f779c
|
fix quota
|
2022-10-19 14:53:56 +03:00 |
|
|
|
a1ff4230a7
|
fix merge
|
2022-10-19 14:30:14 +03:00 |
|
|
|
afc9d1ce17
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-19 14:18:52 +03:00 |
|
|
|
16bb42d0af
|
fix ASC.Data.Storage.Encryption
|
2022-10-19 13:12:33 +03:00 |
|
|
|
4e0d77a239
|
fix wizard
|
2022-10-19 12:48:23 +03:00 |
|
|
|
9df8c0d69f
|
Quota: fix
|
2022-10-18 21:37:16 +03:00 |
|
|
|
a2afba0a28
|
Quota: fix
|
2022-10-18 18:13:35 +03:00 |
|
|
|
be8b455718
|
Files: UsersInRoom feature
|
2022-10-18 17:12:35 +03:00 |
|
|
|
1a5c273825
|
refactor
|
2022-10-18 14:43:31 +03:00 |
|
|
|
7af080486c
|
Merge branch 'develop' into feature/rights-rework
|
2022-10-18 14:32:17 +03:00 |
|
|
|
a2d144514d
|
refactor
|
2022-10-18 14:22:02 +03:00 |
|
|
|
502aac91b1
|
ApiSystem: log, service
|
2022-10-17 18:24:50 +03:00 |
|
|
|
c938a98d00
|
fix ValidateDomain
|
2022-10-17 17:48:41 +03:00 |
|
|
|
65a066b61e
|
fix merge
|
2022-10-17 16:21:09 +03:00 |
|
|
|
ed22136269
|
Merge branch 'develop' into feature/remove-waste
|
2022-10-17 14:31:57 +03:00 |
|
|
|
7280d2d52b
|
Merge branch 'develop' into feature/recalculate-user-quota
|
2022-10-17 14:20:31 +03:00 |
|
|
|
b81d6e44b3
|
Merge branch 'feature/apisystem' of github.com:ONLYOFFICE/DocSpace into feature/apisystem
|
2022-10-17 13:05:22 +03:00 |
|
|
|
5cbae9e177
|
Merge branch 'develop' into feature/apisystem
|
2022-10-17 13:04:49 +03:00 |
|
|
|
19ad5b0ef2
|
fix api system
|
2022-10-17 12:15:44 +03:00 |
|
|
|
a77b213f75
|
fix jwt
|
2022-10-17 11:39:59 +03:00 |
|
|
|
e2ccab3c97
|
ApiSystem: fix
|
2022-10-14 17:52:00 +03:00 |
|
|
|
b70b89d939
|
fix headers
|
2022-10-14 12:26:02 +03:00 |
|
|
|
7e17ec27e7
|
fix
|
2022-10-14 11:56:01 +03:00 |
|
|
|
cd25dcc8b3
|
Merge branch 'develop' into feature/apisystem
|
2022-10-14 11:27:19 +03:00 |
|
|
|
d6441948f3
|
Quota: fix
|
2022-10-13 18:12:04 +03:00 |
|
|
|
21075fd4c3
|
Quota: fix
|
2022-10-13 17:45:09 +03:00 |
|
|
|
d5d78e7550
|
Merge pull request #892 from ONLYOFFICE/feature/local-restore
fix local restore
|
2022-10-13 16:22:59 +03:00 |
|
|
|
c7fbe5d87c
|
Billing: fix cache
|
2022-10-13 12:30:24 +03:00 |
|
diana-vahomskaya
|
a2f120e86a
|
fixed letters for DocSpace, added new text for footer: TextForFooterUnsubsribeDocSpace
|
2022-10-13 11:53:18 +03:00 |
|
|
|
1c5bea4fcc
|
fix cache
|
2022-10-12 17:02:07 +03:00 |
|
|
|
c1208e931a
|
added support ActiveMQ EventBus
|
2022-10-12 14:43:00 +03:00 |
|
|
|
42c12ca706
|
Added AllowSuspendedFilter
|
2022-10-12 12:29:08 +03:00 |
|
|
|
0a1ab5c77d
|
ApiSystem: fix
|
2022-10-11 15:52:45 +03:00 |
|
|
|
ded6b08e0e
|
fix GetTmpFilePath
|
2022-10-11 15:29:23 +03:00 |
|
|
|
dc2cfbc614
|
Merge branch 'develop' into feature/apisystem
# Conflicts:
# web/ASC.Web.Core/PublicResources/Resource.resx
|
2022-10-11 13:53:31 +03:00 |
|
|
|
9d050b0c6a
|
fix
|
2022-10-11 13:14:50 +03:00 |
|
|
|
b160c16fc2
|
creating rooms and users feature available only for paid portals
|
2022-10-11 11:02:43 +03:00 |
|
|
|
cf2547e030
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/common/constants/index.js
|
2022-10-11 10:20:42 +03:00 |
|
|
|
4dbf1e70b7
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.ActiveDirectory/GlobalUsings.cs
# common/ASC.Data.Storage/StorageFactory.cs
# common/ASC.Data.Storage/TenantQuotaController.cs
# migrations/mysql/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/postgre/CoreDbContext/CoreDbContextModelSnapshot.cs
# packages/client/src/pages/PortalSettings/categories/common/settingsBranding/whitelabel.js
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Core/PublicResources/Resource.resx
# web/ASC.Web.Core/Sms/StudioSmsNotificationSettings.cs
|
2022-10-10 19:16:03 +03:00 |
|
mushka
|
415c620574
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-10 17:27:16 +03:00 |
|
|
|
a563bbe3cf
|
Merge branch 'develop' into feature/two-factor-authentication
# Conflicts:
# web/ASC.Web.Api/Api/AuthenticationController.cs
|
2022-10-09 21:32:14 +03:00 |
|
mushka
|
aecc841e55
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-10-07 17:15:15 +03:00 |
|
|
|
302b9c57ff
|
fix
|
2022-10-07 17:08:38 +03:00 |
|
|
|
e3bcada474
|
fix
|
2022-10-07 16:49:03 +03:00 |
|
|
|
c8e6578c11
|
fix
|
2022-10-07 16:48:06 +03:00 |
|
|
|
5b96dbdb55
|
removed DbUsersQuotaRow
|
2022-10-07 16:37:57 +03:00 |
|
|
|
090259d313
|
Merge branch 'feature/user-quota' of https://github.com/ONLYOFFICE/DocSpace into feature/user-quota
|
2022-10-06 15:56:37 +03:00 |
|
|
|
4ebd5323c0
|
Quota: fix
|
2022-10-06 15:55:47 +03:00 |
|
|
|
62c6f366df
|
fix local restore
|
2022-10-06 15:51:15 +03:00 |
|
|
|
f655620485
|
Quota: fix
|
2022-10-06 15:17:07 +03:00 |
|
|
|
143cc76066
|
fix
|
2022-10-06 12:01:43 +03:00 |
|
|
|
89390657cf
|
fix
|
2022-10-06 11:43:16 +03:00 |
|
|
|
11ffccf983
|
fix
|
2022-10-06 11:22:10 +03:00 |
|
|
|
cfbbf351db
|
fix
|
2022-10-05 15:25:08 +03:00 |
|
|
|
400fc49bb6
|
api system
-fix api system
-TenantName from resources
|
2022-10-05 14:23:53 +03:00 |
|
|
|
803f342d2d
|
Payments: fix delay
|
2022-10-05 13:38:35 +03:00 |
|
|
|
731c32795f
|
Payments: fix cache
|
2022-10-05 12:12:16 +03:00 |
|
|
|
9f9a4c3815
|
Payments: id from billing
|
2022-10-04 15:58:59 +03:00 |
|
Vashchuk Nikita
|
4b1c7644af
|
added functionality for flexible tfa configuration
|
2022-10-04 13:40:21 +04:00 |
|
|
|
ed42050de3
|
Merge branch 'feature/feed' into feature/doc-space-info-panel
|
2022-09-26 11:14:35 +03:00 |
|
mushka
|
af16f21d4a
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-26 11:00:34 +03:00 |
|
|
|
607def32aa
|
Merge branch 'develop' into feature/feed
|
2022-09-26 10:28:10 +03:00 |
|
|
|
00bd41ad0a
|
Merge branch 'develop' into feature/user-quota
|
2022-09-23 17:15:49 +03:00 |
|
|
|
28802b6926
|
Quota: fix
|
2022-09-23 17:14:55 +03:00 |
|
|
|
7d19f090fb
|
Feed: refactor
|
2022-09-23 16:19:17 +03:00 |
|
|
|
7f1d946269
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/pages/PortalSettings/Layout/Article/Body/index.js
# packages/client/src/pages/PortalSettings/categories/common/settingsCustomization/dns-settings.js
# packages/client/src/pages/PortalSettings/index.js
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.People/Server/Api/UserController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Core/HttpHandlers/SsoHandler.cs
|
2022-09-23 16:11:23 +03:00 |
|
|
|
4f3831ac16
|
DbTariffRow: removed id
|
2022-09-23 15:26:26 +03:00 |
|
|
|
d7e17828e0
|
Files: added additional parameters to feed
|
2022-09-23 14:57:04 +03:00 |
|
|
|
130e485a0c
|
Payments: refactoring. TrialEnabled setting
|
2022-09-21 18:44:32 +03:00 |
|
|
|
d9dd4c7139
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-21 13:52:51 +03:00 |
|
|
|
557b1baaf9
|
Merge branch 'develop' into feature/room-security
|
2022-09-21 12:22:45 +03:00 |
|
|
|
9c8bf9708a
|
Payment: UsersInRoomStatistic
|
2022-09-20 23:22:27 +03:00 |
|
mushka
|
c835f2960c
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-20 14:21:44 +03:00 |
|
|
|
ead5485288
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-19 23:30:28 +03:00 |
|
|
|
c91968adf6
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe
|
2022-09-19 22:59:12 +03:00 |
|
|
|
ccbbc5499e
|
Quota: MaxFileSizeChecker
|
2022-09-19 22:49:41 +03:00 |
|
|
|
eeb94810f1
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/DocSpace into feature/stripe
|
2022-09-19 18:40:08 +03:00 |
|
|
|
5740b578db
|
Payment: rename
|
2022-09-19 18:20:21 +03:00 |
|
|
|
6448b63318
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/constants/index.js
# web/ASC.Web.Api/Program.cs
|
2022-09-19 18:16:34 +03:00 |
|
|
|
bf4eee0f11
|
Fix Confirm LinkInvite validation
|
2022-09-19 18:08:00 +03:00 |
|
|
|
4b0fc12efc
|
Payment: rename
|
2022-09-19 18:03:25 +03:00 |
|
|
|
5848bf5cd3
|
Api: payments check
|
2022-09-19 17:56:45 +03:00 |
|
|
|
d05071110d
|
Merge branch 'develop' into feature/room-security
|
2022-09-19 11:54:55 +03:00 |
|
|
|
9faa6a947a
|
Files: refactor
|
2022-09-19 11:50:31 +03:00 |
|
|
|
a51cde20c7
|
Merge branch 'develop' into feature/doc-space-info-panel
# Conflicts:
# products/ASC.Files/Service/Extensions/ConfigurationManagerExtension.cs
|
2022-09-16 18:26:36 +03:00 |
|
|
|
6563d4b633
|
nlog: refactoring service name
|
2022-09-16 16:41:51 +03:00 |
|
mushka
|
9c8fa64983
|
Merge branch 'develop' into feature/doc-space-info-panel
|
2022-09-16 15:33:29 +03:00 |
|
|
|
7f7d7e5200
|
merge from develop
|
2022-09-16 00:03:52 +03:00 |
|
|
|
c91711dbeb
|
hosting: fixed running ActivePassive instance
|
2022-09-15 23:56:55 +03:00 |
|
|
|
581598e5d7
|
Quota: fix
|
2022-09-15 23:40:19 +03:00 |
|
|
|
de122f813e
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-15 21:17:28 +03:00 |
|
|
|
6b728a0fca
|
refactoring
|
2022-09-15 18:58:05 +03:00 |
|
|
|
53e0146a26
|
Quota: countroom
|
2022-09-15 17:44:48 +03:00 |
|
|
|
ee27ad4437
|
nlog: support target aws cloudfront. refactoring startup.cs. added applicationContext,integrationEventContext property
|
2022-09-15 17:44:04 +03:00 |
|
|
|
bec4f11dcd
|
Merge branch 'develop' into feature/stripe
# Conflicts:
# common/ASC.Api.Core/Extensions/HostBuilderExtension.cs
# common/services/ASC.Notify/Program.cs
# common/services/ASC.Studio.Notify/Program.cs
# common/services/ASC.Webhooks.Service/Program.cs
# packages/common/components/Loaders/index.js
# packages/common/store/AuthStore.js
# packages/login/src/client/components/sub-components/recover-access-modal-dialog.tsx
# packages/login/webpack.config.js
# products/ASC.Files/Service/Program.cs
# web/ASC.Web.Api/Program.cs
|
2022-09-15 17:16:04 +03:00 |
|
|
|
cfb0c957e9
|
Quota: user quota storage core_user -> webstudio_settings
|
2022-09-15 15:38:31 +03:00 |
|
|
|
12780606c2
|
Merge branch 'develop' into feature/backup_remove_waste_modules
|
2022-09-15 14:27:24 +03:00 |
|
|
|
2aae44f654
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into feature/new-profile
|
2022-09-14 15:02:50 +03:00 |
|
|
|
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 |
|
|
|
489b13ce1a
|
fix
|
2022-09-13 18:15:32 +03:00 |
|
|
|
c8c2ca5232
|
fix
|
2022-09-13 18:13:40 +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 |
|
|
|
896e1a7aeb
|
fix
add checks new alias, fix backup
|
2022-09-13 17:11:23 +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 |
|
|
|
371195e43f
|
Merge branch 'develop' into feature/migration_personal
|
2022-09-09 12:28:56 +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 |
|
|
|
7d9e2f9193
|
Merge branch 'develop' into feature/migration_personal
|
2022-09-06 13:18:34 +03:00 |
|
|
|
e15d0163a2
|
Api.Core: removed unnecessary
|
2022-09-06 13:02:12 +03:00 |
|
|
|
4009aba75f
|
fix GetLink for transfer
|
2022-09-06 12:45:51 +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 |
|
|
|
5d7998688d
|
Merge branch 'develop' into feature/migration_personal
|
2022-09-05 17:39:20 +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 |
|
|
|
e4d379c411
|
backup: add regions
|
2022-09-05 14:27:38 +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 |
|
|
|
9dd20acc6f
|
add exe file
|
2022-08-29 13:34:41 +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 |
|
|
|
1a098875a6
|
migration personal: runner
|
2022-08-15 01:12:59 +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 |
|
