|
|
572a4ee8c3
|
Merge branch 'develop' into bugfix/invitePanel-searchList
|
2023-09-26 19:22:16 +04:00 |
|
|
|
bde6d674a7
|
Merge pull request #1769 from ONLYOFFICE/Fix-Audit-Trail-in-Row
Update AuditContent.js
|
2023-09-26 19:13:59 +04:00 |
|
Subhonbek
|
9e3ae05f12
|
Update AuditContent.js
|
2023-09-26 16:49:39 +03:00 |
|
|
|
570ff7e1b1
|
fix
|
2023-09-26 14:23:11 +03:00 |
|
|
|
8082cbeb96
|
Files: content param
|
2023-09-26 12:56:27 +03:00 |
|
|
|
88b283a28a
|
Web: Changed translations of NotFoundUsersDescription, SearchEmptyDescription keys
|
2023-09-26 12:21:40 +04:00 |
|
|
|
b999ecb5dd
|
fixed warnings
|
2023-09-25 19:05:00 +03:00 |
|
|
|
69c2e88820
|
Merge pull request #1760 from ONLYOFFICE/feature/notify-ref
Feature/notify ref
|
2023-09-25 08:19:58 -07:00 |
|
|
|
2f08aae86a
|
Notify: fix footer
|
2023-09-25 17:11:13 +03:00 |
|
|
|
aa8d1cba60
|
Merge branch 'develop' into feature/notify-ref
|
2023-09-25 16:38:32 +03:00 |
|
|
|
c9cacb9bbe
|
Merge branch 'develop' of https://github.com/ONLYOFFICE/DocSpace into develop
|
2023-09-25 17:33:31 +04:00 |
|
|
|
6af064e456
|
Files: FileOpenedForChange
|
2023-09-25 16:21:35 +03:00 |
|
|
|
c0b36735dd
|
Web: Applied server changes in api
|
2023-09-25 16:28:31 +04:00 |
|
|
|
d762d746fa
|
Update yarn.lock
|
2023-09-25 16:27:28 +04:00 |
|
|
|
8385954e0f
|
Merge pull request #1766 from ONLYOFFICE/feature/message-ref
MessageService: refactoring
|
2023-09-25 04:38:03 -07:00 |
|
|
|
7c62a28318
|
FilesMessageService: removed GetHttpHeaders
|
2023-09-25 14:14:57 +03:00 |
|
|
|
8b3ddf69f3
|
fix merge
|
2023-09-25 11:45:29 +03:00 |
|
|
|
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 |
|
|
|
c81ffe04f2
|
Merge branch 'develop' into bugfix/invitePanel-searchList
|
2023-09-22 18:07:39 +02:00 |
|
|
|
b670c532cc
|
MessageService: refactoring
|
2023-09-22 18:41:57 +03:00 |
|
|
|
c3c683f7a8
|
Geo: fix
|
2023-09-22 18:40:11 +03:00 |
|
|
|
70be87e984
|
Merge branch 'develop' into bugfix/invitePanel-searchList
|
2023-09-22 17:27:38 +02: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 |
|
|
|
f5e0260558
|
Web: Client: fix closing dropdown after click on input
(bug 60655 does not appear)
|
2023-09-22 13:44:02 +02:00 |
|
|
|
179441e4cd
|
Merge branch 'develop' into bugfix/invitePanel-searchList
|
2023-09-22 13:43:07 +02: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 |
|
