diff --git a/README_Install_Mac.md b/README_Install_Mac.md index 26ae55ff9..d3ce3a625 100644 --- a/README_Install_Mac.md +++ b/README_Install_Mac.md @@ -15,9 +15,9 @@ Get Zammad ---------- ````shell - test -d ~/zammad/ || mkdir ~/zammad + 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 diff --git a/README_Install_Ubuntu.md b/README_Install_Ubuntu.md index 9834c0837..93dc34a87 100644 --- a/README_Install_Ubuntu.md +++ b/README_Install_Ubuntu.md @@ -53,4 +53,3 @@ ### Restart nginx as root * exit * systemctl restart nginx - diff --git a/app/assets/javascripts/app/views/facebook/app_config.jst.eco b/app/assets/javascripts/app/views/facebook/app_config.jst.eco index d9098f3e0..625d9bd8c 100644 --- a/app/assets/javascripts/app/views/facebook/app_config.jst.eco +++ b/app/assets/javascripts/app/views/facebook/app_config.jst.eco @@ -1,6 +1,6 @@

- <%- @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') %>

<%- @T('Enter your %s App Keys', 'Facebook') %>

@@ -26,4 +26,4 @@ -
\ No newline at end of file + diff --git a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco index 1b3e4cea5..f910cf9b1 100644 --- a/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/communication_overview.jst.eco @@ -7,7 +7,7 @@

Ticket Article

-
Welcome to Zammad! We want to entertain you and your whole family!
- Ticket# 10001 - erstellte 11.07.2014 + Ticket# 10001 - erstellte 11.07.2014
@@ -65,12 +65,12 @@ Welcome!
Thank you for installing Zammad.

-You will find updates and patches at http://zammad.org/. Online
-documentation is available at http://guides.zammad.org/. You can also
-use our forums at http://forums.zammad.org/
+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,
-The Zammad.org Project +The zammad.org Project
<%- @T('See more') %>
@@ -105,7 +105,7 @@ The Zammad -
+
@@ -189,7 +189,7 @@ Grüße, Peter
-
+
@@ -274,4 +274,4 @@ Oliver
-
\ No newline at end of file +
diff --git a/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco b/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco index 9f895684c..fc20562db 100644 --- a/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/merge_customer_view.jst.eco @@ -97,15 +97,15 @@
- 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://guides.zammad.org/. You can also + documentation is available at http://forums.zammad.org/ + get involved (discussions, contributing, ...) at https://zammad.org/participate.
@@ -121,7 +121,7 @@
- The Zammad.org Project + The zammad.org Project
@@ -625,7 +625,7 @@ - +
@@ -649,7 +649,7 @@ - +
@@ -677,7 +677,7 @@ - + @@ -717,7 +717,7 @@ - + @@ -896,7 +896,7 @@ - +
@@ -912,7 +912,7 @@ - +
@@ -932,7 +932,7 @@ - +
@@ -944,7 +944,7 @@ - +
@@ -954,4 +954,4 @@ - \ No newline at end of file + diff --git a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco index 7d0bc2ac9..cc7c063e8 100644 --- a/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco +++ b/app/assets/javascripts/app/views/layout_ref/ticket_zoom.jst.eco @@ -27,7 +27,7 @@ -
Welcome to Zammad! We want to entertain you and your whole family!
- Ticket# 10001 - erstellte 11.07.2014 + Ticket# 10001 - erstellte 11.07.2014
@@ -86,12 +86,12 @@
Thank you for installing Zammad.

- You will find updates and patches at http://zammad.org/. Online
- documentation is available at http://guides.zammad.org/. You can also
- use our forums at http://forums.zammad.org/
+ 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,
- The Zammad.org Project + The zammad.org Project
<%- @T('See more') %>
@@ -130,7 +130,7 @@
-
+
@@ -219,7 +219,7 @@
-
+
@@ -655,4 +655,4 @@
-
\ No newline at end of file +
diff --git a/app/assets/javascripts/app/views/twitter/app_config.jst.eco b/app/assets/javascripts/app/views/twitter/app_config.jst.eco index 2e243eb6b..92f322b9c 100644 --- a/app/assets/javascripts/app/views/twitter/app_config.jst.eco +++ b/app/assets/javascripts/app/views/twitter/app_config.jst.eco @@ -1,6 +1,6 @@

- <%- @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') %>

<%- @T('Enter your %s App Keys', 'Twitter') %>

@@ -26,4 +26,4 @@
- \ No newline at end of file + diff --git a/db/seeds.rb b/db/seeds.rb index f6b45fe40..ea2a84be9 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -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, diff --git a/test/browser/maintenance_session_message_test.rb b/test/browser/maintenance_session_message_test.rb index 5cde06359..3df03ae8f 100644 --- a/test/browser/maintenance_session_message_test.rb +++ b/test/browser/maintenance_session_message_test.rb @@ -6,8 +6,8 @@ class MaintenanceSessionMessageTest < TestCase string = rand(99_999_999_999_999_999).to_s title_html = "test #{string}" title_text = "test #{string}<\/b>" - message_html = "message 1äöüß #{string}\n\n\nhttp://zammad.org" - message_text = "message 1äöüß #{string}\n\n\nhttp://zammad.org" + message_html = "message 1äöüß #{string}\n\n\nhttps://zammad.org" + message_text = "message 1äöüß #{string}\n\n\nhttps://zammad.org" # check #1 browser1 = browser_instance diff --git a/test/unit/aaa_string_test.rb b/test/unit/aaa_string_test.rb index 9b1c3ec84..5cf69d3ea 100644 --- a/test/unit/aaa_string_test.rb +++ b/test/unit/aaa_string_test.rb @@ -129,10 +129,10 @@ class AaaStringTest < ActiveSupport::TestCase result = 'test' assert_equal(result, html.html2text) - html = "\n
Best Tool of the World + html = "\n
Best Tool of the World some other text
" - 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 = " @@ -397,10 +397,10 @@ P.S.: You receive this e-mail because you are listed in our database as person w [1] http://www.teamviewer.example/en/company/unsubscribe.aspx?id=1009645&ident=xxx' assert_equal(result, html.html2text) - html = "

Dave and leaned her -days adam.
Maybe we -want any help me that.
Next morning charlie saw at their -father.
Well as though adam took out here. Melvin will be more money. + html = "

Dave and leaned her +days adam.
Maybe we +want any help me that.
Next morning charlie saw at their +father.
Well as though adam took out here. Melvin will be more money. Called him into this one last thing.
Men-----------------------
" result = 'Dave and leaned her days adam.