Commit Graph

21818 Commits

Author SHA1 Message Date
18f944b2c6 Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-21 10:10:12 +03:00
3fdf32f445 Fixed Bug 57674: Client: People: Fixed DropDown out of page border opening 2022-06-20 23:02:33 +03:00
61b4c309f5 Web: Components: ContextMenuButton: Added property "usePortal" for DropDown 2022-06-20 23:01:13 +03:00
b2f9e35041 Fixed Bug 57663: Client: Files: Fixed displaying icons for connecting accounts 2022-06-20 22:42:48 +03:00
fc567a1040 Fixed Bug 57637: Client: Files: Fixed icon size for editing item 2022-06-20 22:09:36 +03:00
db89e1684c Fixed Bug 57676: Client: People: Profile: Disabled email interaction for self profile 2022-06-20 21:52:21 +03:00
3c2c147662 Fixed Bug 57678: Client: People: Profile: Disabled toggle option for "Interface theme" parameter 2022-06-20 21:45:33 +03:00
46d495080a Fixed Bug 57634: Web: Client: People: Fixed displaying "Sex" field for personal mode 2022-06-20 21:41:43 +03:00
72f0ac4f9b file converter server: fixed bugs 2022-06-20 19:58:08 +03:00
d6ad1325f6 Web: Client: fixed double api requests 2022-06-20 18:56:12 +03:00
c3faf982c5 Files: fix download 2022-06-20 18:29:07 +03:00
aa53acccd9 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-20 17:54:19 +03:00
fa458aa1a5 Web: Files: fixed selection when clicking on badge or file/folder name 2022-06-20 17:54:14 +03:00
e0a23a91a3 Web: Files: added error on download action 2022-06-20 17:50:32 +03:00
687951c921 Web: moved Error404Text translation to common 2022-06-20 17:49:59 +03:00
5ac3d3e5b6 Web: Files: added new logic when select file format 2022-06-20 17:28:55 +03:00
34cb63fd3f fix 2022-06-20 17:23:32 +03:00
5a06f23111 fix Bug 57618 2022-06-20 17:14:37 +03:00
03e756277b fixed warnings 2022-06-20 17:01:59 +03:00
2b19ec7997 rebranding 2022-06-20 16:59:03 +03:00
ac94309716 Web: Files: removed custom format from download dialog selector 2022-06-20 16:55:21 +03:00
3b5cb1b7fe Web: Files: fixed display of items in download dialog 2022-06-20 16:33:05 +03:00
b5c1c2376b Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-20 15:50:31 +03:00
d2c427c023 Web: Components: Checkbox: removed isLogin prop 2022-06-20 15:42:55 +03:00
c192e0fd0a Merge branch 'release/v1.2' into feature/download-dialog 2022-06-20 15:41:53 +03:00
e73c3058a8 Merge branch 'release/v1.2' of github.com:ONLYOFFICE/AppServer into release/v1.2 2022-06-20 15:40:11 +03:00
975db80282 Web: Login: applied specific style for login checkbox 2022-06-20 15:39:40 +03:00
db4217bedb Web: Components: Checkbox: delete useless prop 2022-06-20 15:35:47 +03:00
79cce9cfc1 Web: Files: Added file ext after update date on File Row view mode 2022-06-20 15:35:27 +03:00
a8bf285dc1 Web: Files: Added and applied new modern row mode 2022-06-20 15:01: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
2eb288f307 Web: Files: removed comments 2022-06-20 14:28:10 +03:00
9e99fed6b5 Web: Files: added new DownloadDialog, refactoring 2022-06-20 14:18:40 +03:00
294045b788 Web: Components: added className to modal dialog content 2022-06-20 14:18:02 +03:00
1448ede53c Web: Components: Checkbox added props support 2022-06-20 14:17:23 +03:00
231daa2e0b Web: removed useless translations 2022-06-20 14:16:11 +03:00
eb896018d4 whitelabel 2022-06-20 14:09:47 +03:00
e6602a22ab Files: fix copyas 2022-06-20 13:21:40 +03:00
50fe9e7b37 fixed sso path 2022-06-20 12:17:11 +03:00
e68ac70005 Merge branch 'develop' into feature/docspace 2022-06-20 12:15:08 +03:00
9f45f8994b fix config 2022-06-20 11:31:32 +03:00
efba3d824e Merge branch 'release/v1.2' of https://github.com/ONLYOFFICE/AppServer into release/v1.2 2022-06-20 11:04:43 +03:00
e2bdaa40e4 Web: Files: returned set filter url. 2022-06-20 10:30:18 +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