IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
23,462 Commits 38 Branches 22 Tags 359 MiB
7f4838901a
Commit Graph

788 Commits

Author SHA1 Message Date
MaksimChegulov
7f4838901a fix after merge 2022-08-24 17:30:06 +03:00
MaksimChegulov
0daea49132 Merge branch 'develop' into feature/private-virtual-rooms 2022-08-24 17:12:13 +03:00
pavelbannov
34232bc735 Files: removed oformservice 2022-08-23 16:34:54 +03:00
pavelbannov
53ee8e9e15 Files: fix security 2022-08-23 15:18:37 +03:00
pavelbannov
d4eefc6145 Files: fixed optional params 2022-08-19 15:47:11 +03:00
pavelbannov
8b6821d410 Files: fixed .format folders methods 2022-08-19 14:57:51 +03:00
pavelbannov
7d32616524 Files: fix 2022-08-11 19:02:52 +03:00
pavelbannov
05d5421ebc fix 2022-08-09 17:11:40 +03:00
pavelbannov
baaec9dcef Merge branch 'develop' into feature/async-fix 
# Conflicts:
#	common/ASC.Socket.IO/.yarn/install-state.gz
#	common/ASC.SsoAuth/.yarn/install-state.gz
#	common/ASC.UrlShortener/.yarn/install-state.gz
#	common/ASC.WebDav/.yarn/install-state.gz
 2022-08-09 16:27:35 +03:00
pavelbannov
a73b9cf2e4 Files: async fix 2022-08-08 23:03:58 +03:00
Alexey Bannov
870c3cf3c4 warm up services 2022-08-08 19:25:22 +03:00
pavelbannov
9149d08937 Files: async 2022-08-04 13:47:18 +03:00
pavelbannov
ce1917c77f Async: refactoring 2022-08-03 17:29:20 +03:00
Sergey Linnik
7b40920552 Chinese (Traditional, Taiwan) empty file templates 2022-08-02 17:41:42 +03:00
Sergey Linnik
3d531e653d Files: update docstore submodule (b8a2cf5292) 
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
 2022-08-02 17:41:04 +03:00
pavelbannov
fe5c8b0b13 fixed tests and tools 2022-07-29 20:23:19 +03:00
pavelbannov
dba122eb96 Common, files: added dbcontext pool 2022-07-28 21:00:49 +03:00
pavelbannov
8acb550b08 files helpers moved to ASC.Files.Core 2022-07-25 14:03:31 +03:00
pavelbannov
5762bf1b04 Files: openedit method extended 2022-07-22 17:54:14 +03:00
pavelbannov
0a203dd532 Files: added new methods to api 2022-07-22 15:55:32 +03:00
MaksimChegulov
67f5146d3e Merge branch 'develop' into feature/private-virtual-rooms 2022-07-22 11:10:23 +03:00
Artem Tarasov
345dad709c Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 16:02:48 +03:00
MaksimChegulov
987788bab7 Files: added creating private thirdparty room 2022-07-21 12:38:23 +03:00
Alexey Safronov
77d311b636
Merge branch 'develop' into feature/doceditor-ssr 2022-07-21 11:41:42 +03:00
TimofeyBoyko
7a9114f562 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-20 14:29:04 +03:00
MaksimChegulov
1d0db523a8 Merge branch 'develop' into feature/rooms-filter 2022-07-18 17:27:57 +03:00
MaksimChegulov
cab55d68f3 Files: fix filter, refactor, removed unnecessary 2022-07-18 17:11:50 +03:00
Artem Tarasov
10f2cde731 Merge branch 'develop' into feature/doceditor-ssr 
# Conflicts:
#	.gitignore
 2022-07-18 17:05:53 +03:00
TimofeyBoyko
bfc1422ba7 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-14 06:01:51 +03:00
MaksimChegulov
c03e1a443a Files: added restrictions on sharing for private rooms 2022-07-13 16:33:44 +03:00
MaksimChegulov
e7831d9b94 Files: moved parameter from body to query 2022-07-13 11:47:15 +03:00
MaksimChegulov
a2129001c9 Files: added withoutTags, withoutMe parameters, refactor 2022-07-12 19:25:34 +03:00
MaksimChegulov
1face3ea40 Files: added searching rooms without tags only 2022-07-11 17:13:30 +03:00
TimofeyBoyko
95e03a49d2 Merge branch 'develop' into feature/virtual-rooms-page 2022-07-11 14:55:50 +03:00
Artem Tarasov
55198d0e7f Merge branch 'develop' into feature/doceditor-ssr 
# Conflicts:
#	web/ASC.Web.Editor/src/i18n.js
#	web/ASC.Web.Editor/webpack.config.js
#	yarn.lock
 2022-07-10 11:23:44 +03:00
TimofeyBoyko
c8feb7899b Merge branch 'develop' into feature/virtual-rooms-page 2022-07-08 12:32:26 +03:00
Sergey Linnik
b8a2cf5292 Files: update docstore submodule 
- update en demo templates
- update empty az
- added gl-ES, eu-ES, hy-AM, ms-MY
 2022-07-07 18:11:42 +03:00
MaksimChegulov
c78370b5b1 Merge branch 'develop' into feature/private-virtual-rooms 2022-07-07 17:58:04 +03:00
MaksimChegulov
2bc07e0a1d Files: added DeleteAfter for archiving/unarchiving rooms 2022-07-07 17:52:20 +03:00
MaksimChegulov
f52162827e Files: added DeleteAfter for rooms 2022-07-07 16:20:44 +03:00
MaksimChegulov
0b21b748fc Merge branch 'develop' into feature/private-virtual-rooms 2022-07-07 11:28:57 +03:00
SuhorukovAnton
aeac8613a8 Merge branch 'develop' into features/enum_generator 2022-07-05 17:22:43 +03:00
SuhorukovAnton
1218d31a42 enum generator 2022-07-05 16:58:11 +03:00
pavelbannov
7e34e45371 ElasticSearch: disabled by default 2022-07-01 12:53:18 +03:00
TimofeyBoyko
3e07ef1efc Merge branch 'develop' into feature/virtual-rooms-page 2022-07-01 10:09:47 +03:00
pavelbannov
74d238bde8 Merge branch 'release/v1.2' into develop 
# Conflicts:
#	common/ASC.Common/Caching/KafkaCache.cs
#	common/ASC.Common/Logging/Log.cs
#	common/ASC.Core.Common/Notify/Engine/DispatchEngine.cs
#	common/ASC.Core.Common/Notify/Engine/NotifyEngine.cs
#	common/ASC.Data.Backup.Core/ASC.Data.Backup.Core.csproj
#	common/ASC.Data.Backup.Core/BackupResource.Designer.cs
#	common/ASC.Data.Storage/ChunkedUploader/CommonChunkedUploadSession.cs
#	common/ASC.Data.Storage/DiscStorage/DiscDataStore.cs
#	common/ASC.Data.Storage/GoogleCloud/GoogleCloudStorage.cs
#	common/ASC.Data.Storage/RackspaceCloud/RackspaceCloudStorage.cs
#	common/ASC.Data.Storage/S3/S3Storage.cs
#	common/ASC.Notify.Textile/ASC.Notify.Textile.csproj
#	common/services/ASC.AuditTrail/ASC.AuditTrail.csproj
#	products/ASC.Files/Core/ASC.Files.Core.csproj
#	products/ASC.Files/Core/Core/Compress/CompressToArchive.cs
#	products/ASC.Files/Core/Core/Compress/CompressToTarGz.cs
#	products/ASC.Files/Core/Core/Compress/CompressToZip.cs
#	products/ASC.Files/Core/Core/Compress/ICompress.cs
#	products/ASC.Files/Core/Core/Thirdparty/GoogleDrive/GoogleDriveStorage.cs
#	products/ASC.Files/Core/Core/Thirdparty/OneDrive/OneDriveStorage.cs
#	products/ASC.Files/Core/Helpers/Global.cs
#	products/ASC.Files/Core/Resources/FilesJSResource.Designer.cs
#	products/ASC.Files/Core/Services/DocumentService/DocumentServiceTracker.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileDownloadOperation.cs
#	products/ASC.Files/Core/Services/WCFService/FileOperations/FileMarkAsReadOperation.cs
#	products/ASC.Files/Core/Utils/EntryManager.cs
#	web/ASC.Web.Api/ASC.Web.Api.csproj
#	web/ASC.Web.Core/Notify/StudioNotifyServiceHelper.cs
#	web/ASC.Web.Core/Notify/StudioNotifyServiceSender.cs
 2022-06-30 16:13:31 +03:00
pavelbannov
35ab5a3531 fix order 2022-06-29 19:43:29 +03:00
MaksimChegulov
667cea2ee9 Files: fix rooms parent folder 2022-06-29 15:47:52 +03:00
MaksimChegulov
2c434e2d92 Files: fix security, added private room check 2022-06-23 18:14:57 +03:00
MaksimChegulov
1692bd315c Files: added private 2022-06-23 18:12:54 +03:00