|
|
991babc0ee
|
Files: fixed ProlongEditing
|
2023-09-25 11:41:01 +03:00 |
|
|
|
be0dfa8441
|
Merge branch 'develop' of github.com:ONLYOFFICE/DocSpace into develop
|
2023-09-25 11:07:12 +03:00 |
|
|
|
db1a8e530b
|
backend: GetDocServiceUrlAsync respose with fixed format
|
2023-09-25 11:06:50 +03:00 |
|
|
|
b14d6c8ef0
|
Merge branch 'hotfix/v1.1.3' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Core/ITenantService.cs
# common/ASC.Core.Common/Data/DbTenantService.cs
# common/ASC.Data.Storage/StorageHandler.cs
# common/ASC.FederatedLogin/ASC.FederatedLogin.csproj
# config/appsettings.json
# config/nlog.config
# migrations/mysql/SaaS/CoreDbContext/CoreDbContextModelSnapshot.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.Designer.cs
# migrations/mysql/Standalone/MigrationContext/20230914152735_CoreDbContext_Upgrade2.cs
# packages/client/src/pages/Confirm/sub-components/createUser.js
# packages/client/src/pages/PortalSettings/categories/developer-tools/JavascriptSDK/index.js
# packages/common/components/MoreLoginModal/index.tsx
# packages/login/src/client/components/sub-components/LoginForm.tsx
# products/ASC.Files/Core/HttpHandlers/ChunkedUploaderHandler.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.People/Server/Api/ThirdpartyController.cs
# products/ASC.People/Server/GlobalUsings.cs
# web/ASC.Web.Api/Core/CspSettingsHelper.cs
# web/ASC.Web.Core/Users/UserManagerWrapper.cs
# yarn.lock
|
2023-09-25 10:53:06 +03:00 |
|
|
|
dc27c8d8fc
|
nlog: fixed
|
2023-09-23 09:50:53 +03:00 |
|
|
|
c3c683f7a8
|
Geo: fix
|
2023-09-22 18:40:11 +03:00 |
|
|
|
bb1ab06e1a
|
Merge pull request #1763 from ONLYOFFICE/feature/creating-room-from-data
feature/creating-room-from-data
|
2023-09-22 19:09:26 +04:00 |
|
|
|
2c318669db
|
Merge branch 'develop' into feature/creating-room-from-data
|
2023-09-22 18:39:56 +04:00 |
|
gazizova-vlada
|
0df4122c08
|
Web:Client:Change create to createRoom.
|
2023-09-22 17:31:45 +03:00 |
|
gazizova-vlada
|
3405508312
|
Web:Client:Refactoring.
|
2023-09-22 17:24:28 +03:00 |
|
gazizova-vlada
|
8703e6fc63
|
Web:Client:Fix bufferSelection.
|
2023-09-22 17:03:09 +03:00 |
|
Nasrullo Nurullaev
|
e4a2a4cd9f
|
Fix issue with starting Elasticsearch service (#1762)
* Fix issue with starting Elasticsearch service
* Small fixes
|
2023-09-22 18:29:40 +05:00 |
|
|
|
d42dc1c543
|
Merge pull request #1516 from ONLYOFFICE/feature/document-service-location
Feature/document service location
|
2023-09-22 17:22:39 +04:00 |
|
|
|
4048d8dc82
|
Web: removed useless translation key ResetButton
|
2023-09-22 17:21:24 +04:00 |
|
|
|
3c9dfca8c8
|
Web: Removed useless translations
|
2023-09-22 17:16:52 +04:00 |
|
|
|
a6d9ea95e9
|
Web: Removed useless key DNSSettingsTooltip
|
2023-09-22 17:13:57 +04:00 |
|
|
|
c91a2dfc36
|
Web: Added new SettingsDSConnect loader
|
2023-09-22 17:09:07 +04:00 |
|
gazizova-vlada
|
4677e8875b
|
Merge branch 'develop' into feature/creating-room-from-data
|
2023-09-22 16:05:42 +03:00 |
|
gazizova-vlada
|
6a085a65c1
|
Web:Client:Add CatalogRoomsReactSvgUrl, translation.
|
2023-09-22 16:03:09 +03:00 |
|
gazizova-vlada
|
0c394ee1d2
|
Web:Client:Add Create room in getGroupContextOptions.
|
2023-09-22 15:55:27 +03:00 |
|
gazizova-vlada
|
9965519c89
|
Web:Client:Fixed function availability.
|
2023-09-22 15:48:09 +03:00 |
|
|
|
8371330d3c
|
Web: Applied new design
|
2023-09-22 16:39:08 +04:00 |
|
|
|
269e76bbec
|
Web: moved const creation into condition block
|
2023-09-22 16:26:51 +04:00 |
|
|
|
a4a89ed1c4
|
web: Fix DocumentServiceLocationHeaderInfo value + auto refactoing
|
2023-09-22 16:25:41 +04:00 |
|
|
|
0a12dbef57
|
Web: Applied isDefault
|
2023-09-22 14:53:52 +04:00 |
|
gazizova-vlada
|
a1d2c7565b
|
Web:Client:Add t, processCreatingRoomFromData, fix selections.
|
2023-09-22 13:35:43 +03:00 |
|
|
|
9557a57616
|
Merge branch 'hotfix/v1.1.3' of github.com:ONLYOFFICE/DocSpace into hotfix/v1.1.3
|
2023-09-22 13:16:04 +03:00 |
|
|
|
5a530364c7
|
nlog: remove /health logs
|
2023-09-22 13:15:44 +03:00 |
|
mushka-n
|
3caa14cb02
|
merge + merge changes
|
2023-09-22 12:32:50 +03:00 |
|
mushka-n
|
6a7f1ea2fe
|
added isLoading state
|
2023-09-22 12:30:47 +03:00 |
|
|
|
3269834484
|
Files: added isDefault to FilesLinkUtility
|
2023-09-22 12:25:11 +03:00 |
|
|
|
03f323660f
|
Web: Changed button label
|
2023-09-21 19:58:05 +04:00 |
|
|
|
43a945939e
|
Web: Fix translation key name (test issue)
|
2023-09-21 18:32:49 +04:00 |
|
|
|
556ce3de0a
|
Web: Rename ids, param apiUrl to docServiceUrl and placeholder
|
2023-09-21 18:32:19 +04:00 |
|
|
|
326c8903c5
|
Update yarn.lock
|
2023-09-21 18:11:32 +04:00 |
|
|
|
82b908170a
|
Build: Docker: Dev: Added param --dns
|
2023-09-21 18:11:24 +04:00 |
|
gazizova-vlada
|
9a7e99a65f
|
Wed:Client:Add create room for data selected.
|
2023-09-21 17:10:57 +03:00 |
|
|
|
6322290d58
|
Web: Added displaying loading process
|
2023-09-21 18:00:47 +04:00 |
|
|
|
b19ef29e25
|
Web: Fix onSubmit/onReset
|
2023-09-21 17:42:22 +04:00 |
|
|
|
35e40f617f
|
Web: Added get DocumentService location settings
|
2023-09-21 17:28:15 +04:00 |
|
|
|
76252e407f
|
Web: Hide DocumentServices for SAAS
|
2023-09-21 17:22:40 +04:00 |
|
|
|
420a620727
|
Add a check for localhost in product-configuration
|
2023-09-21 16:52:16 +04:00 |
|
|
|
203fdc0695
|
public: api js polyfill
|
2023-09-21 14:41:11 +03:00 |
|
|
|
5d6c1f051f
|
fix Bug 64204 - Settings: Backup.
|
2023-09-21 13:13:33 +03:00 |
|
Nasrullo Nurullaev
|
f30eb860a0
|
fix Bug 62882 - Edit service names (#1759)
|
2023-09-21 13:05:14 +03:00 |
|
|
|
f07b1710a7
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:56:22 +04:00 |
|
|
|
a6d3cf0fcd
|
fix build
|
2023-09-21 12:53:00 +03:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
Viktor Fomin
|
343dfaa20d
|
Client: PortalSettings: integration: fix align
|
2023-09-21 12:03:24 +03:00 |
|
|
|
3f55c26687
|
Merge pull request #1758 from ONLYOFFICE/bugfix/fix-static-images
Web:Client: fix import images from image-helpers
|
2023-09-20 20:10:13 +04:00 |
|
