Skip to content

Commit

Permalink
Merge pull request #7891 from mbabker/https-joomla-org
Browse files Browse the repository at this point in the history
Update references for joomla.org to HTTPS
  • Loading branch information
Thomas Hunziker committed Sep 15, 2015
2 parents ac38097 + 6179ac8 commit a2a463c
Show file tree
Hide file tree
Showing 50 changed files with 112 additions and 112 deletions.
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,20 @@ Jenkins: [![Build Status](http://build.joomla.org/job/cms/badge/icon)](http://bu
What is this?
---------------------
* This is a Joomla! 3.x installation/upgrade package.
* Joomla's [Official website](http://www.joomla.org).
* Joomla's [Official website](https://www.joomla.org).
* Joomla! 3.4 [version history](https://docs.joomla.org/Joomla_3.4_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).

What is Joomla?
---------------------
* Joomla is a **Content Management System** (CMS) which enables you to build websites and powerful online applications.
* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find more [details here](http://www.joomla.org/about-joomla.html).
* It is a simple and powerful web server application which requires a server with PHP and either MySQL, PostgreSQL or SQL Server to run. You can find more [details here](https://www.joomla.org/about-joomla.html).
* Joomla is **free and OpenSource software** distributed under the GNU General Public License version 2 or later.

Is Joomla! for you?
---------------------
* Joomla is [the right solution for most content web projects](https://docs.joomla.org/Joomla_Is_it_for_me%3F).
* View Joomla's core [features here](http://www.joomla.org/core-features.html).
* View Joomla's core [features here](https://www.joomla.org/core-features.html).
* Try it out for yourself in our [online demo](https://demo.joomla.org).

How to find a Joomla! translation?
Expand All @@ -49,27 +49,27 @@ Is it easy to change the layout display?

Ready to install Joomla?
---------------------
* Check the [minimum requirements](http://www.joomla.org/technical-requirements.html).
* Check the [minimum requirements](https://www.joomla.org/technical-requirements.html).
* How do you [install Joomla](https://docs.joomla.org/Installing_Joomla!)?
* You could start your Joomla! experience by [building your site on a local test server](https://docs.joomla.org/Installing_Joomla_locally).
When ready, it can be moved to an on-line hosting account of your choice.

Updates are free!
---------------------
* Always use the [latest version](http://www.joomla.org/download.html).
* Always use the [latest version](https://www.joomla.org/download.html).

Where can you get support and help?
---------------------
* [The Joomla! Documentation](https://docs.joomla.org/Main_Page);
* [Frequently Asked Questions](https://docs.joomla.org/Category:FAQ) (FAQ);
* Find the [information you need](https://docs.joomla.org/Start_here);
* Find [help and other users](http://www.joomla.org/about-joomla/create-and-share.html);
* Find [help and other users](https://www.joomla.org/about-joomla/create-and-share.html);
* Post questions at [our forums](http://forum.joomla.org);
* [Joomla Resources Directory](http://resources.joomla.org/) (JRD).

Do you already have a Joomla site that isn't built with Joomla 3.x?
---------------------
* What's [new in Joomla! 3.x](http://www.joomla.org/3)?
* What's [new in Joomla! 3.x](https://www.joomla.org/3)?
* What are the [main differences between 2.5 and 3.x](https://docs.joomla.org/What_are_the_major_differences_between_Joomla!_2.5_and_3.x%3F)?
* How to [migrate from 2.5.x to 3.x](https://docs.joomla.org/Joomla_2.5_to_3.x_Step_by_Step_Migration).
* How to [migrate from 1.5.x to 3.x](https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration).
Expand Down
14 changes: 7 additions & 7 deletions README.txt
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
1- What is this?
* This is a Joomla! installation/upgrade package to version 3.x
* Joomla! Official site: http://www.joomla.org
* Joomla! Official site: https://www.joomla.org
* Joomla! 3.4 version history - https://docs.joomla.org/Joomla_3.4_version_history
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master

2- What is Joomla?
* Joomla is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
* It's a free and OpenSource software, distributed under the GNU General Public License version 2 or later
* This is a simple and powerful web server application and it requires a server with PHP and either MySQL, PostgreSQL, or SQL Server to run it.
More details here: http://www.joomla.org/about-joomla.html
More details here: https://www.joomla.org/about-joomla.html

3- Is Joomla for you?
* Joomla is the right solution for any content web project: https://docs.joomla.org/Joomla_Is_it_for_me%3F
* See Features - http://www.joomla.org/core-features.html
* See Features - https://www.joomla.org/core-features.html
* Try out our online demo: https://demo.joomla.org/

4- How to find a Joomla! translation?
Expand All @@ -33,25 +33,25 @@
* There are lots of ready made templates that you can download.

8- Ready to install Joomla?
* See minimum requirements here: http://www.joomla.org/technical-requirements.html
* See minimum requirements here: https://www.joomla.org/technical-requirements.html
* How do you install Joomla! ? - https://docs.joomla.org/Installing_Joomla!
* Start your Joomla experience building your site with a local test server.
When ready it can be moved to an on-line hosting account of your choice.
See the tutorial: https://docs.joomla.org/Tutorial:Joomla_Local_install

9- Updates are free!
* Always use the latest version: http://www.joomla.org/download.html
* Always use the latest version: https://www.joomla.org/download.html

10- Where can you get support and help?
* The Joomla! Documentation: https://docs.joomla.org/Main_Page
* FAQ Frequently Asked Questions: https://docs.joomla.org/Category:FAQ
* Find the information you need: https://docs.joomla.org/Start_here
* Find help and other users: http://www.joomla.org/about-joomla/create-and-share.html
* Find help and other users: https://www.joomla.org/about-joomla/create-and-share.html
* Post questions at our forums: http://forum.joomla.org
* Joomla Resources Directory (JRD): http://resources.joomla.org/

11- Do you already have a Joomla site that's not built with Joomla 3.x ?
* What's new in Joomla 3.x: http://www.joomla.org/3
* What's new in Joomla 3.x: https://www.joomla.org/3
* What are the main differences from 2.5 to 3? Table of contents: https://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0
* How to migrate from 2.5.x to 3.x? Tutorial: https://docs.joomla.org/Joomla_2.5_to_3.x_Step_by_Step_Migration
* How to migrate from 1.5.x to 3.x? Tutorial: https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ class AdminViewHelp extends JViewLegacy
/**
* @var string url for the latest version check
*/
protected $latest_version_check = 'http://www.joomla.org/download.html';
protected $latest_version_check = 'https://www.joomla.org/download.html';

/**
* @var string url for the start here link.
Expand Down
2 changes: 1 addition & 1 deletion administrator/language/en-GB/en-GB.com_postinstall.ini
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ COM_POSTINSTALL_CONFIGURATION="Post-installation Messages: Options"
COM_POSTINSTALL_LBL_MESSAGES="Post-installation and Upgrade Messages"
COM_POSTINSTALL_LBL_NOMESSAGES_DESC="You have already seen and hidden all the messages. To display them again please select the Reset Messages button below."
COM_POSTINSTALL_LBL_NOMESSAGES_TITLE="No Messages"
COM_POSTINSTALL_LBL_RELEASENEWS="Release news <a href="_QQ_"http://www.joomla.org/announcements/release-news/"_QQ_">from the Joomla! Project</a>"
COM_POSTINSTALL_LBL_RELEASENEWS="Release news <a href="_QQ_"https://www.joomla.org/announcements/release-news.html"_QQ_">from the Joomla! Project</a>"
COM_POSTINSTALL_LBL_SINCEVERSION="Since version %s"
COM_POSTINSTALL_MESSAGES_FOR="Showing messages for"
COM_POSTINSTALL_MESSAGES_TITLE="Post-installation Messages for %s"
Expand Down
2 changes: 1 addition & 1 deletion administrator/manifests/libraries/idna_convert.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<authorEmail>phlymail@phlylabs.de</authorEmail>
<authorUrl>http://phlylabs.de</authorUrl>
<packager>Joomla!</packager>
<packagerurl>http://www.joomla.org</packagerurl>
<packagerurl>https://www.joomla.org</packagerurl>
<files folder="libraries">
<folder>idna_convert</folder>
</files>
Expand Down
4 changes: 2 additions & 2 deletions administrator/manifests/libraries/joomla.xml
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<author>Joomla! Project</author>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>http://www.joomla.org</authorUrl>
<authorUrl>https://www.joomla.org</authorUrl>
<packager>Joomla!</packager>
<packagerurl>http://www.joomla.org</packagerurl>
<packagerurl>https://www.joomla.org</packagerurl>
<files folder="libraries">
<folder>compat</folder>
<folder>joomla</folder>
Expand Down
2 changes: 1 addition & 1 deletion administrator/manifests/libraries/phputf8.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<authorEmail>hfuecks@gmail.com</authorEmail>
<authorUrl>http://sourceforge.net/projects/phputf8</authorUrl>
<packager>Joomla!</packager>
<packagerurl>http://www.joomla.org</packagerurl>
<packagerurl>https://www.joomla.org</packagerurl>
<files folder="libraries">
<folder>phputf8</folder>
</files>
Expand Down
2 changes: 1 addition & 1 deletion administrator/manifests/libraries/simplepie.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<authorEmail></authorEmail>
<authorUrl>http://simplepie.org/</authorUrl>
<packager>Joomla!</packager>
<packagerurl>http://www.joomla.org</packagerurl>
<packagerurl>https://www.joomla.org</packagerurl>
<files folder="libraries">
<folder>simplepie</folder>
</files>
Expand Down
4 changes: 2 additions & 2 deletions administrator/templates/hathor/cpanel.php
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,11 @@
// Fix wrong display of Joomla!® in RTL language
if (JFactory::getLanguage()->isRtl())
{
$joomla = '<a href="http://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;&#x200E;</sup>';
$joomla = '<a href="https://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;&#x200E;</sup>';
}
else
{
$joomla = '<a href="http://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;</sup>';
$joomla = '<a href="https://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;</sup>';
}
echo JText::sprintf('JGLOBAL_ISFREESOFTWARE', $joomla);
?>
Expand Down
4 changes: 2 additions & 2 deletions administrator/templates/hathor/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -172,11 +172,11 @@
// Fix wrong display of Joomla!® in RTL language
if (JFactory::getLanguage()->isRtl())
{
$joomla = '<a href="http://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;&#x200E;</sup>';
$joomla = '<a href="https://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;&#x200E;</sup>';
}
else
{
$joomla = '<a href="http://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;</sup>';
$joomla = '<a href="https://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;</sup>';
}
echo JText::sprintf('JGLOBAL_ISFREESOFTWARE', $joomla);
?>
Expand Down
4 changes: 2 additions & 2 deletions administrator/templates/hathor/login.php
Original file line number Diff line number Diff line change
Expand Up @@ -133,11 +133,11 @@
// Fix wrong display of Joomla!® in RTL language
if (JFactory::getLanguage()->isRtl())
{
$joomla = '<a href="http://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;&#x200E;</sup>';
$joomla = '<a href="https://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;&#x200E;</sup>';
}
else
{
$joomla = '<a href="http://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;</sup>';
$joomla = '<a href="https://www.joomla.org" target="_blank">Joomla!</a><sup>&#174;</sup>';
}
echo JText::sprintf('JGLOBAL_ISFREESOFTWARE', $joomla);
?>
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/hathor/templateDetails.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE install PUBLIC "-//Joomla! 1.6//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/1.6/template-install.dtd">
<!DOCTYPE install PUBLIC "-//Joomla! 1.6//DTD template 1.0//EN" "https://www.joomla.org/xml/dtd/1.6/template-install.dtd">
<extension type="template" version="3.1" client="administrator">
<name>hathor</name>
<creationDate>May 2010</creationDate>
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/isis/login.php
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ function colorIsLight($color)
<p class="pull-right">
&copy; <?php echo date('Y'); ?> <?php echo $sitename; ?>
</p>
<a class="login-joomla hasTooltip" href="http://www.joomla.org" target="_blank" title="<?php echo JHtml::tooltipText('TPL_ISIS_ISFREESOFTWARE'); ?>"><span class="icon-joomla"></span></a>
<a class="login-joomla hasTooltip" href="https://www.joomla.org" target="_blank" title="<?php echo JHtml::tooltipText('TPL_ISIS_ISFREESOFTWARE'); ?>"><span class="icon-joomla"></span></a>
<a href="<?php echo JUri::root(); ?>" target="_blank" class="pull-left"><span class="icon-out-2"></span> <?php echo JText::_('COM_LOGIN_RETURN_TO_SITE_HOME_PAGE'); ?></a>
</div>
<jdoc:include type="modules" name="debug" style="none" />
Expand Down
2 changes: 1 addition & 1 deletion administrator/templates/isis/templateDetails.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "http://www.joomla.org/xml/dtd/2.5/template-install.dtd">
<!DOCTYPE install PUBLIC "-//Joomla! 2.5//DTD template 1.0//EN" "https://www.joomla.org/xml/dtd/2.5/template-install.dtd">
<extension version="3.1" type="template" client="administrator">
<name>isis</name>
<version>1.0</version>
Expand Down
6 changes: 3 additions & 3 deletions installation/INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ First you must have the base environment for Joomla.
We have thoroughly tested Joomla! on: Linux, Free BSD, Mac OS X and Windows.
Linux or one of the BSD's are recommended, but anything else that can run the
a supported PHP version, a supported database and a supported webserver listed
in the Technical Requirements at http://www.joomla.org/technical-requirements.html
in the Technical Requirements at https://www.joomla.org/technical-requirements.html
should do it.

SERVER CONFIGURATION
Expand All @@ -42,7 +42,7 @@ INSTALLATION
1. DOWNLOAD Joomla

You can obtain the latest Joomla! release from:
http://www.joomla.org/download.html
https://www.joomla.org/download.html

Copy the tar.gz file into a working directory e.g.

Expand Down Expand Up @@ -70,7 +70,7 @@ INSTALLATION

2. CREATE THE Joomla! DATABASE

Joomla! will currently work with MySQL, MSSQL and PostgreSQL but
Joomla! will currently work with MySQL, MSSQL and PostgreSQL but
the following instructions are for MySQL. Refer to relevant
documentation if you are using another database.

Expand Down
2 changes: 1 addition & 1 deletion installation/sql/mysql/sample_blog.sql
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ INSERT IGNORE INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, `
(89, 'Popular Tags', '', '', 1, 'position-7', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_tags_popular', 1, 1, '{"maximum":"8","timeframe":"alltime","order_value":"count","order_direction":"1","display_count":0,"no_results_text":"0","minsize":1,"maxsize":2,"layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
(90, 'Similar Items', '', '', 0, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
(91, 'Site Information', '', '', 4, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_stats_admin', 6, 1, '{"serverinfo":"1","siteinfo":"1","counter":"0","increase":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
(92, 'Release News', '', '', 1, 'postinstall', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_feed', 1, 1, '{"rssurl":"http:\\/\\/www.joomla.org\\/announcements\\/release-news.feed","rssrtl":"0","rsstitle":"1","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","word_count":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*');
(92, 'Release News', '', '', 1, 'postinstall', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_feed', 1, 1, '{"rssurl":"https:\\/\\/www.joomla.org\\/announcements\\/release-news.feed","rssrtl":"0","rsstitle":"1","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","word_count":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*');

INSERT IGNORE INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES
(1, 0),
Expand Down
2 changes: 1 addition & 1 deletion installation/sql/mysql/sample_brochure.sql
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ INSERT IGNORE INTO `#__modules` (`id`, `asset_id`, `title`, `note`, `content`, `
(87, 0, 'Footer', '', '', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_footer', 1, 1, '{"layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
(88, 52, 'Image', '', '<p><img src="images/headers/windows.jpg" alt="" /></p>', 1, 'position-3', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"1","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
(89, 51, 'Site Information', '', '', 4, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_stats_admin', 6, 1, '{"serverinfo":"1","siteinfo":"1","counter":"1","increase":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
(90, 53, 'Release News', '', '', 0, 'postinstall', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_feed', 1, 1, '{"rssurl":"http:\\/\\/www.joomla.org\\/announcements\\/release-news.feed","rssrtl":"0","rsstitle":"1","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","word_count":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*');
(90, 53, 'Release News', '', '', 0, 'postinstall', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_feed', 1, 1, '{"rssurl":"https:\\/\\/www.joomla.org\\/announcements\\/release-news.feed","rssrtl":"0","rsstitle":"1","rssdesc":"1","rssimage":"1","rssitems":"3","rssitemdesc":"1","word_count":"0","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 1, '*');

INSERT IGNORE INTO `#__modules_menu` (`moduleid`, `menuid`) VALUES
(1, 0),
Expand Down

0 comments on commit a2a463c

Please sign in to comment.