TimofeyBoyko
|
c651e88681
|
Web:Files:RoomsStore: correct select root room
|
2022-06-23 20:15:07 +03:00 |
|
TimofeyBoyko
|
a1ba434163
|
Web:Common:RoomFilter: update getFilter method
|
2022-06-23 20:03:28 +03:00 |
|
TimofeyBoyko
|
348169e3f4
|
Merge branch 'feature/room-types' into feature/virtual-rooms-page
|
2022-06-23 19:40:36 +03:00 |
|
TimofeyBoyko
|
fff7dd7646
|
Web:Files:Store: add rooms store
|
2022-06-23 19:38:01 +03:00 |
|
|
|
f2bf9defe6
|
Files: added property room type in dto
|
2022-06-23 18:39:00 +03:00 |
|
TimofeyBoyko
|
a5b78fa5e6
|
Web:Common:Api: add new rooms filter and get rooms api method
|
2022-06-23 12:52:09 +03:00 |
|
|
|
5bcbae5711
|
fix
|
2022-06-23 11:48:31 +03:00 |
|
TimofeyBoyko
|
da4ecee203
|
Web:Common:Constants: add room types
|
2022-06-23 03:21:40 +03:00 |
|
TimofeyBoyko
|
d49b5afb98
|
Web:Files:Article: remove useless code
|
2022-06-22 17:33:23 +03:00 |
|
TimofeyBoyko
|
07c34da64d
|
Web:Files: change virtual rooms page url
|
2022-06-22 17:33:10 +03:00 |
|
TimofeyBoyko
|
c20c47921e
|
Web:Files:Article: send rootFolderType as type at catalog item
|
2022-06-22 17:21:57 +03:00 |
|
TimofeyBoyko
|
1f5ccf477c
|
Web:Files:CatalogItem: call onClick function with item id and type
|
2022-06-22 17:20:55 +03:00 |
|
TimofeyBoyko
|
4023e101bd
|
Web:Files:Store applied e2bdaa4
|
2022-06-22 16:27:30 +03:00 |
|
TimofeyBoyko
|
54b3ce8c37
|
Web: fix catalog accounts icon name
|
2022-06-22 16:24:37 +03:00 |
|
TimofeyBoyko
|
fdbe61603b
|
Web:Files:Article: add empty accounts item
|
2022-06-22 16:24:18 +03:00 |
|
TimofeyBoyko
|
073c24014a
|
Web:Files:Article: add new header items: files, rooms, other
|
2022-06-22 16:14:42 +03:00 |
|
TimofeyBoyko
|
02eabdcc34
|
Web:Common:Article: fix mobile view
|
2022-06-22 16:09:19 +03:00 |
|
TimofeyBoyko
|
e26dfc48b5
|
Web:Components:CatalogItem: add header view for catalog item
|
2022-06-22 16:04:58 +03:00 |
|
TimofeyBoyko
|
40d69ea88f
|
Web:Files:Article: rename SettingsItems to SettingItem
|
2022-06-22 14:20:27 +03:00 |
|
TimofeyBoyko
|
6c6052293b
|
Web:Files:Article: change default icon to settings item
|
2022-06-22 14:17:35 +03:00 |
|
TimofeyBoyko
|
ceaa29e294
|
Web:Files:Article: hide thirparty list, download app list and banner for docspace
|
2022-06-22 14:17:07 +03:00 |
|
TimofeyBoyko
|
581a8c1148
|
Web:Components:CatalogItem: change style for docspace
|
2022-06-22 14:09:04 +03:00 |
|
TimofeyBoyko
|
49035c645a
|
Web:Common:Article: change styles for docspace
|
2022-06-22 13:58:53 +03:00 |
|
TimofeyBoyko
|
4b7520c6a8
|
Web:Files:Article: add new icons for article items
|
2022-06-22 12:32:21 +03:00 |
|
TimofeyBoyko
|
97dca619a2
|
Web: update icons for article
|
2022-06-22 12:31:47 +03:00 |
|
TimofeyBoyko
|
c8326d0145
|
Web:Common:SettingsStore: add docspace var
|
2022-06-22 12:06:50 +03:00 |
|
TimofeyBoyko
|
f9479bf7ea
|
Web:Common:Api:Files: update getFoldersTree method for docspace
|
2022-06-22 11:57:54 +03:00 |
|
TimofeyBoyko
|
6f683d5b3d
|
Web:Common:Constants: add new folder types rooms and archive
|
2022-06-22 11:47:42 +03:00 |
|
TimofeyBoyko
|
36835eea13
|
Merge branch 'develop' into feature/virtual-rooms-page
|
2022-06-22 11:17:05 +03:00 |
|
|
|
f2da6fc55c
|
Merge pull request #693 from ONLYOFFICE/feature/docspace
Feature/docspace
|
2022-06-22 11:55:36 +04:00 |
|
|
|
1ae8636021
|
Sql: added docspace_upgrade.sql
|
2022-06-22 10:50:55 +03:00 |
|
|
|
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 |
|
|
|
b78feb8ae9
|
refactoring
|
2022-06-21 12:57:20 +03:00 |
|
|
|
72f0ac4f9b
|
file converter server: fixed bugs
|
2022-06-20 19:58:08 +03:00 |
|
|
|
c3faf982c5
|
Files: fix download
|
2022-06-20 18:29:07 +03:00 |
|
|
|
03e756277b
|
fixed warnings
|
2022-06-20 17:01:59 +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 |
|
|
|
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 |
|
|
|
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 |
|
