|
|
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 |
|
Artem Tarasov
|
64305a3c2c
|
Web: Common/Doceditor: fixed request of build version and custom scheme
|
2022-07-25 17:10:38 +03:00 |
|
|
|
46a0d3f446
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into bugfix/article
|
2022-07-25 16:47:15 +03:00 |
|
Artem Tarasov
|
e701def2d7
|
Web: Common/Doceditor: fixed portal settings request
|
2022-07-25 16:24:10 +03:00 |
|
Artem Tarasov
|
ba40abd43e
|
Web: Common/Doceditor: fixed user request when initializing auth state
|
2022-07-25 16:14:24 +03:00 |
|
|
|
09f3b29fe9
|
backup s3
|
2022-07-25 16:13:36 +03:00 |
|
Artem Tarasov
|
9dcff71504
|
Web: Doceditor/Client: fixed share settings request (ssr)
|
2022-07-25 14:52:18 +03:00 |
|
|
|
8acb550b08
|
files helpers moved to ASC.Files.Core
|
2022-07-25 14:03:31 +03:00 |
|
Artem Tarasov
|
57fb7ca7e1
|
Web: Doceditor: fixed api requests
|
2022-07-25 13:24:43 +03:00 |
|
|
|
57f797ab24
|
Merge branch 'develop' into feature/migrations-fix
|
2022-07-25 12:59:19 +03:00 |
|
|
|
c01edd78be
|
Api: Capabilities fix
|
2022-07-25 12:57:03 +03:00 |
|
Artem Tarasov
|
06450fe804
|
Merge branch 'develop' into bugfix/doceditor-fix
|
2022-07-25 10:39:06 +03:00 |
|
Artem Tarasov
|
5656eb6072
|
Web: Doceditor: optimized dialog rendering
|
2022-07-25 10:37:57 +03:00 |
|
|
|
61ec4a18da
|
migrations moved to external projects
|
2022-07-24 16:02:00 +03:00 |
|
|
|
ea74b77dcd
|
Web: Client: move toast to shell
|
2022-07-24 00:50:19 +03:00 |
|
|
|
86337271e4
|
Web: Client: IndicatorLoader: fix position
|
2022-07-23 22:07:50 +03:00 |
|
|
|
8152557397
|
Web: Client: Settings: fix article loader
|
2022-07-23 22:07:25 +03:00 |
|
|
|
bcf6faf40d
|
Web: Client: add dialogs wrapper, fix rerender
|
2022-07-23 02:15:16 +03:00 |
|
|
|
7cf51de990
|
Web: Client: ProfileActionsStore: fix open about
|
2022-07-23 02:07:37 +03:00 |
|
Vashchuk Nikita
|
b336eafa37
|
Merge branch 'feature/migrations-fix' of github.com:ONLYOFFICE/AppServer into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220722192649_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-22 22:40:58 +03:00 |
|
Vashchuk Nikita
|
8a1a8b809f
|
fix contexts
|
2022-07-22 22:31:42 +03:00 |
|
|
|
e7252c4bc4
|
Web: Moved all clients app to packages directory
|
2022-07-22 22:01:25 +03:00 |
|
|
|
e07e2be900
|
Api: theme method is now anonymous
|
2022-07-22 19:32:51 +03:00 |
|
|
|
12e7d4edbf
|
Merge branch 'develop' into feature/settings-common
|
2022-07-22 13:22:59 +03:00 |
|
|
|
c7ed3ed7bf
|
Web:Studio:Added a toastr.
|
2022-07-22 13:19:30 +03:00 |
|
|
|
82759ba40d
|
Web:Studio:Saving the selected theme.
|
2022-07-22 11:13:06 +03:00 |
|
|
|
61a1862f50
|
Web: Client: ProfileActionsStore: add icon
|
2022-07-22 10:31:32 +03:00 |
|
|
|
180aa03d95
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-22 10:22:52 +03:00 |
|
|
|
b0682e5da3
|
Api: fixed colortheme
|
2022-07-21 20:51:01 +03:00 |
|
|
|
9792fcb72f
|
api: fix
|
2022-07-21 18:06:34 +03:00 |
|
Artem Tarasov
|
284f0ef58d
|
Web: Common/Client: deleted unnecessary comment, fix import tryRedirectTo
|
2022-07-21 18:05:23 +03:00 |
|
|
|
4e83c68e4c
|
Api: added themelimit
|
2022-07-21 18:02:32 +03:00 |
|
|
|
fbc4bc000b
|
Web: Login: add docspace logo
|
2022-07-21 17:08:58 +03:00 |
|
|
|
88c23a0453
|
Web: Client: hide header on login page
|
2022-07-21 16:41:29 +03:00 |
|
Artem Tarasov
|
f191e3f3ca
|
Web: Doceditor: fixed logpath
|
2022-07-21 16:01:01 +03:00 |
|
|
|
3bc5f3a6eb
|
Api: added theme methods
|
2022-07-21 14:49:30 +03:00 |
|
|
|
fa5bec9adc
|
Web: Client: NavMenu: fix logo position
|
2022-07-21 14:49:00 +03:00 |
|
Artem Tarasov
|
67e6e54f45
|
Web: Doceditor: fixed timeout clearing before broadcast signal after client build
|
2022-07-21 14:48:50 +03:00 |
|
|
|
80de7c43d4
|
Web: Client: move indicator loader from navmenu
|
2022-07-21 14:37:44 +03:00 |
|
|
|
831bdc578f
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-21 14:22:28 +03:00 |
|
Artem Tarasov
|
243ccf34a5
|
Web: Doceditor: fixed adding script with src="undefined", client bundle optimization
|
2022-07-21 13:56:59 +03:00 |
|
|
|
77d311b636
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-21 11:41:42 +03:00 |
|
Artem Tarasov
|
166eaadde0
|
Web: Doceditor: changed server hierarchy, optimization of dev and prod server builds, client refactoring
|
2022-07-21 02:50:50 +03:00 |
|
|
|
1495190df7
|
Web:Studio:Modal save button work.
|
2022-07-20 23:47:14 +03:00 |
|
Artem Tarasov
|
36f10d4959
|
Web: Doceditor: refactoring
|
2022-07-20 23:23:53 +03:00 |
|
Artem Tarasov
|
b7ceb047df
|
Web: Doceditor: added winston to initMiddleware
|
2022-07-20 23:14:20 +03:00 |
|
|
|
a5f4435b17
|
fix notify
|
2022-07-20 22:06:33 +03:00 |
|
Artem Tarasov
|
3f4e4f599c
|
Web: Doceditor: fixed webpack production build
|
2022-07-20 14:44:44 +03:00 |
|
Artem Tarasov
|
abdfe934d6
|
Web: Doceditor: fixed process.cwd -> path.join
|
2022-07-20 14:43:27 +03:00 |
|
Artem Tarasov
|
77b7fc884e
|
Web: Doceditor: fixed build and deploy scripts
|
2022-07-20 14:42:35 +03:00 |
|
|
|
68bfe739ca
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-20 14:15:42 +03:00 |
|
|
|
5b762545a4
|
Merge branch 'develop' into feature/settings-common
|
2022-07-20 14:00:11 +03:00 |
|
Artem Tarasov
|
20d31cb0c2
|
Web: Doceditor: refactoring, restoring error message display
|
2022-07-20 13:25:09 +03:00 |
|
|
|
cccd0cfc31
|
Web:Studio:Added modal button functionality.
|
2022-07-20 13:00:13 +03:00 |
|
|
|
2c9a4f8181
|
Web: Client: fix t ns and keys
|
2022-07-20 12:27:30 +03:00 |
|
|
|
cf1b168dd6
|
Web: move locales to Common
|
2022-07-20 12:22:38 +03:00 |
|
|
|
75042eedf0
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# packages/asc-web-common/components/Article/styled-article.js
|
2022-07-20 10:00:32 +03:00 |
|
|
|
df26c82593
|
Tfa: fix reset cookie
|
2022-07-20 09:56:24 +03:00 |
|
Artem Tarasov
|
37dbf5e38f
|
Web: Doceditor: fixed render SelectFolderDialog
|
2022-07-20 02:19:40 +03:00 |
|
Artem Tarasov
|
aafb79500f
|
Web: Doceditor: moved client i18n initialization from developer, fixed render SelectFileDialog
|
2022-07-20 00:52:49 +03:00 |
|
Artem Tarasov
|
3f8a1d9f99
|
Web: Doceditor: fixed render dialogs, added MobxProvider
|
2022-07-20 00:17:37 +03:00 |
|
Artem Tarasov
|
040880d3c7
|
Web: Doceditor: fixed font loading
|
2022-07-19 23:12:38 +03:00 |
|
Artem Tarasov
|
4ddffad7b2
|
Merge branch 'develop' into feature/doceditor-ssr
|
2022-07-19 18:22:16 +03:00 |
|
|
|
66b0e8c303
|
Merge branch 'develop' into bugfix/tfa
|
2022-07-19 18:17:22 +03:00 |
|
|
|
067e105814
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-19 16:58:02 +03:00 |
|
|
|
b98524532f
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/CRM/DbVoipCall.cs
# common/ASC.Core.Common/EF/Model/CRM/VoipNumber.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/20220711152836_VoipDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/VoipDbContextMySql/MySqlVoipDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/20220711152837_VoipDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/VoipDbContextPostgreSql/PostgreSqlVoipDbContextModelSnapshot.cs
|
2022-07-19 16:04:29 +03:00 |
|
|
|
c17817eed8
|
Web: Client: NavMenu: delete email
|
2022-07-19 14:35:48 +03:00 |
|
|
|
0c2d54638f
|
Web: Client: NavMenu: fix button size
|
2022-07-19 14:10:36 +03:00 |
|
|
|
7f241f4c90
|
Web: Client: add profile actions
|
2022-07-19 14:08:06 +03:00 |
|
|
|
ad4767d572
|
Web: Client: move debug dialog to shell
|
2022-07-19 12:35:08 +03:00 |
|
Artem Tarasov
|
3da9439f0f
|
Web: Doceditor: fixed webpack config
|
2022-07-19 10:58:50 +03:00 |
|
Artem Tarasov
|
9f19891d0b
|
Web: Doceditor: fix after merge
|
2022-07-19 10:48:26 +03:00 |
|
|
|
a82f4293e7
|
Web: Client: ProfileActionsStore: add urls, fix about
|
2022-07-18 22:09:38 +03:00 |
|
|
|
93fc644a6a
|
Web: Client: NavMenu: use profile actions store
|
2022-07-18 22:09:07 +03:00 |
|
|
|
7b6b252a09
|
Web: Client: create profile actions store, del about store
|
2022-07-18 21:46:43 +03:00 |
|
|
|
8648b588fa
|
Web:Studio:Сolor palette stylization.
|
2022-07-18 18:48:21 +03:00 |
|
Artem Tarasov
|
10f2cde731
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# .gitignore
|
2022-07-18 17:05:53 +03:00 |
|
Artem Tarasov
|
d4968b3225
|
Web: Doceditor: refactoring
|
2022-07-18 16:13:45 +03:00 |
|
Artem Tarasov
|
8c46fc661d
|
Web: Doceditor: added i18n initialization
|
2022-07-18 16:07:22 +03:00 |
|
|
|
18c1fdc0d2
|
Web: Added the loader display with a delay so that there are no content jumps.
|
2022-07-18 15:29:16 +03:00 |
|
|
|
24423a2cb4
|
Web: RestoreBackup: Added new loader.
|
2022-07-18 14:39:11 +03:00 |
|
|
|
005b72216d
|
Web: Client: move about dialog to shell
|
2022-07-18 14:09:09 +03:00 |
|
Artem Tarasov
|
d70e2df443
|
Web: Doceditor: added logger
|
2022-07-18 13:56:22 +03:00 |
|
|
|
47f8e166c5
|
Web: RestoreBackup: Added blocking of actions when the option is not enabled.
|
2022-07-18 13:25:45 +03:00 |
|
|
|
f190701f0b
|
Web: Deleted useless code.
|
2022-07-18 12:53:45 +03:00 |
|
|
|
dd57b55be0
|
Web: ManualBackup: The button is disabled if the folder of a third-party account is not selected.
|
2022-07-18 12:52:16 +03:00 |
|
|
|
43d8788558
|
Web: Added URL for each section.
|
2022-07-18 12:50:14 +03:00 |
|
|
|
d94904b6af
|
removed voip
|
2022-07-18 12:24:12 +03:00 |
|
|
|
a31a038b9f
|
Web: AutoBackup: Added blocking of actions when the option is not enabled.
|
2022-07-18 11:16:12 +03:00 |
|
|
|
99aaa3a575
|
Web: Added error handler.
|
2022-07-18 10:56:44 +03:00 |
|
Artem Tarasov
|
e06f4bd7b3
|
Web: Doceditor: modified run dev scripts
|
2022-07-17 13:01:49 +03:00 |
|
Artem Tarasov
|
ca7809ba52
|
Web: Doceditor: refactoring client (fix warnings, optimization component)
|
2022-07-17 12:48:23 +03:00 |
|
Artem Tarasov
|
de7b320f06
|
Web: Doceditor: modified webpack config (deleted unnecessary plugins, optimization)
|
2022-07-17 12:47:03 +03:00 |
|
Artem Tarasov
|
3ac7597ef7
|
Web: Doceditor: refactoring server
|
2022-07-17 12:46:17 +03:00 |
|
|
|
6fa0a14a33
|
Web:Studio:Сolor palette stylization.
|
2022-07-16 22:12:38 +03:00 |
|
|
|
57cef8663e
|
Web:Studio:Adding HexColorPickerComponent, adding props nodeButtonsColor, nodeAccentColor, nodeHexColorPickerAccent, nodeHexColorPickerButtons in ColorSchemeDialog.
|
2022-07-16 17:44:48 +03:00 |
|
Artem Tarasov
|
4d9422ef0d
|
Web: Doceditor: modified webpack config for client
|
2022-07-15 18:50:57 +03:00 |
|
|
|
e2b1e48fa9
|
removed voip service
|
2022-07-15 18:46:52 +03:00 |
|
|
|
42bbecd463
|
Web: Backup: Added loaders.
|
2022-07-15 15:54:30 +03:00 |
|
|
|
bb51d53cc4
|
add new keys-17
|
2022-07-15 15:02:07 +03:00 |
|
Artem Tarasov
|
8172c832bf
|
Web: Doceditor: modified webpack config for server
|
2022-07-15 14:37:58 +03:00 |
|
|
|
a478d7760b
|
Web:Studio:Сolor palette stylization.
|
2022-07-15 10:22:56 +03:00 |
|
|
|
aa17b6d882
|
fix
|
2022-07-14 16:18:23 +03:00 |
|
|
|
5005bfec3d
|
Web: Client: Confirm: use confirmHeader
|
2022-07-14 15:28:14 +03:00 |
|
|
|
5bc309ed11
|
Web:Studio:Add header, selectedAccentColorAndButtonsMain props to ColorSchemeDialog.
|
2022-07-14 15:07:39 +03:00 |
|
|
|
a48dbeaeae
|
fix tfaapp/validate
|
2022-07-14 14:58:49 +03:00 |
|
|
|
fb162af624
|
Web: Client: Settings: use new tfa api
|
2022-07-14 14:43:50 +03:00 |
|
|
|
1f01c06185
|
Tfa: added tfaappwithlink
|
2022-07-14 12:57:57 +03:00 |
|
Vashchuk Nikita
|
6507c4b999
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# web/ASC.Web.Core/GlobalUsings.cs
|
2022-07-14 11:56:07 +03:00 |
|
Artem Tarasov
|
b8e4f56862
|
Web: Doceditor: fixed start script
|
2022-07-14 03:41:50 +03:00 |
|
Artem Tarasov
|
c47a265eff
|
Web: Doceditor: added initDoceditor, api, requestManager
|
2022-07-14 03:39:56 +03:00 |
|
Artem Tarasov
|
12ed025fad
|
Web: Doceditor: editor render fix
|
2022-07-14 03:39:09 +03:00 |
|
Artem Tarasov
|
0fe7836f65
|
Web: Doceditor: added global styles
|
2022-07-14 03:38:34 +03:00 |
|
Artem Tarasov
|
5364dceb53
|
Web: Doceditor: added Websocket to implement Live Reloading
|
2022-07-14 00:25:15 +03:00 |
|
|
|
615de2bf19
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-13 19:30:50 +03:00 |
|
|
|
3597114325
|
Api: fix tfaappnewapp
|
2022-07-13 18:41:44 +03:00 |
|
|
|
3cb56da496
|
Web:Studio:Сolor palette stylization.
|
2022-07-13 17:59:54 +03:00 |
|
Artem Tarasov
|
1e321859d7
|
Web: Doceditor: added ejs
|
2022-07-13 14:08:20 +03:00 |
|
Artem Tarasov
|
776c0874d1
|
Web: Doceditor: added babel.config.js to be able to use import in server
|
2022-07-13 14:07:49 +03:00 |
|
Artem Tarasov
|
a612c8490a
|
Web: Doceditor: rewrite server to CommonJs
|
2022-07-13 14:06:03 +03:00 |
|
|
|
b1baddce99
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
|
2022-07-13 13:46:36 +03:00 |
|
|
|
bfac83d53c
|
Web:Adding the react-colorful library.
|
2022-07-13 12:37:22 +03:00 |
|
|
|
4be3a1f937
|
Web:Studio:Adding a theme, editing a theme.
|
2022-07-13 12:32:28 +03:00 |
|
|
|
cad67a6f57
|
Web: RestoreBackup: Refactoring.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
b0eb883e20
|
Web: Fixed saving settings, refactoring.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
48ac6f24d3
|
Web: Moved the function to a shared file.
|
2022-07-13 12:20:33 +03:00 |
|
|
|
20bb2d107d
|
Web: Part of the code moved in a shared file.
|
2022-07-13 12:20:32 +03:00 |
|
|
|
50f8dbd6dd
|
Web: AutoBackup: Fixed width pf toggle wrapper, added the same length if button turn on and turn off.
|
2022-07-13 12:20:31 +03:00 |
|
|
|
57d583687f
|
Web: RestoreBackup: Added new option for third-party accounts.
|
2022-07-13 12:20:31 +03:00 |
|
|
|
51418fc141
|
WEb: AutoBackup: Added new option for third-party accounts.
|
2022-07-13 12:20:30 +03:00 |
|
|
|
05db277f00
|
Web: AutoBackup: Added disable input if folder was deleted, added removing folder when switch between options.
|
2022-07-13 12:20:30 +03:00 |
|
|
|
41a2c421b1
|
Web: ManualBackup: Added new option for Third-party accounts.
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/DesktopView.js
|
2022-07-13 12:20:29 +03:00 |
|
|
|
1eb930583c
|
Web: Restore: Refactoring storage container.
# Conflicts:
# web/ASC.Web.Client/src/components/pages/Settings/categories/data-management/backup/restore-backup/index.js
|
2022-07-13 12:20:17 +03:00 |
|
|
|
879b8e1dcb
|
Web: Refactoring storage containers.
|
2022-07-13 12:19:59 +03:00 |
|
|
|
7140c667e6
|
Web: AutoBackup: Deleted useless code.
|
2022-07-13 12:19:59 +03:00 |
|
|
|
8f92458307
|
Web: AutoBackup: Moved the parameter to the store.
|
2022-07-13 12:19:58 +03:00 |
|
|
|
c894454bfc
|
Web: Deleted useless state.
|
2022-07-13 12:19:58 +03:00 |
|
|
|
b94989f5a9
|
Web: Optimization amazon container of manual backup.
|
2022-07-13 12:19:57 +03:00 |
|
|
|
fdd467f369
|
Web: Optimization amazon container of auto backup.
|
2022-07-13 12:19:57 +03:00 |
|
|
|
02ec398cc0
|
Web: Rewrote logic of amazon settings container.
|
2022-07-13 12:19:56 +03:00 |
|
|
|
4addb0e64d
|
Web: Fixed settings title.
|
2022-07-13 12:19:56 +03:00 |
|
|
|
d9b20300e2
|
Web: Settings: Added tips.
# Conflicts:
# web/ASC.Web.Client/public/locales/en/Settings.json
# web/ASC.Web.Client/public/locales/ru/Settings.json
|
2022-07-13 12:19:55 +03:00 |
|
|
|
78c9bbbc3e
|
Web: ManualBackup: Added new options for Amazon storage.
|
2022-07-13 12:18:45 +03:00 |
|
|
|
39557164d8
|
Web: Added restore backup to the article.
|
2022-07-13 12:18:45 +03:00 |
|
|
|
10c37ee2d6
|
Web: ManualBackup: Added new input methods.
|
2022-07-13 12:18:44 +03:00 |
|
|
|
bc472af290
|
Web: Redesign manual backup and auto backup modules.
# Conflicts:
# 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/categories/data-management/backup/auto-backup/index.js
|
2022-07-13 12:12:19 +03:00 |
|
|
|
c9680ae830
|
fix tfaapp
|
2022-07-12 19:36:39 +03:00 |
|
|
|
536282eaf3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 17:53:37 +03:00 |
|
mushka
|
f99d8784f1
|
fixed RecoverAccess dialog
|
2022-07-12 17:28:13 +03:00 |
|
|
|
c1be6ecb61
|
Settings: ignore id
|
2022-07-12 15:33:46 +03:00 |
|
|
|
72b00ffe94
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 14:24:11 +03:00 |
|
mushka
|
45f2e63836
|
changed ConnectCloud dark theme and fixed ConsumerModalDialolg
|
2022-07-12 14:19:04 +03:00 |
|
|
|
404e014a59
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/remove-header
# Conflicts:
# products/ASC.Files/Client/src/Files.jsx
|
2022-07-12 14:18:29 +03:00 |
|
|
|
a9d5080f5d
|
Web: Client: Settings: disabled autofocus
|
2022-07-12 13:50:55 +03:00 |
|
|
|
7b19b2f730
|
Web: Client: Settings: SessionLifetime: fix show reminder
|
2022-07-12 13:41:50 +03:00 |
|
mushka
|
6f5b84308d
|
fixed translation on Register dialog
|
2022-07-12 13:08:29 +03:00 |
|
|
|
0d0eed6d1a
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-12 12:57:57 +03:00 |
|
mushka
|
a222f836c4
|
fixed ConsumerModalDialog compennt
|
2022-07-12 12:50:08 +03:00 |
|
mushka
|
96e85f9cb3
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-12 12:34:43 +03:00 |
|
|
|
e9a15cc2a4
|
added [HttpGet("iprestrictions/settings")]
|
2022-07-12 12:20:59 +03:00 |
|
|
|
fd986320f2
|
Api: fixed maildomainsettings
|
2022-07-12 11:47:05 +03:00 |
|
|
|
61d824db3c
|
Web: Client: Main: fix height
|
2022-07-11 23:11:27 +03:00 |
|
mushka
|
83cb430911
|
small tweaks on DebugInfo
|
2022-07-11 22:15:53 +03:00 |
|
mushka
|
96a2d4530e
|
fixed DebugInfo styles
|
2022-07-11 22:11:55 +03:00 |
|
mushka
|
9d13e3a4c4
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-11 17:39:20 +03:00 |
|
Artem Tarasov
|
a77f413e9a
|
Web: Doceditor: modified webpack config
|
2022-07-11 17:33:22 +03:00 |
|
Artem Tarasov
|
68b375faf3
|
Web: Doceditor: updated webpack version, updated yarn.lock
|
2022-07-11 17:32:22 +03:00 |
|
|
|
e3c039942d
|
Web: Client: hide header on desktop
|
2022-07-11 15:17:48 +03:00 |
|
|
|
136a0d45bf
|
Web: Client: TfaActivation: fix layout
|
2022-07-11 14:47:57 +03:00 |
|
|
|
65a739d871
|
Removed ASC.Web.Campaigns (moved to separated repository)
|
2022-07-11 14:15:51 +03:00 |
|
|
|
3cbfa3d952
|
Web: Client: TfaAuth: fix layout
|
2022-07-11 13:57:58 +03:00 |
|
mushka
|
2fb38338e5
|
fixed backdrop and Debug dialog
|
2022-07-11 13:30:55 +03:00 |
|
Vashchuk Nikita
|
e49d082fa3
|
Merge branch 'develop' into feature/migrations-fix
# Conflicts:
# common/ASC.Core.Common/EF/Model/Core/Acl.cs
# common/ASC.Core.Common/GlobalUsings.cs
# common/ASC.Core.Common/Messaging/EventMessage.cs
# common/ASC.Core.Common/Messaging/LoginEvent.cs
# common/ASC.Core.Common/Messaging/MessageTarget.cs
# common/ASC.Core.Common/Migrations/MySql/CoreDbContextMySql/20211012145320_CoreDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/20220708104408_FilesDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/MessagesContextMySql/20220708104428_MessagesContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20211012145322_UserDbContextMySql.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/20220708104402_UserDbContextMySql.Designer.cs
# common/ASC.Core.Common/Migrations/MySql/UserDbContextMySql/MySqlUserDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/CoreDbContextPostgreSql/20211012145321_CoreDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/20220708104409_FilesDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/MessagesContextPostgreSql/20220708104429_MessagesContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/TenantDbContextPostgreSql/20211012145343_TenantDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20211012145323_UserDbContextPostgreSql.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/20220708104403_UserDbContextPostgreSql.Designer.cs
# common/ASC.Core.Common/Migrations/PostgreSql/UserDbContextPostgreSql/PostgreSqlUserDbContextModelSnapshot.cs
# common/ASC.Data.Backup.Core/Migrations/MySql/BackupsContextMySql/20220708104422_BackupsContextMySql.Designer.cs
# common/ASC.Data.Backup.Core/Migrations/PostgreSql/BackupsContextPostgreSql/20220708104423_BackupsContextPostgreSql.Designer.cs
# common/ASC.MessagingSystem/Migrations/MySql/MessagesContextMySql/20211012145334_MessagesContextMySql.Designer.cs
# common/ASC.MessagingSystem/Migrations/PostgreSql/MessagesContextPostgreSql/20211012145335_MessagesContextPostgreSql.Designer.cs
# common/ASC.Resource.Manager/ResourceData.cs
# common/services/ASC.AuditTrail/GlobalUsings.cs
# products/ASC.Files/Core/Core/EF/DbFilesThirdpartyAccount.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/20211022170840_FilesDbContextMySql.cs
# products/ASC.Files/Core/Migrations/MySql/FilesDbContextMySql/MySqlFilesDbContextModelSnapshot.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/20211022170841_FilesDbContextPostgreSql.cs
# products/ASC.Files/Core/Migrations/PostgreSql/FilesDbContextPostgreSql/PostgreSqlFilesDbContextModelSnapshot.cs
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-07-11 13:28:49 +03:00 |
|
|
|
b3324ad875
|
Web: Client: NavMenu: fix namespace
|
2022-07-11 11:28:25 +03:00 |
|
Artem Tarasov
|
05cf3b7d18
|
Web: Doceditor: fixed deletion of initial state
|
2022-07-10 13:01:18 +03:00 |
|
Artem Tarasov
|
a9c9649197
|
Web: Doceditor: refactoring server, deleted unnecessary code
|
2022-07-10 12:57:07 +03:00 |
|
Artem Tarasov
|
a1d599ee43
|
Web: Doceditor: modified webpack dev config
|
2022-07-10 12:53:58 +03:00 |
|
Artem Tarasov
|
2a74e0e8cd
|
Web: Doceditor: deleted unnecessary files
|
2022-07-10 12:47:15 +03:00 |
|
Artem Tarasov
|
120f5f7b17
|
Web: Files/People/Client/Login: updated version webpack-cli 4.9.0 -> 4.10.0
|
2022-07-10 12:34:16 +03:00 |
|
Artem Tarasov
|
55198d0e7f
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# web/ASC.Web.Editor/src/i18n.js
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-10 11:23:44 +03:00 |
|
mushka
|
58e68c1c12
|
Merge branch 'develop' into feature/modal-redesign
|
2022-07-08 17:23:02 +03:00 |
|
|
|
1f3dfb9ccc
|
Web: Client: AdminMessage: fix save
|
2022-07-08 16:46:26 +03:00 |
|
|
|
f69194b034
|
Web: Client: TfaActivation: fix error
|
2022-07-08 16:22:30 +03:00 |
|
|
|
6a690fc175
|
Web: Client: fix confirmLinkData
|
2022-07-08 16:22:08 +03:00 |
|
Vashchuk Nikita
|
4628769136
|
fix Contexts,
fix migrations,
removed MailDbContext.cs,
moved ResourceDbContext.cs
|
2022-07-08 14:24:18 +03:00 |
|
|
|
0da612710d
|
Merge branch 'develop' of github.com:ONLYOFFICE/AppServer into feature/security-settings
|
2022-07-07 19:39:12 +03:00 |
|
|
|
7af929fee8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderDaoBase.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.People/Server/Controllers/PeopleController.cs
# products/ASC.People/Server/Models/MemberModel.cs
# web/ASC.Web.Api/Controllers/SettingsController.cs
|
2022-07-07 17:41:41 +03:00 |
|
|
|
47371fc82d
|
Push: api
|
2022-07-07 16:58:59 +03:00 |
|
|
|
cac16ace79
|
Push: api
|
2022-07-07 14:46:35 +03:00 |
|
|
|
baa72db316
|
removed referencies
|
2022-07-06 18:47:16 +03:00 |
|
|
|
a615053d88
|
Fix Bug 58025 - Client.Profile. The languages listed in the profile are not in alphabetical order.
|
2022-07-06 18:26:25 +03:00 |
|
mushka
|
3fd65e887d
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-06 18:13:33 +03:00 |
|
TimofeyBoyko
|
545e4c0142
|
Web:Client:ProfileMenu: delete useless code
|
2022-07-05 19:48:46 +03:00 |
|
TimofeyBoyko
|
02938b9486
|
Fixed Bug 57943 - Mobile. Available to scroll an inactive section with the 'Profile' menu open
|
2022-07-05 18:57:36 +03:00 |
|
|
|
aeac8613a8
|
Merge branch 'develop' into features/enum_generator
|
2022-07-05 17:22:43 +03:00 |
|
|
|
1218d31a42
|
enum generator
|
2022-07-05 16:58:11 +03:00 |
|
mushka
|
6566ca8645
|
removed unnecessary extra margin from second button on several dialogs
|
2022-07-05 15:31:17 +03:00 |
|
mushka
|
9f002e3249
|
Merge branch 'release/v1.2' into feature/modal-redesign
|
2022-07-05 12:17:58 +03:00 |
|
TimofeyBoyko
|
6acc0ac769
|
Fixed Bug 57976 - Mobile. Blur effect for all portal page content after screen rotation with 'Profile' menu open
|
2022-07-05 11:18:29 +03:00 |
|
|
|
90fe1383b7
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 18:04:06 +03:00 |
|
|
|
596ae3b06e
|
Web: Client: Fix Error pages translation
|
2022-07-04 17:48:06 +03:00 |
|
|
|
d8a459f397
|
Web: i18n: Replaced i18next-http-backend package with custom realization from @appserver/common/utils/i18next-http-backend (fix issue: too many same translations files are loading at once)
|
2022-07-04 17:47:12 +03:00 |
|
|
|
9a5e05a1f9
|
Fixed Bug 57948 - Mobile. Hid the click area on the burger
|
2022-07-04 17:16:02 +03:00 |
|
|
|
fb09f62881
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-07-04 11:39:38 +03:00 |
|
|
|
0f901bf6e3
|
added hy-AM
|
2022-07-04 11:38:57 +03:00 |
|
|
|
d6b7db91e3
|
Web: Translations: Added translations minimization
|
2022-07-03 13:25:41 +03:00 |
|
Artem Tarasov
|
5fec344fe1
|
Web: Doceditor: fix after merge
|
2022-07-02 00:01:07 +03:00 |
|
Artem Tarasov
|
2ef94f75da
|
Merge branch 'develop' into feature/doceditor-ssr
# Conflicts:
# products/ASC.Files/Client/src/components/panels/SelectFolderDialog/index.js
# web/ASC.Web.Editor/package.json
# web/ASC.Web.Editor/src/Editor.jsx
# web/ASC.Web.Editor/webpack.config.js
# yarn.lock
|
2022-07-01 23:41:10 +03:00 |
|
Artem Tarasov
|
afce89dda2
|
Web: Doceditor: refactoring, changed hierarchy, added hmr, global styles
|
2022-07-01 23:33:35 +03:00 |
|
|
|
a289f9594a
|
modified LdapNotifyHelper to BackgroundService
|
2022-07-01 14:49:59 +03:00 |
|
Vashchuk Nikita
|
5a0acc8eaa
|
Renaming folders for contexts and models
|
2022-07-01 14:23:07 +03:00 |
|
|
|
329ec57aa2
|
Merge branch 'develop' into feature/LDAP-new
|
2022-07-01 13:15:52 +03:00 |
|
|
|
6226340b3b
|
Web: Client: add locales for Help center key
|
2022-07-01 13:00:57 +03:00 |
|
|
|
942030614f
|
Fix Bug 57840: add community forum and help center buttons
|
2022-07-01 12:33:46 +03:00 |
|
|
|
ba6c4069c9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-07-01 10:10:52 +03:00 |
|
|
|
224f928ee4
|
Web: Layout: Fixed page shift when focusing in a row when renaming. (iOS, Chrome)
|
2022-07-01 10:10:29 +03:00 |
|
|
|
45cd9434f4
|
fix Bug 57888
|
2022-06-30 19:41:17 +03:00 |
|
|
|
74d238bde8
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Common/Caching/KafkaCache.cs
# common/ASC.Common/Logging/Log.cs
# common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
# common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Backup.Core/BackupResource.Designer.cs
# common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
# common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
# common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
# common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
# products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
# products/ASC.Files/Core/Core/Compress/CompressToZip.cs
# products/ASC.Files/Core/Core/Compress/ICompress.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
# web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
|
2022-06-30 16:13:31 +03:00 |
|
|
|
3871712357
|
Fixed Bug 57873: Scrolling of the page body is disabled.
|
2022-06-30 15:54:58 +03:00 |
|
|
|
35ab5a3531
|
fix order
|
2022-06-29 19:43:29 +03:00 |
|
|
|
605c78f5dd
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-29 17:16:18 +03:00 |
|
|
|
11e4595939
|
Fix bug: the site header shifts if you open the keyboard on an android phone
|
2022-06-29 17:16:09 +03:00 |
|
|
|
5f6851253f
|
fix bug 57725
|
2022-06-29 15:10:56 +03:00 |
|
|
|
9e05dc641a
|
notify: temp logs
|
2022-06-28 23:32:33 +03:00 |
|
|
|
4415df375f
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-28 19:31:38 +03:00 |
|
|
|
2512820217
|
Web: Editor: Added opportunity to work with created docEditor from window.ASC.Files.Editor.docEditor (Mobile App Back button issue)
|
2022-06-28 19:31:28 +03:00 |
|
|
|
d4a5ec5315
|
notify: logs
|
2022-06-28 16:55:35 +03:00 |
|
|
|
772b42f636
|
Merge pull request #702 from ONLYOFFICE/feature/settings-docspace-mode
feature/settings-docspace-mode
|
2022-06-28 14:51:57 +03:00 |
|
|
|
933b0696ef
|
WebApi: added docspace in settings
|
2022-06-28 14:47:28 +03:00 |
|
|
|
e17f49e344
|
Merge branch 'develop' into feature/LDAP-new
# Conflicts:
# ASC.Web.sln
# common/ASC.Core.Common/EF/Context/WebstudioDbContext.cs
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/GlobalUsings.cs
|
2022-06-28 14:30:40 +03:00 |
|
|
|
95a694ac10
|
Web: Client: fixed error two children with the same key, index.
|
2022-06-28 13:12:28 +03:00 |
|
|
|
2b48707f5c
|
sso: fix
|
2022-06-28 12:36:34 +03:00 |
|
|
|
097290e8a2
|
Fix Bug 57787 - Selected user's theme option is used for Desktop Editors
|
2022-06-27 19:22:59 +03:00 |
|
Artem Tarasov
|
e38c15af56
|
Web: Client: Layout: deleted unnecessary code
|
2022-06-27 15:05:49 +03:00 |
|
Artem Tarasov
|
be438745a9
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-27 14:57:48 +03:00 |
|
Artem Tarasov
|
bba5c2a07a
|
Web: Client: Layout: Bug 57712 - Mobile. Section title goes outside the workspace when scrolling the page
|
2022-06-27 14:57:29 +03:00 |
|
|
|
6d98440200
|
az resources
|
2022-06-27 14:00:23 +03:00 |
|
|
|
3355c3ce99
|
Fix Bug 57772: add back arrow for about page
|
2022-06-27 11:40:17 +03:00 |
|
|
|
b58422cfee
|
Merge branch 'develop' into feature/branding
|
2022-06-24 18:51:33 +03:00 |
|
mushka
|
a5650bcf48
|
removed unused SystemThemeDetector component
|
2022-06-23 17:06:06 +03:00 |
|
mushka
|
da27de2cac
|
Fixed Bug 57722 - Now app theme will change with system theme without reloading
|
2022-06-23 16:54:22 +03:00 |
|
|
|
45e791a092
|
removed unused code
|
2022-06-23 16:00:24 +03:00 |
|
|
|
96775f7a0a
|
fix for eb896018d4 2b19ec7997
|
2022-06-23 15:43:22 +03:00 |
|
mushka
|
2e187f6605
|
removed unused console.log
|
2022-06-22 14:48:24 +03:00 |
|
mushka
|
c4a0c109e6
|
Fixed Bug 57721: Web: Files: Removed burger menu button from header in OFORM Gallery
|
2022-06-22 14:45:25 +03:00 |
|
|
|
f2da6fc55c
|
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
|
2022-06-22 11:55:36 +04:00 |
|
|
|
bbcd5b7382
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 19:45:30 +03:00 |
|
|
|
2d9bd5943d
|
fix Bug 57661
|
2022-06-21 18:13:21 +03:00 |
|
Artem Tarasov
|
93b6e3174d
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 17:45:10 +03:00 |
|
Artem Tarasov
|
96fd3734e4
|
Web: Client: Layout: Fixed Bug 57666 - Mobile. Content is not displayed in the horizontal position of the screen (ios, chrome)
|
2022-06-21 17:44:23 +03:00 |
|
|
|
01a03674ef
|
Web: Client: Wizard: fix translate ns
|
2022-06-21 17:27:22 +03:00 |
|
|
|
d4f459740f
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 16:30:15 +03:00 |
|
|
|
87839bfb7f
|
Web: Translations: Fix NotFoundKeysTest
|
2022-06-21 13:29:37 +03:00 |
|
|
|
9d82ae8719
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-21 13:25:08 +03:00 |
|
|
|
793f999fe9
|
Web:Studio:Added styles to Preview.
|
2022-06-21 13:23:00 +03:00 |
|
|
|
12b6aea843
|
Web:Studio:Added theme selection, Appearance page layout.
|
2022-06-21 13:21:47 +03:00 |
|
|
|
d6ad1325f6
|
Web: Client: fixed double api requests
|
2022-06-20 18:56:12 +03:00 |
|
|
|
03e756277b
|
fixed warnings
|
2022-06-20 17:01:59 +03:00 |
|
