Use https in links were possible
This commit is contained in:
parent
246a3dd7ec
commit
6e44b5ae26
|
@ -17,7 +17,7 @@ Get Zammad
|
||||||
````shell
|
````shell
|
||||||
test -d ~/zammad/ || mkdir ~/zammad
|
test -d ~/zammad/ || mkdir ~/zammad
|
||||||
cd ~/zammad/
|
cd ~/zammad/
|
||||||
curl -L -O http://zammad.org/zammad-latest.tar.bz2 | tar -xj
|
curl -L -O http://ftp.zammad.com/zammad-latest.tar.bz2 | tar -xj
|
||||||
````
|
````
|
||||||
|
|
||||||
Install Zammad
|
Install Zammad
|
||||||
|
|
|
@ -53,4 +53,3 @@
|
||||||
### Restart nginx as root
|
### Restart nginx as root
|
||||||
* exit
|
* exit
|
||||||
* systemctl restart nginx
|
* systemctl restart nginx
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<div class="alert alert--danger hidden" role="alert"></div>
|
<div class="alert alert--danger hidden" role="alert"></div>
|
||||||
<p>
|
<p>
|
||||||
<%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](http://zammad.org/documentation/channel/facebook).', 'Facebook App') %>
|
<%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](https://zammad.org/documentation/channel/facebook).', 'Facebook App') %>
|
||||||
</p>
|
</p>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<h2><%- @T('Enter your %s App Keys', 'Facebook') %></h2>
|
<h2><%- @T('Enter your %s App Keys', 'Facebook') %></h2>
|
||||||
|
|
|
@ -65,12 +65,12 @@ Welcome!
|
||||||
<br/>
|
<br/>
|
||||||
Thank you for installing Zammad.<br/>
|
Thank you for installing Zammad.<br/>
|
||||||
<br/>
|
<br/>
|
||||||
You will find updates and patches at <a href="http://zammad.org/" title="http://zammad.org/" target="_blank">http://zammad.org/</a>. Online<br/>
|
You will find updates and patches at <a href="https://zammad.org/" title="https://zammad.org/" target="_blank">https://zammad.org/</a>. Online<br/>
|
||||||
documentation is available at <a href="http://guides.zammad.org/" title="http://guides.zammad.org/" target="_blank">http://guides.zammad.org/</a>. You can also<br/>
|
documentation is available at <a href="https://zammad.org/documentation/" title="https://zammad.org/documentation/" target="_blank">https://zammad.org/documentation/</a>. Get involved<br/>
|
||||||
use our forums at <a href="http://forums.zammad.org/" title="http://forums.zammad.org/" target="_blank">http://forums.zammad.org/</a><br/>
|
(discussions, contributing, ...) at <a href="https://zammad.org/participate" title="https://zammad.org/participate" target="_blank">https://zammad.org/participate</a>.<br/>
|
||||||
<br/>
|
<br/>
|
||||||
Regards,<br/>
|
Regards,<br/>
|
||||||
The <a href="http://Zammad.org" title="http://Zammad.org" target="_blank">Zammad.org</a> Project
|
The <a href="https://zammad.org" title="https://zammad.org" target="_blank">zammad.org</a> Project
|
||||||
<div class="textBubble-overflowContainer">
|
<div class="textBubble-overflowContainer">
|
||||||
<div class="btn btn--text js-unfold"><%- @T('See more') %></div>
|
<div class="btn btn--text js-unfold"><%- @T('See more') %></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -97,15 +97,15 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
You will find updates and patches at <a href="http://zammad.org/" target="_blank" title="http://zammad.org/">http://zammad.org/</a>. Online
|
You will find updates and patches at <a href="https://zammad.org/" target="_blank" title="https://zammad.org/">https://zammad.org/</a>. Online
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
documentation is available at <a href="http://guides.zammad.org/" target="_blank" title="http://guides.zammad.org/">http://guides.zammad.org/</a>. You can also
|
documentation is available at <a href="https://zammad.org/documentation/" target="_blank" title="https://zammad.org/documentation/>https://zammad.org/documentation/</a>. You can also
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
use our forums at <a href="http://forums.zammad.org/" target="_blank" title="http://forums.zammad.org/">http://forums.zammad.org/</a>
|
get involved (discussions, contributing, ...) at <a href="https://zammad.org/participate" target="_blank" title="https://zammad.org/participate">https://zammad.org/participate</a>.
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
|
@ -121,7 +121,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div>
|
<div>
|
||||||
The <a href="http://Zammad.org" target="_blank" title="http://Zammad.org">Zammad.org</a> Project
|
The <a href="https://zammad.org" target="_blank" title="https://zammad.org">zammad.org</a> Project
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="textBubble-overflowContainer hide">
|
<div class="textBubble-overflowContainer hide">
|
||||||
|
|
|
@ -86,12 +86,12 @@
|
||||||
<br/>
|
<br/>
|
||||||
Thank you for installing Zammad.<br/>
|
Thank you for installing Zammad.<br/>
|
||||||
<br/>
|
<br/>
|
||||||
You will find updates and patches at <a href="http://zammad.org/" title="http://zammad.org/" target="_blank">http://zammad.org/</a>. Online<br/>
|
You will find updates and patches at <a href="https://zammad.org/" title="https://zammad.org/" target="_blank">https://zammad.org/</a>. Online<br/>
|
||||||
documentation is available at <a href="http://guides.zammad.org/" title="http://guides.zammad.org/" target="_blank">http://guides.zammad.org/</a>. You can also<br/>
|
documentation is available at <a href="https://zammad.org/documentation/" title="https://zammad.org/documentation/" target="_blank">https://zammad.org/documentation/</a>. Get involved<br/>
|
||||||
use our forums at <a href="http://forums.zammad.org/" title="http://forums.zammad.org/" target="_blank">http://forums.zammad.org/</a><br/>
|
(discussions, contributing, ...) at <a href="https://zammad.org/participate" title="https://zammad.org/participate" target="_blank">https://zammad.org/participate</a>.<br/>
|
||||||
<br/>
|
<br/>
|
||||||
Regards,<br/>
|
Regards,<br/>
|
||||||
The <a href="http://Zammad.org" title="http://Zammad.org" target="_blank">Zammad.org</a> Project
|
The <a href="https://zammad.org" title="https://zammad.org" target="_blank">zammad.org</a> Project
|
||||||
</div>
|
</div>
|
||||||
<div class="textBubble-overflowContainer">
|
<div class="textBubble-overflowContainer">
|
||||||
<div class="btn btn--text js-unfold"><%- @T('See more') %></div>
|
<div class="btn btn--text js-unfold"><%- @T('See more') %></div>
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
<div class="alert alert--danger hidden" role="alert"></div>
|
<div class="alert alert--danger hidden" role="alert"></div>
|
||||||
<p>
|
<p>
|
||||||
<%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](http://zammad.org/documentation/channel/twitter).', 'Twitter App') %>
|
<%- @T('The tutorial on how to manage a %s is hosted on our [online documentation](https://zammad.org/documentation/channel/twitter).', 'Twitter App') %>
|
||||||
</p>
|
</p>
|
||||||
<fieldset>
|
<fieldset>
|
||||||
<h2><%- @T('Enter your %s App Keys', 'Twitter') %></h2>
|
<h2><%- @T('Enter your %s App Keys', 'Twitter') %></h2>
|
||||||
|
|
|
@ -3029,9 +3029,9 @@ Ticket::Article.create(
|
||||||
|
|
||||||
Thank you for choosing Zammad.
|
Thank you for choosing Zammad.
|
||||||
|
|
||||||
You will find updates and patches at http://zammad.org/. Online
|
You will find updates and patches at https://zammad.org/. Online
|
||||||
documentation is available at http://zammad.org/documentation. Get
|
documentation is available at https://zammad.org/documentation. Get
|
||||||
involved (discussions, contributing, ...) at http://zammad.org/participate.
|
involved (discussions, contributing, ...) at https://zammad.org/participate.
|
||||||
|
|
||||||
Regards,
|
Regards,
|
||||||
|
|
||||||
|
|
|
@ -6,8 +6,8 @@ class MaintenanceSessionMessageTest < TestCase
|
||||||
string = rand(99_999_999_999_999_999).to_s
|
string = rand(99_999_999_999_999_999).to_s
|
||||||
title_html = "test <b>#{string}</b>"
|
title_html = "test <b>#{string}</b>"
|
||||||
title_text = "test <b>#{string}<\/b>"
|
title_text = "test <b>#{string}<\/b>"
|
||||||
message_html = "message <b>1äöüß</b> #{string}\n\n\nhttp://zammad.org"
|
message_html = "message <b>1äöüß</b> #{string}\n\n\nhttps://zammad.org"
|
||||||
message_text = "message <b>1äöüß</b> #{string}\n\n\nhttp://zammad.org"
|
message_text = "message <b>1äöüß</b> #{string}\n\n\nhttps://zammad.org"
|
||||||
|
|
||||||
# check #1
|
# check #1
|
||||||
browser1 = browser_instance
|
browser1 = browser_instance
|
||||||
|
|
|
@ -129,10 +129,10 @@ class AaaStringTest < ActiveSupport::TestCase
|
||||||
result = 'test'
|
result = 'test'
|
||||||
assert_equal(result, html.html2text)
|
assert_equal(result, html.html2text)
|
||||||
|
|
||||||
html = "\n<div><a href=\"http://zammad.org\">Best Tool of the World</a>
|
html = "\n<div><a href=\"https://zammad.org\">Best Tool of the World</a>
|
||||||
some other text</div>
|
some other text</div>
|
||||||
<div>"
|
<div>"
|
||||||
result = "[1] Best Tool of the Worldsome other text\n\n[1] http://zammad.org"
|
result = "[1] Best Tool of the Worldsome other text\n\n[1] https://zammad.org"
|
||||||
assert_equal(result, html.html2text)
|
assert_equal(result, html.html2text)
|
||||||
|
|
||||||
html = "<!-- some comment -->
|
html = "<!-- some comment -->
|
||||||
|
|
Loading…
Reference in a new issue