|
|
aad8a92b4c
|
RoomInvite replaced by LinkInvite
|
2022-06-21 20:33:05 +03:00 |
|
|
|
5e491a6849
|
Common: fix
|
2022-06-21 20:32:29 +03:00 |
|
|
|
b30ec3c1bd
|
Files: added room api docs
|
2022-06-21 18:43:54 +03:00 |
|
|
|
57916d46ba
|
Files: removed unnecessary, refactor
|
2022-06-20 14:39:08 +03:00 |
|
|
|
44747e837a
|
Files: tag id replaced with tag name
|
2022-06-20 14:30:49 +03:00 |
|
|
|
e68ac70005
|
Merge branch 'develop' into feature/docspace
|
2022-06-20 12:15:08 +03:00 |
|
|
|
e2cee2c2fc
|
Merge branch 'release/v1.2' into develop
# Conflicts:
# common/ASC.Core.Common/Context/Impl/UserManager.cs
# common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
# common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
# common/ASC.Data.Storage/S3/S3Storage.cs
# common/ASC.FederatedLogin/OAuth20Token.cs
# common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
# common/ASC.Resource.Manager/Program.cs
# common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
# config/appsettings.json
# products/ASC.Files/Core/ASC.Files.Core.csproj
# products/ASC.Files/Core/Core/Dao/Interfaces/IFileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
# products/ASC.Files/Core/Core/Dao/TeamlabDao/SecurityDao.cs
# products/ASC.Files/Core/Core/FileStorageService.cs
# products/ASC.Files/Core/Core/Security/ISecurityDao.cs
# products/ASC.Files/Core/Core/Thirdparty/CrossDao.cs
# products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
# products/ASC.Files/Core/Core/Thirdparty/IThirdPartyProviderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFileDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
# products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderSecutiryDao.cs
# products/ASC.Files/Core/Core/ThumbnailSettings.cs
# products/ASC.Files/Core/Helpers/Global.cs
# products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
# products/ASC.Files/Core/HttpHandlers/ThirdPartyAppHandler.ashx.cs
# products/ASC.Files/Core/Model/SessionModel.cs
# products/ASC.Files/Core/Services/DocumentService/Configuration.cs
# products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDeleteOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileMoveCopyOperation.cs
# products/ASC.Files/Core/Services/WCFService/FileOperations/FileOperationsManager.cs
# products/ASC.Files/Core/ThirdPartyApp/BoxApp.cs
# products/ASC.Files/Core/ThirdPartyApp/GoogleDriveApp.cs
# products/ASC.Files/Core/ThirdPartyApp/IThirdPartyApp.cs
# products/ASC.Files/Core/ThirdPartyApp/Token.cs
# products/ASC.Files/Core/Utils/EntryManager.cs
# products/ASC.Files/Core/Utils/FileMarker.cs
# products/ASC.Files/Core/Utils/FileUploader.cs
# products/ASC.Files/Core/Utils/SocketManager.cs
# products/ASC.Files/Server/Controllers/FilesController.cs
# products/ASC.Files/Server/DocStore
# products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
# products/ASC.Files/Server/Startup.cs
# products/ASC.Files/Service/Thumbnail/Builder.cs
# products/ASC.Files/Service/Thumbnail/Worker.cs
# products/ASC.People/Server/ASC.People.csproj
# web/ASC.Web.Api/ASC.Web.Api.csproj
# web/ASC.Web.Api/Controllers/SettingsController.cs
# web/ASC.Web.Api/Models/SettingsWrapper.cs
# web/ASC.Web.Core/PublicResources/CustomModeResource.Designer.cs
# web/ASC.Web.Core/PublicResources/Resource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.Designer.cs
# web/ASC.Web.Core/PublicResources/WebstudioNotifyPatternResource.resx
# web/ASC.Web.Core/Users/UserPhotoThumbnailManager.cs
# web/ASC.Web.Core/WhiteLabel/TenantWhiteLabelSettings.cs
|
2022-06-19 22:44:48 +03:00 |
|
|
|
1cca689e07
|
Merge pull request #695 from ONLYOFFICE/feature/12.0
Feature/12.0
|
2022-06-17 20:53:07 +03:00 |
|
|
|
72b0a81f51
|
fix
|
2022-06-17 20:51:01 +03:00 |
|
|
|
8ea04bcc81
|
Merge branch 'develop' into feature/12.0
# Conflicts:
# common/ASC.MessagingSystem/Data/MessagesRepository.cs
# products/ASC.Files/Core/Utils/FileConverter.cs
|
2022-06-17 19:19:00 +03:00 |
|
|
|
ee5822ae00
|
removed radicale
|
2022-06-17 18:52:58 +03:00 |
|
|
|
945e9d8efe
|
moved from ddf515b8
|
2022-06-17 18:46:16 +03:00 |
|
|
|
2479448c6c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-17 16:16:04 +03:00 |
|
|
|
9bbe797bfc
|
Web:Studio:Added Appearance component to COMMON_URLS.
|
2022-06-17 16:15:24 +03:00 |
|
|
|
c4d4e73c83
|
Web:Studio:Added an Appearance component to the Common Settings Submenu.
|
2022-06-17 16:14:26 +03:00 |
|
|
|
e6c51afc30
|
Web:Studio:Added Preview component.
|
2022-06-17 16:13:11 +03:00 |
|
|
|
cf0acb2179
|
Web:Studio:Added Appearance page.
|
2022-06-17 16:12:09 +03:00 |
|
|
|
47f2138571
|
Web:Added pin and plus icons for theme preview.
|
2022-06-17 16:10:55 +03:00 |
|
|
|
6d63763e94
|
Web:Components:Added user default theme colors.
|
2022-06-17 16:09:23 +03:00 |
|
|
|
080cde2888
|
Web: Files: Fix empty second line of FileRowContent on third-party folders
|
2022-06-17 15:39:45 +03:00 |
|
|
|
3684775829
|
Files: security fix
|
2022-06-17 12:27:07 +03:00 |
|
|
|
ff6a403c3c
|
Files: refactor
|
2022-06-17 11:22:55 +03:00 |
|
|
|
fa9316807c
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-17 11:15:51 +03:00 |
|
|
|
06ce968e9f
|
Web: Files: fixed edit component styles
|
2022-06-17 11:15:32 +03:00 |
|
|
|
3c699266c2
|
Fixed Bug 57622 - Mobile. Hidden hotkeys for mobile devices
|
2022-06-17 11:04:05 +03:00 |
|
|
|
2b8b7c9898
|
Files: added permission check for link generation
|
2022-06-17 10:59:03 +03:00 |
|
|
|
1f65ea35a7
|
Files: removed unnecessary
|
2022-06-17 10:52:32 +03:00 |
|
|
|
09de3c141c
|
Web: Files: Deleted useless code.
|
2022-06-17 10:31:38 +03:00 |
|
|
|
0fbe11ed1c
|
Merge branch 'develop' into feature/docspace
|
2022-06-17 10:26:51 +03:00 |
|
|
|
b62ba1d729
|
fix tests
|
2022-06-17 10:17:17 +03:00 |
|
mushka
|
930b05fc31
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 19:01:53 +03:00 |
|
mushka
|
776a37f538
|
changed InfoPanel behaviour on module switch + added InfoPanelLoader components + changed the way how InfoPanelHeader passed itself to Section + united GalleryHeader and InfoPanelHeader to one component
|
2022-06-16 19:01:30 +03:00 |
|
|
|
34d55db6a6
|
Files: added invitation by link without email, added existing user to room by link
|
2022-06-16 18:39:50 +03:00 |
|
|
|
dad4b12985
|
Files: refactor
|
2022-06-16 18:35:54 +03:00 |
|
|
|
fc93c6336a
|
Files: added email invitation
|
2022-06-16 18:34:38 +03:00 |
|
|
|
d3890b3e18
|
Files: deleted unnecessary
|
2022-06-16 18:28:15 +03:00 |
|
|
|
39e7b28005
|
Files: refactor
|
2022-06-16 18:26:53 +03:00 |
|
|
|
67b9a00068
|
Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 17:23:09 +03:00 |
|
|
|
b26c2a8a6f
|
edit VersionHistory.json
|
2022-06-16 17:21:42 +03:00 |
|
|
|
e9a1220c0e
|
Web: Files: fixed oforms creation
|
2022-06-16 17:18:04 +03:00 |
|
|
|
56ece27e1b
|
moved from ddf515b8
|
2022-06-16 17:16:46 +03:00 |
|
|
|
fdf2331317
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 17:03:52 +03:00 |
|
|
|
2cb1d62887
|
Web: Common: fixed getOforms
|
2022-06-16 17:03:42 +03:00 |
|
TimofeyBoyko
|
5d6150ca2c
|
Web:Components:MainButtonMobile: fix displaying close button for progress bar
|
2022-06-16 17:01:50 +03:00 |
|
TimofeyBoyko
|
0317a4f4a3
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 16:41:49 +03:00 |
|
TimofeyBoyko
|
7b2fe1790c
|
Web:Files:EditingWrapperComponent: fix dark theme for tile view
|
2022-06-16 16:41:33 +03:00 |
|
|
|
e6a6c022de
|
Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2
|
2022-06-16 16:15:07 +03:00 |
|
|
|
d3bb2419c1
|
Web: Files: fixed oforms creation, added display oforms gallery button for all languages
|
2022-06-16 16:15:01 +03:00 |
|
|
|
3e133836c6
|
Fix Bug 57535 - Client.OformsGallery. 404 error on not 'en' language
|
2022-06-16 15:43:46 +03:00 |
|
|
|
d4da3cc82e
|
Fixed Bug 57605 - Mobile. Fixed layout height for mobile devices
|
2022-06-16 15:23:45 +03:00 |
|
