Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Expand Down
2 changes: 1 addition & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ repos:
- id: mixed-line-ending
exclude: \.(cs|xml)$
- id: trailing-whitespace
files: \.(header|in|java|md|properties|py|rb|sh|sql|txt|vue|xml|yaml|yml)$
files: \.(bat|css|gitignore|header|in|install|java|md|properties|py|rb|sh|sql|txt|vue|xml|xsl|yaml|yml)$
args: [--markdown-linebreak-ext=md]
exclude: ^services/console-proxy/rdpconsole/src/test/doc/freerdp-debug-log\.txt$
- repo: https://github.com/codespell-project/codespell
Expand Down
2 changes: 1 addition & 1 deletion CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ $ git push origin main
$ git push origin feature_x
```

Now that the `feature_x` branch has been pushed to your GitHub repository, you can initiate the pull request.
Now that the `feature_x` branch has been pushed to your GitHub repository, you can initiate the pull request.

To initiate the pull request, do the following:

Expand Down
4 changes: 2 additions & 2 deletions debian/cloudstack-cli.install
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Expand Down
4 changes: 2 additions & 2 deletions debian/cloudstack-docs.install
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
# to you under the Apache License, Version 2.0 (the
# "License"); you may not use this file except in compliance
# with the License. You may obtain a copy of the License at
#
#
# http://www.apache.org/licenses/LICENSE-2.0
#
#
# Unless required by applicable law or agreed to in writing,
# software distributed under the License is distributed on an
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Expand Down
10 changes: 5 additions & 5 deletions services/console-proxy/rdpconsole/rdp-config.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ rem regarding copyright ownership. The ASF licenses this file
rem to you under the Apache License, Version 2.0 (the
rem "License"); you may not use this file except in compliance
rem with the License. You may obtain a copy of the License at
rem
rem
rem http://www.apache.org/licenses/LICENSE-2.0
rem
rem
rem Unless required by applicable law or agreed to in writing,
rem software distributed under the License is distributed on an
rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
rem KIND, either express or implied. See the License for the
rem specific language governing permissions and limitations
rem under the License.

rem
rem
rem Configure and start RDP service. Run this script on RDP server.
rem
rem

rem Turn off firewall

netsh advfirewall firewall set rule group="Remote Desktop" new enable=yes
Expand Down
24 changes: 12 additions & 12 deletions services/console-proxy/rdpconsole/src/test/doc/dev-rdp-config.bat
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,20 @@ rem KIND, either express or implied. See the License for the
rem specific language governing permissions and limitations
rem under the License.

rem
rem
rem Configure and start RDP service.
rem Configure RPD service to use custom key instead of autogenerated for Wireshark and Network Monitor Decrypt Expert.
rem rdp.pfx is necessary because it fingerprints are hardcoded in this script.
rem
rem

rem Turn off firewall

netsh advfirewall firewall set rule group="Remote Desktop" new enable=yes

rem Enable TS connections
rem
rem
rem Windows Registry Editor Version 5.00
rem
rem
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server]
rem "AllowTSConnections"=dword:00000001
rem "fDenyTSConnections"=dword:00000000
Expand Down Expand Up @@ -57,7 +57,7 @@ certutil -p test -importPFX "Remote Desktop" rdp.pfx
rem Configure RDP server to use certificate:

rem Windows Registry Editor Version 5.00
rem
rem
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp]
rem "SSLCertificateSHA1Hash"=hex:c1,70,84,70,bc,56,42,0a,bb,f4,35,35,ba,a6,09,b0,4e,98,4a,47
reg add "HKLM\System\CurrentControlSet\Control\Terminal Server\WinStations\RDP-Tcp" /v "SSLCertificateSHA1Hash" /t REG_HEX /d "" /f
Expand All @@ -73,13 +73,13 @@ rem certutil -store -v My
certutil -store -v "Remote Desktop"

rem Disable TLS 1.1 (for Network Monitor Decrypt Expert)
rem
rem
rem Windows Registry Editor Version 5.00
rem
rem
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1\Client]
rem "Enabled"=dword:00000000
rem "DisabledByDefault"=dword:00000001
rem
rem
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.1\Server]
rem "Enabled"=dword:00000000
rem "DisabledByDefault"=dword:00000001
Expand All @@ -91,13 +91,13 @@ reg add "HKLM\System\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protoc


rem Disable TLS 1.2 (for Network Monitor Decrypt Expert)
rem
rem
rem Windows Registry Editor Version 5.00
rem
rem
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Client]
rem "Enabled"=dword:00000000
rem "DisabledByDefault"=dword:00000001
rem
rem
rem [HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Control\SecurityProviders\SCHANNEL\Protocols\TLS 1.2\Server]
rem "Enabled"=dword:00000000
rem "DisabledByDefault"=dword:00000001
Expand Down Expand Up @@ -135,4 +135,4 @@ rem dism /online /enable-feature /featurename:NetFx3
rem PS.
rem Don't forget to set Windows profile as active in Network Monitor, so SSL traffic branch will appear under
rem svnchost.exe, so you will be able to decrypt it (don't forget to save and reopen captured traffic to file first).
rem
rem
4 changes: 2 additions & 2 deletions test/scripts/run.bat
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ rem regarding copyright ownership. The ASF licenses this file
rem to you under the Apache License, Version 2.0 (the
rem "License"); you may not use this file except in compliance
rem with the License. You may obtain a copy of the License at
rem
rem
rem http://www.apache.org/licenses/LICENSE-2.0
rem
rem
rem Unless required by applicable law or agreed to in writing,
rem software distributed under the License is distributed on an
rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Expand Down
48 changes: 24 additions & 24 deletions tools/apidoc/generatecommand.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -36,17 +36,17 @@ version="1.0">
<div class="uppermenu_box"><!-- #BeginLibraryItem "/libraries/uppermenu.lbi" -->

<div class="uppermenu">
<a href="libraries/learn_download.html">Downloads</a> | <a href="libraries/company_news.html">News</a> | <a href="#">Contact Us</a>
<a href="libraries/learn_download.html">Downloads</a> | <a href="libraries/company_news.html">News</a> | <a href="#">Contact Us</a>
</div><!-- #EndLibraryItem --></div>
</div>

<div id="main_controller">
<div id="inside_header">

<div class="header_top">
<a class="cloud_logo" href="index.html"></a>
<div class="mainemenu_panel">

</div>
</div>
<div class="insideheader_bot">
Expand All @@ -62,11 +62,11 @@ version="1.0">
<div class="insheader_buttonshadow"></div>
</div>
</div>

</div>

<div id="main_content">

<div class="inside_apileftpanel">
<div class="inside_contentpanel" style="width:930px;">
<div class="api_titlebox">
Expand All @@ -77,12 +77,12 @@ version="1.0">
</xsl:for-each>
</div>


<div class="api_titlebox_right">
<a class="api_backbutton" href="#"></a>
</div>
</div>
<div class="api_tablepanel">
<div class="api_tablepanel">
<h2>Request parameters</h2>
<table class="apitable">
<tr class="hed">
Expand All @@ -101,16 +101,16 @@ version="1.0">
</xsl:for-each>
</table>
</div>
<div class="api_tablepanel">


<div class="api_tablepanel">
<h2>Response Tags</h2>
<table class="apitable">
<tr class="hed">
<td style="width:200px;"><strong>Response Name</strong></td>
<td style="width:500px;">Description</td>
</tr>

<xsl:for-each select="command/command/response/arg">
<tr>
<td style="width:200px;"><strong><xsl:value-of select="name"/></strong></td>
Expand All @@ -125,24 +125,24 @@ version="1.0">
<td style="width:200px;"><strong><xsl:value-of select="name"/></strong></td>
<td style="width:500px;"><xsl:value-of select="description"/></td>
</tr>
</xsl:for-each>
</xsl:for-each>
</xsl:for-each>
</xsl:for-each>
</tr>
</xsl:for-each>





</table>

</div>


</div>


</div>


</div>


</div>
</div><!-- #BeginLibraryItem "/libraries/footer.lbi" -->
<div id="footer">
Expand All @@ -169,7 +169,7 @@ version="1.0">

<li> <a href="#"> Blog</a> </li>
<li> <a href="#"> Contacts</a> </li>

</ul>
<ul class="footer_linksbox">
<li><strong> Site Info </strong> </li>
Expand Down
8 changes: 4 additions & 4 deletions tools/apidoc/generatetoc_footer.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@ KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-->
</div>
</div>
</div>
</div>


</div>


</div>
</div>
<div id="footer">
Expand Down
12 changes: 6 additions & 6 deletions tools/apidoc/generatetoc_header.xsl
Original file line number Diff line number Diff line change
Expand Up @@ -35,20 +35,20 @@ version="1.0">
<div class="uppermenu_panel">
<div class="uppermenu_box"></div>
</div>

<div id="main_controller">
<div id="inside_header">
<div class="header_top">
<a class="cloud_logo" href="http://cloudstack.org"></a>
<div class="mainemenu_panel">

</div>
</div>


</div>
<div id="main_content">

<div class="inside_apileftpanel">
<div class="inside_contentpanel" style="width:930px;">
<h1>Apache CloudStack API Documentation (%ACS_RELEASE%)</h1>
Expand All @@ -60,7 +60,7 @@ version="1.0">
<a href="http://docs.cloudstack.apache.org/en/latest/dev.html">Developer's Guide</a>.</p>
</div>
</div>

<div class="api_leftsections">
<h3>%API_HEADER%</h3>
<span>Commands available through the developer API URL and the integration API URL.</span>
Expand Down
14 changes: 7 additions & 7 deletions tools/apidoc/includes/main.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
*
* http://www.apache.org/licenses/LICENSE-2.0
*
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
Expand Down Expand Up @@ -66,7 +66,7 @@ body{
float:right;
margin:0;
padding:0;

}

.uppermenu {
Expand All @@ -89,7 +89,7 @@ body{
text-align:left;
text-decoration:none;
margin:0 5px 0 5px;

}

.uppermenu a:visited {
Expand All @@ -100,7 +100,7 @@ body{
text-align:left;
text-decoration:none;
margin:0 5px 0 5px;

}

.uppermenu a:hover {
Expand All @@ -111,7 +111,7 @@ body{
text-align:left;
text-decoration:none;
margin:0 5px 0 5px;

}


Expand Down Expand Up @@ -346,7 +346,7 @@ a.cloud_logo {
font-size:18px;
margin:10px 0 0 0;
padding:0;
}
}
.main_homecontent_right {
width:311px;
height:auto;
Expand Down
2 changes: 1 addition & 1 deletion tools/ngui/static/css/app.css
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/*
/*
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
distributed with this work for additional information
Expand Down
Loading