Skip to content

Commit d7284c7

Browse files
committed
Update to v12.0.0
1 parent 18764fa commit d7284c7

File tree

4,526 files changed

+295461
-245982
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,526 files changed

+295461
-245982
lines changed

.gitignore

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
**/obj/
2+
**/bin/
3+
/packages/
4+
/redistributable/ICal.Net_v2/packages/
5+
*.suo
6+
*.user
7+
web/studio/Logs/
8+
web/studio/Data/
9+
build/*.log
10+
build/deploy
11+
/module/ASC.Api/Logs
12+
.vs/
13+
.vscode/
14+
/web/services/logs
15+
/web/statistics/logs
16+
/web/studio/ASC.Web.Studio/js/third-party/jquery/jquery.core.js
17+
/web/studio/ASC.Web.Studio/js/third-party/jquery/jquery.blockUI.js
18+
/web/studio/ASC.Web.Studio/js/third-party/jquery/jquery.mousewheel.js
19+
/web/studio/ASC.Web.Studio/js/uploader/jquery.fileupload.js
20+
/module/ASC.Socket.IO/node_modules
21+
/module/ASC.Socket.IO/package-lock.json
22+
/module/ASC.Socket.IO/typings
23+
/module/ASC.Thumbnails/node_modules
24+
/module/ASC.SsoAuth/node_modules
25+
/module/ASC.UrlShortener/node_modules
26+
/module/ASC.UrlShortener/Logs
27+
/module/ASC.WebDav/node_modules
28+
/module/ASC.WebDav/logs
29+
/module/Logs
-82.7 KB
Binary file not shown.
-244 KB
Binary file not shown.
51.3 KB
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
721 KB
Binary file not shown.

.nuget/packages/Rackspace.1.0.0.nupkg

50.9 KB
Binary file not shown.
-96.2 KB
Binary file not shown.
Binary file not shown.

3rd-Party.txt

Lines changed: 47 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,7 @@ Community Server uses code from the following 3rd party projects:
44
nuget packages
55
====================================================================================================
66

7-
AjaxMin - JavaScript and CSS minification Library for use in .NET applications that want to provide minification or parsing functionality. (http://www.apache.org/licenses/LICENSE-2.0)
8-
License: Apache License 2.0
9-
License File: AjaxMin.license
10-
11-
AjaxPro.2 - .NET Library that provides AJAX related methods to simplify the communication between server and client. (https://github.com/michaelschwarz/Ajax.NET-Professional/blob/master/LICENS)
7+
AjaxPro.2 - .NET Library that provides AJAX related methods to simplify the communication between server and client. (https://github.com/michaelschwarz/Ajax.NET-Professional/blob/master/LICENSE)
128
License: MIT License
139
License File: AjaxPro.2.license
1410

@@ -108,10 +104,6 @@ DotNetOpenAuth.Ultimate - A single assembly that adds OpenID 1.1/2.0, OAuth 1.0(
108104
License: MS-PL
109105
License File: DotNetOpenAuth.Ultimate.license
110106

111-
DotNetZip - A fork of the DotNetZip project without signing with a solution that compiles cleanly. This project aims to follow semver to avoid versioning conflicts. DotNetZip is a FAST, FREE class library and toolset for manipulating zip files. Use VB, C# or any .NET language to easily create, extract, or update zip files. (https://raw.githubusercontent.com/haf/DotNetZip.Semverd/master/LICENSE)
112-
License: Ms-PL , BSD-style (3 clause), Apache 2 license ???
113-
License File: DotNetZip.license
114-
115107
Dropbox.Api - Portable class library for accessing the Dropbox v2 API (https://github.com/dropbox/dropbox-sdk-dotnet/blob/master/LICENSE)
116108
License: MIT License
117109
License File: Dropbox.Api.license
@@ -132,6 +124,10 @@ Flurl.Signed - A fluent, portable URL builder. To make HTTP calls off the fluent
132124
License: MIT License
133125
License File: Flurl.Signed.license
134126

127+
FolkerKinzel.VCards -.NET library to read, write and convert VCF files that match the vCard standards 2.1, 3.0 and 4.0. (https://github.com/FolkerKinzel/VCards/blob/master/LICENSE)
128+
License: MIT License
129+
License File: FolkerKinzel.VCards.license
130+
135131
FredCK.FCKeditorV2 - FCKeditor is a text editor to be used inside web pages. In 2009 it was renamed CKEditor. (http://ckeditor.com/what-is-ckeditor) (https://download.cksource.com/FCKeditor/FCKeditor/2.6.3/)
136132
License: GPL 2 (or later) or LGPL 2.1 (or later) or MPL 1.1 (or later)
137133
License File: FredCK.FCKeditorV2.license
@@ -340,6 +336,10 @@ Microsoft.IdentityModel.Tokens - Includes types that provide support for Securit
340336
License: MIT License
341337
License File: Microsoft.IdentityModel.Tokens.license
342338

339+
Microsoft.IdentityModel.Tokens.Jwt - Includes types that provide support for creating, serializing and validating JSON Web Tokens. (https://licenses.nuget.org/MIT)
340+
License: MIT License
341+
License File: Microsoft.IdentityModel.Tokens.Jwt.license
342+
343343
Microsoft.Net.Http - This package includes HttpClient for sending requests over HTTP, as well as HttpRequestMessage and HttpResponseMessage for processing HTTP messages. (https://dotnet.microsoft.com/en/dotnet_library_license.htm)
344344
License: MICROSOFT .NET LIBRARY LICENSE
345345
License File: Microsoft.Net.Http.license
@@ -424,6 +424,10 @@ Novell.Directory.LDAP - LDAP client library (https://github.com/dsbenghe/Novell.
424424
License: MIT License
425425
License File: Novell.Directory.LDAP.license
426426

427+
NUglify - NUglify provides minify and compression methods for CSS, JavaScript and HTML files. (https://github.com/trullock/NUglify/blob/master/license.txt)
428+
License: BSD-2-Clause License
429+
License File: NUglify.license
430+
427431
NUnit - NUnit features a fluent assert syntax, parameterized, generic and theory tests and is user-extensible. (https://github.com/nunit/nunit/blob/master/LICENSE.txt)
428432
License: MIT License
429433
License File: NUnit.license
@@ -776,6 +780,10 @@ npm packages
776780
License: MIT License
777781
License File: @authenio-samlify-node-xmllint.license
778782

783+
axios - Promise based HTTP client for the browser and node.js (https://github.com/axios/axios/blob/master/LICENSE)
784+
License: MIT License
785+
License File: axios.license
786+
779787
body-parser - Node.js body parsing middleware. (https://github.com/expressjs/body-parser/blob/master/LICENSE)
780788
License: MIT License
781789
License File: body-parser.license
@@ -828,10 +836,18 @@ filenamify-url - Convert a URL to a valid filename (https://github.com/sindresor
828836
License: MIT License
829837
License File: filenamify-url.license
830838

839+
form-data - A library to create readable "multipart/form-data" streams. Can be used to submit forms and file uploads to other web applications.The API of this library is inspired by the XMLHttpRequest-2 FormData Interface. (https://github.com/form-data/form-data/blob/master/License)
840+
License: MIT License
841+
License File: form-data.license
842+
831843
formidable - A Node.js module for parsing form data, especially file uploads. (https://github.com/node-formidable/formidable/blob/master/LICENSE)
832844
License: MIT License
833845
License File: formidable.license
834846

847+
get-byte - A Universal way of getting a Byte at a Given Index from a variety of in-memory data formats, including Uint8Array, Buffer, DataView, and Array Buffer (https://github.com/DanielJDufour/get-byte/blob/main/LICENSE)
848+
License: CC0-1.0 License
849+
License File: get-byte.license
850+
835851
graceful-fs - graceful-fs functions as a drop-in replacement for the fs module, making various improvements. (https://github.com/isaacs/node-graceful-fs)
836852
License: ISC License
837853
License File: graceful-fs.license
@@ -848,6 +864,14 @@ gulp-just-replace - The gulp-replace is fine. But it's painful to install it o
848864
License: MIT License
849865
License File: gulp-just-replace.license
850866

867+
help - substack way of --help. v3 of help requires at least Node.js v4. To use help with an older version, please use help@2.x. (https://github.com/evanlucas/help/blob/master/LICENSE)
868+
License: MIT License
869+
License File: help.license
870+
871+
ipaddr - an IPv6 and IPv4 address manipulation library. (https://github.com/whitequark/ipaddr.js/blob/master/LICENSE)
872+
License: MIT License
873+
License File: ipaddr.license
874+
851875
lodash - The modern build of lodash exported as Node.js/io.js modules. (https://github.com/lodash/lodash/blob/master/LICENSE)
852876
License: MIT License
853877
License File: lodash.license
@@ -928,6 +952,10 @@ tmp - A simple temporary file and directory creator for node.js. (https://githu
928952
License: MIT License
929953
License File: tmp.license
930954

955+
to-byte-array - Convert a string or buffer into a plain array of bytes. (https://github.com/finwo/to-byte-array/blob/master/LICENSE.md)
956+
License: MIT License
957+
License File: to-byte-array.license
958+
931959
ua-parser-js - A JavaScript-based User-Agent string parser. Can be used either in browser (client-side) or in node.js (server-side) environment. Also available as jQuery/Zepto plugin, Bower/Meteor package, & RequireJS/AMD module.  (https://github.com/faisalman/ua-parser-js/blob/master/license.md)
932960
License: MIT License
933961
License File: ua-parser-js.license
@@ -936,6 +964,10 @@ url - This module has utilities for URL resolution and parsing meant to have fea
936964
License: MIT License
937965
License File: url.license
938966

967+
webdav-server - WebDav server. (https://github.com/OpenMarshal/npm-WebDAV-Server/blob/master/LICENSE)
968+
License: Unlicense License
969+
License File: webdav-server.license
970+
939971
winston - A logger for just about everything. (https://github.com/winstonjs/winston/blob/master/LICENSE)
940972
License: MIT License
941973
License File: winston.license
@@ -1132,11 +1164,15 @@ jstree.min.js - jsTree is jquery plugin, that provides interactive trees (https:
11321164
License: MIT License
11331165
License File: jstree.license
11341166

1135-
linkify.min.js - Linkify is a zero-dependency JavaScript plugin for finding links in plain-text and converting them to HTML <a> tags (https://github.com/Soapbox/linkifyjs/blob/master/LICENSE)
1167+
linkify.min.js - Linkify is a JavaScript plugin for finding links in plain-text and converting them to HTML <a> tags. (https://github.com/Soapbox/linkifyjs/blob/master/LICENSE)
11361168
License: MIT License
11371169
License File: linkify.license
11381170

1139-
linkify-string.min.js - Linkify is a zero-dependency JavaScript plugin for finding links in plain-text and converting them to HTML <a> tags (https://github.com/Soapbox/linkifyjs/blob/master/LICENSE)
1171+
linkify-html.min.js - Linkify is a JavaScript plugin for finding links in plain-text and converting them to HTML <a> tags. (https://github.com/Soapbox/linkifyjs/blob/master/LICENSE)
1172+
License: MIT License
1173+
License File: linkify-html.license
1174+
1175+
linkify-string.min.js - Linkify is a JavaScript plugin for finding links in plain-text and converting them to HTML <a> tags. (https://github.com/Soapbox/linkifyjs/blob/master/LICENSE)
11401176
License: MIT License
11411177
License File: linkify-string.license
11421178

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
</p>
1818
<p align="center">
1919
<a href="http://www.apache.org/licenses/LICENSE-2.0"><img alt="http://www.apache.org/licenses/LICENSE-2.0" src="https://img.shields.io/badge/License-Apache%20v2.0-green.svg?style=flat"></a>
20-
<a href="https://github.com/ONLYOFFICE/portals/releases"><img alt="https://github.com/ONLYOFFICE/portals/releases" src="https://img.shields.io/badge/release-11.0.0-blue.svg"></a>
20+
<a href="https://github.com/ONLYOFFICE/portals/releases"><img alt="https://github.com/ONLYOFFICE/portals/releases" src="https://img.shields.io/badge/release-11.5.0-blue.svg"></a>
2121
</p>
2222

2323
## Overview

build/Build.bat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
set Constants=DEBUGINFO
2-
"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" msbuild\build.proj /fl1 /flp1:LogFile=Build.log;Verbosity=Normal /m -tv:Current -v:m
2+
"%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" msbuild\build.proj /fl1 /flp1:LogFile=Build.log;Verbosity=Normal /m -tv:Current -v:m
33
pause

build/BuildAndDeploy.bat

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
set Cultures=fr,de,es,ru,lv,pt-BR,pt,it,tr,el,zh-CN,pl,cs,uk,vi,fi,az-Latn-AZ,ko,ja,sl,sk,nl,bg
2-
3-
set BuildTargets=ReBuild
4-
"%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" msbuild\build.proj /fl1 /flp1:LogFile=Build.log;Verbosity=Normal /m -v:m
5-
set BuildTargets=Build
6-
if %errorlevel% == 0 "%ProgramFiles(x86)%\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" msbuild\deploy.proj /fl1 /flp1:LogFile=Deploy.log;Verbosity=Normal /m -v:m
2+
set YarnBuild=false
3+
"%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" msbuild\build.proj /fl1 /flp1:LogFile=Build.log;Verbosity=Normal /m -v:m
4+
set BuildTargets=PrepareResourceNames;ResolveAssemblyReferences;CopyFilesToOutputDirectory
5+
set ProjectReferenceBuildTargets=PrepareResourceNames;ResolveAssemblyReferences;CopyFilesToOutputDirectory
6+
if %errorlevel% == 0 "%ProgramFiles%\Microsoft Visual Studio\2022\Community\MSBuild\Current\Bin\MSBuild.exe" msbuild\deploy.proj /fl1 /flp1:LogFile=Deploy.log;Verbosity=Normal /m -v:m
77
pause

build/ManageServices.bat

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,15 @@ if "%~1" == "--install-all" (
2121
sc create OnlyOfficeStorageMigrate%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.Data.Storage.Migration.Launcher,ASC.Data.Storage.Migration\" --log StorageMigrate"
2222
sc create OnlyOfficeStorageEncryption%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.Data.Storage.Encryption.Launcher,ASC.Data.Storage.Encryption\" --log StorageEncryption"
2323
sc create OnlyofficeFeed%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.Feed.Aggregator.FeedAggregatorLauncher, ASC.Feed.Aggregator\" --log Feed"
24+
sc create OnlyOfficeAutoCleanUp%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.Files.AutoCleanUp.Launcher, ASC.Files.AutoCleanUp\" --log AutoCleanUp"
2425
sc create OnlyofficeBackup%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.Data.Backup.Service.BackupServiceLauncher, ASC.Data.Backup\" --log Backup"
2526
sc create OnlyOfficeSocketIO%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.Socket.IO.Svc.Launcher, ASC.Socket.IO.Svc\" --log SocketIO"
2627
sc create OnlyOfficeTelegram%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.TelegramService.Launcher, ASC.TelegramService\" --log Telegram"
2728
sc create OnlyofficeThumbnailBuilder%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.Files.ThumbnailBuilder.Launcher, ASC.Files.ThumbnailBuilder\" --log ThumbnailBuilder"
2829
sc create OnlyOfficeThumb%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.Thumbnails.Svc.Launcher,ASC.Thumbnails.Svc\" --log Thumb"
2930
sc create OnlyOfficeSsoAuth%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.SsoAuth.Svc.Launcher,ASC.SsoAuth.Svc\" --log SsoAuth"
3031
sc create OnlyOfficeUrlShortener%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.UrlShortener.Svc.Launcher,ASC.UrlShortener.Svc\" --log UrlShortener"
32+
sc create OnlyOfficeWebDav%version% start= delayed-auto binPath= "\"%basepath%\TeamLabSvc.exe\" --service \"ASC.WebDav.Svc.Launcher,ASC.WebDav.Svc\" --log WebDav"
3133
sc create OnlyOfficeMailAggregator%version% start= delayed-auto binPath= "\"%grandparent%\MailAggregator\ASC.Mail.Aggregator.CollectionService.exe\""
3234
sc create OnlyOfficeMailWatchdog%version% start= delayed-auto binPath= "\"%grandparent%\MailWatchdog\ASC.Mail.Watchdog.Service.exe\""
3335
sc create OnlyOfficeMailCleaner%version% start= delayed-auto binPath= "\"%grandparent%\MailCleaner\ASC.Mail.StorageCleaner.exe\""
@@ -38,6 +40,7 @@ if "%~1" == "--install-all" (
3840
sc failure OnlyofficeRadicale%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
3941
sc failure OnlyOfficeStorageMigrate%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
4042
sc failure OnlyOfficeStorageEncryption%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
43+
sc failure OnlyofficeAutoCleanUp%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
4144
sc failure OnlyofficeFeed%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
4245
sc failure OnlyofficeBackup%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
4346
sc failure OnlyOfficeSocketIO%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
@@ -46,6 +49,7 @@ if "%~1" == "--install-all" (
4649
sc failure OnlyOfficeThumb%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
4750
sc failure OnlyOfficeSsoAuth%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
4851
sc failure OnlyOfficeUrlShortener%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
52+
sc failure OnlyOfficeWebDav%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
4953
sc failure OnlyOfficeMailAggregator%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
5054
sc failure OnlyOfficeMailWatchdog%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
5155
sc failure OnlyOfficeMailCleaner%version% reset= 60 actions= restart/60000/restart/60000/restart/60000
@@ -71,6 +75,8 @@ if "%~1" == "--uninstall-all" (
7175
sc delete OnlyOfficeStorageMigrate%version%
7276
net stop OnlyOfficeStorageEncryption%version%
7377
sc delete OnlyOfficeStorageEncryption%version%
78+
net stop OnlyofficeAutoCleanUp%version%
79+
sc delete OnlyofficeAutoCleanUp%version%
7480
net stop OnlyofficeFeed%version%
7581
sc delete OnlyofficeFeed%version%
7682
net stop OnlyofficeBackup%version%
@@ -85,6 +91,8 @@ if "%~1" == "--uninstall-all" (
8591
sc delete OnlyOfficeSsoAuth%version%
8692
net stop OnlyOfficeUrlShortener%version%
8793
sc delete OnlyOfficeUrlShortener%version%
94+
net stop OnlyOfficeWebDav%version%
95+
sc delete OnlyOfficeWebDav%version%
8896
net stop OnlyofficeThumbnailBuilder%version%
8997
sc delete OnlyofficeThumbnailBuilder%version%
9098
net stop OnlyOfficeMailAggregator%version%

0 commit comments

Comments
 (0)