|
|
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 |
|
|
|
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 |
|
|
|
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 |
|
Vashchuk Nikita
|
f86b937652
|
fix
|
2022-09-16 12:08:11 +04:00 |
|
|
|
7f7d7e5200
|
merge from develop
|
2022-09-16 00:03:52 +03:00 |
|
|
|
6b728a0fca
|
refactoring
|
2022-09-15 18:58:05 +03:00 |
|
Vashchuk Nikita
|
94fb1cb5a5
|
fix multithreading, clustering
|
2022-09-15 18:55:51 +04: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 |
|
|
|
5edb33259c
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-15 10:07:58 +03:00 |
|
|
|
17d476aafc
|
Files: added new categories OForm,OFormTemplate
|
2022-09-14 18:56:18 +03:00 |
|
|
|
c7acfe9fb0
|
Merge branch 'develop' into feature/company-info-settings
|
2022-09-14 18:31:04 +03:00 |
|
|
|
193a415fa4
|
fix whitelabel/logos
|
2022-09-14 16:23:24 +03:00 |
|
|
|
651ab44fd0
|
remove DemandPermissions in httpGet methods in WhitelabelController
|
2022-09-14 15:43:46 +03:00 |
|
|
|
0f2378b0fc
|
Web.Core: added confirm type
|
2022-09-14 14:50:03 +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 |
|
|
|
1726057d95
|
People: fix, refactor
|
2022-09-14 12:59:55 +03:00 |
|
|
|
d573733800
|
People: added invite by link
|
2022-09-13 23:47:35 +03:00 |
|
|
|
90c3cd29ba
|
fix
|
2022-09-13 22:35:54 +03:00 |
|
|
|
7a17f325b1
|
Api: payments. Removed FeaturePriceDto
|
2022-09-13 19:59:57 +03:00 |
|
|
|
6e51001e34
|
Api: payment settings.
|
2022-09-13 19:27:11 +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 |
|
|
|
1f07a7ddad
|
Merge branch 'develop' into feature/remove-waste
|
2022-09-13 17:14:49 +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 |
|
|
|
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 |
|
|
|
f7fd831a17
|
Merge branch 'develop' into feature/ip-security
|
2022-09-12 13:31:13 +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 |
|
|
|
6f710be0c2
|
Quota: refactoring
|
2022-09-09 17:39:28 +03:00 |
|
|
|
f16da6e3ad
|
refactor
|
2022-09-09 17:31:56 +03:00 |
|
|
|
d2f4ea2fcb
|
Web.Core: added confirmation link generation
|
2022-09-09 17:30:44 +03:00 |
|
|
|
c8a8ef11d6
|
refactoring
|
2022-09-09 15:26:37 +03:00 |
|
|
|
549854c579
|
add DemandPermissions
|
2022-09-09 15:20:51 +03:00 |
|
|
|
acbacaf9ef
|
Quota: removed MaxFileSize column
|
2022-09-09 15:13:54 +03:00 |
|
|
|
e8d3169af4
|
fix
|
2022-09-09 13:51:03 +03:00 |
|
|
|
6077c563b0
|
Web.Api: fix for rooms
|
2022-09-09 13:43:37 +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 |
|
|
|
bf5ce9cdb0
|
Quota: admin replaced with manager
|
2022-09-08 16:35:52 +03:00 |
|
|
|
83f4545f02
|
Quota: refactoring
|
2022-09-08 10:23:26 +03:00 |
|
|
|
950266a3d6
|
People: changed invite by link
|
2022-09-07 18:23:08 +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 |
|
|
|
59e30bf87f
|
Quota: tariff title
|
2022-09-07 10:58:44 +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 |
|
|
|
27a7c54368
|
branding for current user
|
2022-09-06 17:22:50 +03:00 |
|
|
|
46d0b89433
|
Merge pull request #788 from ONLYOFFICE/feature/rooms-feed
Feature/rooms feed
|
2022-09-06 14:46:49 +04:00 |
|
|
|
416925eb06
|
Merge branch 'feature/stripe' of github.com:ONLYOFFICE/AppServer into feature/stripe
|
2022-09-06 12:49:34 +03:00 |
|
|
|
09a02d01ff
|
Api: method without payment.
|
2022-09-06 12:48:09 +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
|
57726421f2
|
Merge branch 'develop' into feature/login-settings
# Conflicts:
# web/ASC.Web.Api/Api/Settings/SettingsController.cs
# web/ASC.Web.Api/ApiModels/ResponseDto/SettingsDto.cs
|
2022-09-06 12:17:10 +04:00 |
|
Vashchuk Nikita
|
cad3608dc2
|
fix
|
2022-09-05 15:55:42 +04: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 |
|
Vashchuk Nikita
|
f31797a896
|
added method for getting LoginSettings
|
2022-09-05 15:43:49 +04:00 |
|
|
|
7bc95a826a
|
Web.Core: changed user profile url
|
2022-09-05 13:13:37 +03:00 |
|
|
|
21fc9de84a
|
Web.Api: updated doc
|
2022-09-05 10:56:13 +03:00 |
|
|
|
d4677adffa
|
Web.Api: removed unnecessary
|
2022-09-05 10:43:41 +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 |
|
|
|
53dc57eed7
|
Quota: union with default
|
2022-09-04 16:10:16 +03:00 |
|
|
|
23e24dc9e8
|
Web.Api: added module to feed filter
|
2022-09-02 18:57:36 +03:00 |
|
|
|
a398b22ef4
|
Feature: added PriceRange
|
2022-09-02 16:10:06 +03:00 |
|
|
|
928d621dbe
|
Payment: email settings
|
2022-09-02 16:09:16 +03:00 |
|
Vashchuk Nikita
|
6fbc6c8b78
|
fix
|
2022-09-02 15:13:10 +04:00 |
|
|
|
195d514db8
|
fix
|
2022-09-02 12:57:23 +03:00 |
|
|
|
56102771ee
|
Quota: check recalculate quota
|
2022-09-02 11:25:27 +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 |
|
|
|
7c3af54718
|
Web.Api: fix
|
2022-09-01 19:38:26 +03:00 |
|
|
|
bf4a27def5
|
Web.Api: added feed api
|
2022-09-01 18:22:40 +03:00 |
|
|
|
120c9b3bdb
|
Quota: error processing
|
2022-09-01 17:04:02 +03:00 |
|
|
|
77657329a6
|
Quota: fix recalculate quota
|
2022-09-01 13:45:48 +03:00 |
|
|
|
1cdb6bbb20
|
Quota: recalculate quota
|
2022-09-01 11:37:15 +03:00 |
|
|
|
99011714c8
|
Api: rename.
|
2022-09-01 11:27:10 +03:00 |
|
|
|
c0bdb98da9
|
Api: quota name
|
2022-08-31 22:58:45 +03:00 |
|
|
|
b96dc2425c
|
Api: fixed delete method
|
2022-08-31 22:27:30 +03:00 |
|
|
|
bf52f50ad3
|
remove waste in asc.web.core
|
2022-08-31 17:46:11 +03:00 |
|
|
|
3ba02c3e2a
|
Quota: recalculate quota
|
2022-08-31 17:42:00 +03:00 |
|
|
|
6b245e9e94
|
Quota: fixed total_size
|
2022-08-30 21:30:07 +03:00 |
|
|
|
daa9645259
|
Api: methods without payment
|
2022-08-30 19:19:15 +03:00 |
|
|
|
ea2d97b6f5
|
Api: removed unused columns
|
2022-08-30 19:01:12 +03:00 |
|
|
|
feaccc484b
|
Api: Changed icons.
|
2022-08-30 16:25:24 +03:00 |
|
|
|
54ff8de78b
|
Quota: moved UserQuotaSettings
|
2022-08-30 16:03:14 +03:00 |
|
|
|
1c9d3ebfab
|
Api: payment/tariff method
|
2022-08-30 11:39:43 +03:00 |
|
|
|
bf7f4f04da
|
Merge branch 'develop' into feature/user-quota
|
2022-08-30 11:04:49 +03:00 |
|
|
|
701a1ba4ef
|
Quota: save the default user quota setting
|
2022-08-30 02:26:54 +03:00 |
|
|
|
8e5fcfc3c8
|
Quota: errors
|
2022-08-29 23:35:25 +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 |
|
Vlada Gazizova
|
302e2e655a
|
Merge branch 'develop' into feature/settings-common
|
2022-08-27 12:17: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 |
|
|
|
9cfa1cd4b3
|
Api: payment/currencies
|
2022-08-26 17:33:55 +03:00 |
|
TimofeyBoyko
|
3803163ff3
|
Merge branch 'develop' into feature/system-plugin-v2
|
2022-08-26 13:26:41 +03:00 |
|
|
|
641695ec51
|
Removed paymentManager, DbButton, DbTenantPartner. Added PaymentConfiguration, PaymentsController
|
2022-08-25 23:09:12 +03:00 |
|
|
|
d8ff05f7c6
|
Merge branch 'develop' into feature/docspace-backup
|
2022-08-25 16:34:59 +03:00 |
|
|
|
4dcd9be041
|
fix: removed IOptionsSnapshot
|
2022-08-25 13:29:08 +03:00 |
|
Vashchuk Nikita
|
ca87e9fd9c
|
small fix
|
2022-08-25 12:38:11 +04:00 |
|
Vashchuk Nikita
|
54284b0d61
|
removed LoginThreshold
|
2022-08-24 19:15:22 +04:00 |
|
Vashchuk Nikita
|
ccca35ca4a
|
added loginSettings to protect against brute-force
|
2022-08-24 19:11:44 +04:00 |
|
|
|
9523560b16
|
Push: fix api
|
2022-08-24 14:26:45 +03:00 |
|
|
|
1ae7d3b11d
|
Api: push controller. Removed projects
|
2022-08-23 18:03:00 +03:00 |
|
|
|
32e3ec6af2
|
Settings: Added plugins config
|
2022-08-23 17:51:06 +03:00 |
|
|
|
20dcd59616
|
Merge branch 'develop' into feature/push
|
2022-08-23 13:24:36 +03:00 |
|
|
|
737359b21a
|
Merge branch 'develop' into feature/stripe
|
2022-08-23 12:05:06 +03:00 |
|
|
|
d75edd14d6
|
Merge branch 'develop' into feature/settings-common
# Conflicts:
# config/appsettings.json
|
2022-08-22 15:07:55 +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 |
|
|
|
907b793c30
|
Settings: communityserver version
|
2022-08-19 16:49:33 +03:00 |
|
|
|
2e85702127
|
Settings: version. CommunityServer replaced with DocSpace
|
2022-08-19 16:34:39 +03:00 |
|
|
|
36c30428fc
|
Merge branch 'develop' into feature/settings-common
|
2022-08-19 15:05:33 +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 |
|
|
|
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 |
|
|
|
4cdce5b713
|
Webhook: async
|
2022-08-17 12:18:50 +03:00 |
|
|
|
b82a4206e0
|
Merge branch 'develop' into feature/settings-common
|
2022-08-12 18:04:11 +03:00 |
|
|
|
0973f4e8d1
|
Files: removed .result
|
2022-08-12 16:26:57 +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 |
|
|
|
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 |
|
|
|
9fcefe157d
|
Api: added method portal/payment/url
|
2022-08-12 15:57:32 +03:00 |
|
|
|
90c19508ea
|
CoreCommon: tariff contains a list of quotas
|
2022-08-12 15:57:31 +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 |
|
|
|
655cccb5c1
|
add "AddBaseDbContextPool"
|
2022-08-12 15:06:49 +03:00 |
|
|
|
200b425a39
|
Web:Common:Added LinkForgotPasswordTheme.
|
2022-08-12 12:35:50 +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 |
|
|
|
c39451a531
|
Web: Added room selection.
|
2022-08-11 15:54:12 +03:00 |
|
|
|
e61b726a5d
|
Web: Fixed icons color.
|
2022-08-11 11:00:54 +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 |
|
|
|
83e7ad25d2
|
SSO: fixed successful login
|
2022-08-09 17:14:35 +03:00 |
|
|
|
bfe43ebe96
|
SSO: fix login
|
2022-08-09 16:53:22 +03:00 |
|
|
|
870c3cf3c4
|
warm up services
|
2022-08-08 19:25:22 +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 |
|
|
|
a22fb71edc
|
Web: Restore: Refactoring.
|
2022-08-01 14:51:53 +03:00 |
|
|
|
de9f0136b8
|
Web: Fixed translation.
|
2022-08-01 14:24:05 +03:00 |
|
|
|
ceae4ff07d
|
packages updated
|
2022-08-01 13:58:12 +03:00 |
|
|
|
72f29b2f6e
|
Web: Refactoring, the button is disabled if the required fields are not filled.
|
2022-08-01 13:02:56 +03:00 |
|
|
|
f2ae627ca0
|
fix api
|
2022-08-01 12:34:17 +03:00 |
|
|
|
d0e692cecb
|
Web: Refactoring.
|
2022-08-01 12:29:56 +03:00 |
|
|
|
b03f8bc1dc
|
Merge branch 'develop' into feature/pool-context
|
2022-08-01 11:49:11 +03:00 |
|
|
|
98a24ec8a1
|
Web: RestoreBackup: Added missing prop.
|
2022-08-01 10:26:17 +03:00 |
|
|
|
f61c44a65c
|
Web: Fixed saving settings, refactoring. (third-party storages)
|
2022-08-01 10:25:35 +03:00 |
|
|
|
80ceba411d
|
Web: AutoBackup: Deleted useless code.
|
2022-07-31 21:18:58 +03:00 |
|
|
|
c49ab54f0d
|
Web: AutoBackup: Added new fields for amazon, fixed reset settings.
|
2022-07-31 21:05:57 +03:00 |
|
|
|
16d35e05b7
|
Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup
|
2022-07-29 18:06:35 +03:00 |
|
|
|
b9fa0f4673
|
Web: Added new options for Amazon storage.
|
2022-07-29 18:04:23 +03:00 |
|
Artem Tarasov
|
a649228525
|
Web: Doceditor: added React.Suspense
|
2022-07-29 16:16:17 +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 |
|
|
|
98645969b6
|
Web: Moved some files from past locations
|
2022-07-28 19:10:36 +03:00 |
|
|
|
c1ab8edaaf
|
Merge branch 'develop' into refactoring/client
|
2022-07-28 18:32:32 +03:00 |
|
Artem Tarasov
|
5496cdbe05
|
Web: Doceditor/build: changed deploy path for editor
|
2022-07-28 17:39:25 +03:00 |
|
Artem Tarasov
|
df74259b50
|
Web: Doceditor: added config to define port
|
2022-07-28 17:11:38 +03:00 |
|
|
|
90cd7c1dbf
|
Web: Added missed prop.
|
2022-07-28 15:54:08 +03:00 |
|
|
|
5651d3645e
|
Web: Refactoring.
|
2022-07-28 15:50:09 +03:00 |
|
Artem Tarasov
|
9921925bdb
|
Web: Doceditor: express is included in server build, added required dependencies
|
2022-07-28 15:40:46 +03:00 |
|
|
|
8d89d8e8f2
|
Common: added dbcontext pool
|
2022-07-28 15:29:03 +03:00 |
|
|
|
e61d77b624
|
Web: Optimization of component.
|
2022-07-28 12:42:34 +03:00 |
|
|
|
53737a06e8
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/editor/src/client/components/DynamicComponent.js
# packages/editor/src/client/components/Editor.js
# packages/editor/src/client/components/SelectFileDialog.js
# packages/editor/src/client/components/SelectFolderDialog.js
# packages/editor/src/client/components/SharingDialog.js
# packages/editor/src/client/helpers/utils.js
# packages/editor/src/client/helpers/withDialogs.js
# packages/editor/src/server/lib/helpers/index.js
|
2022-07-28 10:38:29 +03:00 |
|
|
|
ddcde5f7ed
|
Web: Backup: Added error handlers, filtered the list of accounts in the correct order, removed base folder selection .
|
2022-07-27 18:29:27 +03:00 |
|
|
|
6091fe7d2a
|
Sso: fix
|
2022-07-26 18:14:53 +03:00 |
|
|
|
6f8b849a09
|
Web:Studio: Styled Appearance.
|
2022-07-26 18:08:58 +03:00 |
|
|
|
721e442374
|
Web:Studio:Add BreakpointWarning component.
|
2022-07-26 18:08:00 +03:00 |
|
|
|
8be8b072d1
|
Web: Restore: Returned restore.
|
2022-07-26 16:50:22 +03:00 |
|
|
|
a7a70246fc
|
Web: Backup: Added missed props.
|
2022-07-26 15:53:35 +03:00 |
|
Artem Tarasov
|
2988838060
|
Merge branch 'develop' into bugfix/doceditor-fix
|
2022-07-26 12:32:41 +03:00 |
|
Artem Tarasov
|
2529a7a123
|
Web: Doceditor: fixed convert file
|
2022-07-26 12:32:04 +03:00 |
|
|
|
81e7526c10
|
Merge branch 'feature/docspace-backup' of github.com:ONLYOFFICE/AppServer into feature/docspace-backup
|
2022-07-26 12:04:25 +03:00 |
|
|
|
5dccd8f52c
|
Web: Backup: Added direct third-party connection component.
|
2022-07-26 12:03:35 +03:00 |
|
|
|
dc4f066b05
|
Merge branch 'develop' into feature/migrations-fix
|
2022-07-26 11:37:48 +03:00 |
|
Artem Tarasov
|
294cdf4881
|
Web: Files/Doceditor: fixed method call SharingPanel.convertSharingUsers (ssr)
|
2022-07-26 11:19:01 +03:00 |
|
Artem Tarasov
|
045c00b4ff
|
Web: Common/Doceditor: fixed name of init state of editor
|
2022-07-26 10:56:25 +03:00 |
|
|
|
280f702cf9
|
Merge branch 'develop' into refactoring/client
# Conflicts:
# packages/client/src/Shell.jsx
# packages/client/src/components/NavMenu/index.js
# packages/client/src/store/ProfileActionsStore.js
# yarn.lock
|
2022-07-25 21:29:04 +03:00 |
|
Artem Tarasov
|
42c42f19eb
|
Merge branch 'develop' into bugfix/doceditor-fix
|
2022-07-25 18:05:08 +03:00 |
|
Artem Tarasov
|
d50a932443
|
Web: Doceditor: removed PreparePortalDialog and added a call to docEditor.showMessage when the portal is being restored
|
2022-07-25 17:57:44 +03:00 |
|
Artem Tarasov
|
eb352fd860
|
Web: Client/public: Moved PreparePortalTitle key from PreporationPortal.json to Common.json.
|
2022-07-25 17:54:51 +03:00 |
|
