Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use https in links were possible

Browse source
This commit is contained in:
Michiel Beijen 2016-10-21 17:44:35 +02:00
parent 246a3dd7ec
commit 6e44b5ae26
10 changed files with 48 additions and 49 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README_Install_Mac.md
View file

@ -17,7 +17,7 @@ Get Zammad
````shell
test -d ~/zammad/ || mkdir ~/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

1
README_Install_Ubuntu.md
View file

@ -53,4 +53,3 @@
### Restart nginx as root
* exit
* systemctl restart nginx

2
app/assets/javascripts/app/views/facebook/app_config.jst.eco
View file

@ -1,6 +1,6 @@
<div class="alert alert--danger hidden" role="alert"></div>
<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>
<fieldset>
<h2><%- @T('Enter your %s App Keys', 'Facebook') %></h2>

8
app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco
View file

@ -65,12 +65,12 @@ Welcome!
<br/>
Thank you for installing Zammad.<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/>
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/>
use our forums at <a href="http://forums.zammad.org/" title="http://forums.zammad.org/" target="_blank">http://forums.zammad.org/</a><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="https://zammad.org/documentation/" title="https://zammad.org/documentation/" target="_blank">https://zammad.org/documentation/</a>. Get involved<br/>
(discussions, contributing, ...) at <a href="https://zammad.org/participate" title="https://zammad.org/participate" target="_blank">https://zammad.org/participate</a>.<br/>
<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="btn btn--text js-unfold"><%- @T('See more') %></div>
</div>

8
app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco
View file

@ -97,15 +97,15 @@
</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>
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>
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>
@ -121,7 +121,7 @@
</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 class="textBubble-overflowContainer hide">

8
app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco
View file

@ -86,12 +86,12 @@
<br/>
Thank you for installing Zammad.<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/>
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/>
use our forums at <a href="http://forums.zammad.org/" title="http://forums.zammad.org/" target="_blank">http://forums.zammad.org/</a><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="https://zammad.org/documentation/" title="https://zammad.org/documentation/" target="_blank">https://zammad.org/documentation/</a>. Get involved<br/>
(discussions, contributing, ...) at <a href="https://zammad.org/participate" title="https://zammad.org/participate" target="_blank">https://zammad.org/participate</a>.<br/>
<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 class="textBubble-overflowContainer">
<div class="btn btn--text js-unfold"><%- @T('See more') %></div>

2
app/assets/javascripts/app/views/twitter/app_config.jst.eco
View file

@ -1,6 +1,6 @@
<div class="alert alert--danger hidden" role="alert"></div>
<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>
<fieldset>
<h2><%- @T('Enter your %s App Keys', 'Twitter') %></h2>

6
db/seeds.rb
View file

@ -3029,9 +3029,9 @@ Ticket::Article.create(
Thank you for choosing Zammad.
You will find updates and patches at http://zammad.org/. Online
documentation is available at http://zammad.org/documentation. Get
involved (discussions, contributing, ...) at http://zammad.org/participate.
You will find updates and patches at https://zammad.org/. Online
documentation is available at https://zammad.org/documentation. Get
involved (discussions, contributing, ...) at https://zammad.org/participate.
Regards,

4
test/browser/maintenance_session_message_test.rb
View file

@ -6,8 +6,8 @@ class MaintenanceSessionMessageTest < TestCase
string = rand(99_999_999_999_999_999).to_s
title_html = "test <b>#{string}</b>"
title_text = "test <b>#{string}<\/b>"
message_html = "message <b>1äöüß</b> #{string}\n\n\nhttp://zammad.org"
message_text = "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\nhttps://zammad.org"
# check #1
browser1 = browser_instance

4
test/unit/aaa_string_test.rb
View file

@ -129,10 +129,10 @@ class AaaStringTest < ActiveSupport::TestCase
result = 'test'
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>
<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)
html = "<!-- some comment -->