IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,976 Commits 38 Branches 22 Tags 359 MiB
07909736c3
Commit Graph

19976 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
MaksimChegulov
07909736c3 Merge branch 'develop' into feature/docspace 2022-04-29 16:49:18 +03:00
pavelbannov
cf0e9c322d ElasticSearch: fix 2022-04-29 16:17:52 +03:00
MaksimChegulov
373e66d35d Files: added DocSpaceHelper 2022-04-29 14:15:42 +03:00
MaksimChegulov
3d2c055551 Files: added audit for room 2022-04-29 14:15:22 +03:00
MaksimChegulov
868c2e18b2 Files: added Editing share 2022-04-28 19:38:26 +03:00
MaksimChegulov
2efbdddf15 Files: fix 2022-04-28 16:00:05 +03:00
MaksimChegulov
503672e6b2 Merge branch 'develop' into feature/docspace 2022-04-28 15:45:09 +03:00
MaksimChegulov
b6fe254379 Files: docspace default enabled 2022-04-28 12:40:17 +03:00
Alexey Bannov
e11fc2ff79 backend: updated packages version 2022-04-27 18:48:28 +03:00
Alexey Bannov
36d914724d backend: updated packages version 2022-04-27 17:54:31 +03:00
Alexey Bannov
93f637467b backend: updated packages version 2022-04-27 14:26:38 +03:00
Alexey Bannov
19cf415898 backend: updated packages version 2022-04-27 13:02:17 +03:00
MaksimChegulov
69da159039 Files: removed unnecessary 2022-04-26 17:07:32 +03:00
MaksimChegulov
0ab3c53823 Files: changed sort 2022-04-26 15:53:06 +03:00
MaksimChegulov
2863e167c6 Files: fix 2022-04-26 02:15:32 +03:00
MaksimChegulov
3d9e9eb94f Files: refactor 2022-04-26 02:14:32 +03:00
MaksimChegulov
35eb164fbe Files: added usings 2022-04-26 02:14:17 +03:00
MaksimChegulov
05ce39f359 Files: added area filter value, removed unnecessary 2022-04-26 02:14:06 +03:00
MaksimChegulov
ff87612892 Files: added generic methods for virtual rooms 2022-04-26 02:13:30 +03:00
MaksimChegulov
33d2f638ad Files: added area filter 2022-04-26 02:13:05 +03:00
MaksimChegulov
46b02d6b27 Files: added new variable 2022-04-26 02:12:44 +03:00
MaksimChegulov
d38257f704 Files: redesigned virtual rooms getting method, removed unnecessary 2022-04-26 02:12:27 +03:00
MaksimChegulov
47e4be2d28 Files: added filtres for rooms 2022-04-26 02:11:02 +03:00
Alexey Bannov
dc939846c4
Merge pull request #632 from ONLYOFFICE/feature/backend-refactor 
Feature/backend refactor
 2022-04-25 16:03:27 +04:00
MaksimChegulov
e38fcc1acb Files: refactor api, added query parameters 2022-04-25 00:08:01 +03:00
pavelbannov
88b59b1c30 refactoring 2022-04-22 16:24:54 +03:00
MaksimChegulov
70006499f1 Files: removed unnecessary multipart api methods 2022-04-22 11:33:08 +03:00
MaksimChegulov
639c6fc7cc Files: removed unnecessary 2022-04-22 11:28:57 +03:00
MaksimChegulov
04dd99ecf0 Files: fix cache key 2022-04-22 11:14:36 +03:00
pavelbannov
9eba173a44 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Notify/Signalr/SignalrServiceClient.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Model/CreateFileModel.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/FileMoveCopyOperation.cs
#	products/ASC.Files/Core/Utils/SocketManager.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.Files/Server/Startup.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
 2022-04-21 22:36:29 +03:00
Alexey Safronov
6c9a9f7a8a
Merge pull request #628 from ONLYOFFICE/feature/virtual-rooms-1.2 
Feature/virtual rooms 1.2
 2022-04-21 12:09:30 -04:00
Alexey Safronov
073ee2dc36
Merge branch 'develop' into feature/virtual-rooms-1.2 2022-04-21 12:07:18 -04:00
Alexey Safronov
750b49fd8c
Merge pull request #624 from ONLYOFFICE/feature/interface-theme 
Feature/interface theme
 2022-04-21 12:05:10 -04:00
pavelbannov
60d728695c fix slnf 2022-04-21 18:56:04 +03:00
pavelbannov
05609787f2 Files: fix async 2022-04-21 18:55:49 +03:00
Alexey Safronov
78944a490e Merge branch 'feature/virtual-rooms-1.2' into feature/interface-theme 2022-04-21 18:55:41 +03:00
Alexey Safronov
fd9dc93fe6 Merge branch 'develop' into feature/virtual-rooms-1.2 
# Conflicts:
#	config/kafka.json
 2022-04-21 18:54:28 +03:00
gazizova-vlada
2d24cb25ae Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-21 18:17:56 +03:00
Timofey Boyko
e2f8f40086 Web:Files:SharingPanel: add truncate for sharing panel header 2022-04-21 18:15:34 +03:00
Timofey Boyko
796e3448bc Web:Files:SharingPanel: add access rights translate 2022-04-21 18:10:19 +03:00
gazizova-vlada
0c141bba1a Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-21 18:08:42 +03:00
Timofey Boyko
bf8ac30f6f Web:Files:add new key 'AccessRights' for EN and RU locales 2022-04-21 18:07:58 +03:00
gazizova-vlada
1f9fa82051 Web:Studio:Added validation for setting Portal Renaming. Added locales en "PortalNameEmpty", "PortalNameIncorrect", "PortalNameLength". 2022-04-21 18:07:26 +03:00
pavelbannov
1dff9e18c4 Merge branch 'develop' into feature/backend-refactor 
# Conflicts:
#	common/ASC.Api.Core/ASC.Api.Core.csproj
#	common/ASC.Api.Core/Core/CustomHealthCheck.cs
#	common/ASC.Api.Core/Middleware/IpSecurityFilter.cs
#	common/ASC.Api.Core/Model/EmployeeWraperFull.cs
#	common/ASC.Core.Common/Context/Impl/UserManager.cs
#	common/ASC.Core.Common/Security/EmailValidationKeyProvider.cs
#	common/ASC.IPSecurity/IPRestrictionsRepository.cs
#	common/ASC.IPSecurity/IPRestrictionsService.cs
#	common/ASC.IPSecurity/IPSecurity.cs
#	common/services/ASC.ElasticSearch/Engine/BaseIndexer.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/FileDao.cs
#	products/ASC.Files/Core/Core/Dao/TeamlabDao/TagDao.cs
#	products/ASC.Files/Core/Core/FileStorageService.cs
#	products/ASC.Files/Core/Core/Thirdparty/ProviderDao/ProviderFolderDao.cs
#	products/ASC.Files/Core/HttpHandlers/FileHandler.ashx.cs
#	products/ASC.Files/Core/Utils/FileConverter.cs
#	products/ASC.Files/Core/Utils/FileMarker.cs
#	products/ASC.Files/Core/Utils/FileSharing.cs
#	products/ASC.Files/Server/Controllers/FilesController.cs
#	products/ASC.Files/Server/Helpers/FilesControllerHelper.cs
#	products/ASC.People/Server/Controllers/PeopleController.cs
#	web/ASC.Web.Api/Controllers/PortalController.cs
#	web/ASC.Web.Api/Controllers/SettingsController.cs
#	web/ASC.Web.Api/Models/SettingsWrapper.cs
#	web/ASC.Web.Core/Users/UserManagerWrapper.cs
 2022-04-21 17:51:31 +03:00
Viktor Fomin
d6feda992b Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-21 17:33:16 +03:00
Alexey Safronov
742d728013
Merge pull request #627 from ONLYOFFICE/feature/oforms-gallery 
Feature/oforms gallery
 2022-04-21 10:22:38 -04:00
gopienkonikita
f8088cfbd2 Web: Files: fixed gallery translations, refactoring 2022-04-21 17:18:01 +03:00
gopienkonikita
a9a528ab84 Web: Files: createFormFromTemplate replaced with createFile 2022-04-21 16:57:44 +03:00
Timofey Boyko
8c12ec36d5 Merge branch 'feature/virtual-rooms-1.2' of github.com:ONLYOFFICE/AppServer into feature/virtual-rooms-1.2 2022-04-21 16:51:59 +03:00
Timofey Boyko
0428c3d6af Web:Client:Components: set correct height for main and article containers for IOS devices 2022-04-21 16:51:51 +03:00