|
|
9d93525a91
|
Merge branch 'develop' into feature/oauth2-client
|
2023-10-04 13:24:59 +03:00 |
|
|
|
db2b2170e9
|
merge from master
|
2023-10-03 17:26:38 +03:00 |
|
|
|
27ae382c4e
|
Changed path to buildtools
|
2023-10-03 11:45:09 +04:00 |
|
|
|
f188adc1e5
|
Web: Client: Fixed appsettings path
|
2023-10-02 14:16:20 +03:00 |
|
|
|
44c6720b5d
|
Merge branch 'develop' into feature/creating-room-from-one-folder
|
2023-09-29 19:17:15 +04:00 |
|
|
|
0d8bd872d6
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 17:21:34 +04:00 |
|
|
|
1e8fac378c
|
Web:Client:Plugin: apply new layouts, add delete dialog
|
2023-09-29 15:32:27 +03:00 |
|
|
|
87d0e7932a
|
Web: Files: Info-panel: fixed members list
|
2023-09-29 12:52:08 +03:00 |
|
|
|
520aa4d35f
|
Web:Client:Plugins: add system plugins
|
2023-09-29 12:22:05 +03:00 |
|
|
|
f778106bc4
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-29 10:36:07 +03:00 |
|
|
|
635b134f93
|
Web: Fix path (ubuntu issue)
|
2023-09-28 14:04:20 +04:00 |
|
Viktor Fomin
|
cf2b15795a
|
Common: Loaders: fix
|
2023-09-28 12:34:01 +03:00 |
|
|
|
8d487cce45
|
Web: Fix path (ubuntu issue)
|
2023-09-28 11:52:58 +04:00 |
|
gazizova-vlada
|
ed5c8d0d76
|
Web:Common:Add argument content in method copyToFolder for copy only content inside folder.
|
2023-09-27 10:06:23 +03:00 |
|
|
|
47647180d1
|
Web: Files: hidden invited users from AddUsersPanel
|
2023-09-26 16:02:51 +03:00 |
|
|
|
fc8897a79b
|
Merge branch 'develop' into feature/room-share-optimization
|
2023-09-26 11:47:56 +04:00 |
|
|
|
fe51f00a4f
|
Web: Files: fixed resendEmailInvitations
|
2023-09-25 17:07:25 +03:00 |
|
|
|
95b095a386
|
Merge branch 'feature/room-share-optimization' of github.com:ONLYOFFICE/AppServer into feature/room-share-optimization
|
2023-09-25 16:37:45 +03:00 |
|
|
|
67bd4632ad
|
Web: Files: InviteInput: fixed search
|
2023-09-25 16:37:37 +03:00 |
|
|
|
796cbf3265
|
Merge branch 'develop' into feature/room-share-optimization
# Conflicts:
# products/ASC.Files/Core/Core/FileStorageService.cs
|
2023-09-25 15:58:53 +03:00 |
|
|
|
c0b36735dd
|
Web: Applied server changes in api
|
2023-09-25 16:28:31 +04:00 |
|
|
|
ee809f380d
|
Web: Files: fixed AddUsersPanel
|
2023-09-25 13:55:37 +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 |
|
|
|
fd383577a0
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-25 08:53:04 +03:00 |
|
|
|
c91a2dfc36
|
Web: Added new SettingsDSConnect loader
|
2023-09-22 17:09:07 +04:00 |
|
|
|
5dab788680
|
Web: Files: InfoPanel: added infinite-loader to members list
|
2023-09-22 15:10:48 +03:00 |
|
|
|
556ce3de0a
|
Web: Rename ids, param apiUrl to docServiceUrl and placeholder
|
2023-09-21 18:32:19 +04:00 |
|
|
|
35e40f617f
|
Web: Added get DocumentService location settings
|
2023-09-21 17:28:15 +04:00 |
|
|
|
70b5c6e111
|
MErge branch 'develop' into feature/web-plugins
|
2023-09-21 14:30:04 +03:00 |
|
|
|
44dbeb48cd
|
Merge branch 'develop' into feature/document-service-location
|
2023-09-21 13:38:25 +04:00 |
|
|
|
d1c3bb66bb
|
Merge branch 'develop' into bugfix/fix-static-images
|
2023-09-20 19:53:29 +04:00 |
|
gazizova-vlada
|
69961e6900
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 17:19:12 +03:00 |
|
gazizova-vlada
|
a061d42f29
|
Web:Add dataReassignmentUrl.
|
2023-09-20 17:03:31 +03:00 |
|
gazizova-vlada
|
183b32c2aa
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-20 16:27:26 +03:00 |
|
gazizova-vlada
|
dd3e9d3363
|
Web:Client:Fix update accounts list after delete, delete dataReassignmentUrl.
|
2023-09-20 16:20:28 +03:00 |
|
|
|
bdabb35e55
|
Merge branch 'feature/leave-room' of github.com:ONLYOFFICE/AppServer into feature/leave-room
# Conflicts:
# public/locales/en/Common.json
|
2023-09-20 15:03:02 +03:00 |
|
|
|
940338fd9d
|
Web: Files: Leave-room: bugs fixed
|
2023-09-20 15:02:34 +03:00 |
|
|
|
4e588759d9
|
Web: Fix warning: Unsatisfied version 5.21.4 from @docspace/client of shared singleton module react-tooltip (required =5.21.1)
|
2023-09-20 14:50:03 +04:00 |
|
|
|
292f92e818
|
Web:Client: fix import images from image-helpers
|
2023-09-20 13:42:43 +03:00 |
|
|
|
3a1bf92291
|
Merge branch 'develop' into feature/leave-room
|
2023-09-20 13:20:56 +04:00 |
|
|
|
bf48ce5393
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 14:02:42 +03:00 |
|
mushka-n
|
b5d23aaf62
|
added request canceling
|
2023-09-19 13:27:22 +03:00 |
|
|
|
4e38a5a987
|
Web: Applied new formGallery config
|
2023-09-19 13:12:40 +04:00 |
|
Vlada Gazizova
|
3471bbf09f
|
Merge branch 'develop' into feature/reassign-data
|
2023-09-19 09:54:45 +03:00 |
|
|
|
d364748d84
|
Merge branch 'develop' into feature/web-plugins
|
2023-09-19 09:23:13 +03:00 |
|
gazizova-vlada
|
f8d623d3ef
|
Web:Add dataReassignmentUrl.
|
2023-09-18 18:17:02 +03:00 |
|
mushka-n
|
2fd546f697
|
fixed formData naming
|
2023-09-18 17:09:14 +03:00 |
|
mushka-n
|
4a6b1b7f0d
|
tarnslations + link popup unblock
|
2023-09-18 14:28:25 +03:00 |
|
|
|
84f77d3b3d
|
Web: Files: removed someDialogIsOpen
|
2023-09-18 13:52:51 +03:00 |
|
mushka-n
|
da7aec7445
|
Merge branch 'develop' into feature/submit-to-form-gallery
|
2023-09-18 13:06:39 +03:00 |
|
