Skip to content

Commit

Permalink
Merge branch 'componentrouteradvanced' of github.com:Hackwar/joomla-c…
Browse files Browse the repository at this point in the history 
…ms into componentrulesitemid
  • Loading branch information
@Hackwar
Hackwar committed Dec 31, 2014
2 parents 6f89554 + 0133947 commit a677ef3
Show file tree
Hide file tree
Showing 3,443 changed files with 12,409 additions and 8,784 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
43 changes: 22 additions & 21 deletions README.md
View file
Expand Up @@ -10,7 +10,7 @@ What is this?
---------------------
* This is a Joomla! 3.x installation/upgrade package.
* Joomla's [Official website](http://www.joomla.org).
* Joomla! 3.3 [version history](http://docs.joomla.org/Joomla_3.3_version_history).
* Joomla! 3.3 [version history](https://docs.joomla.org/Joomla_3.3_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).

What is Joomla?
Expand All @@ -21,7 +21,7 @@ What is Joomla?

Is Joomla! for you?
---------------------
* Joomla is [the right solution for most content web projects](http://docs.joomla.org/Joomla_Is_it_for_me%3F).
* 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).
* Try it out for yourself in our [online demo](http://demo.joomla.org).

Expand All @@ -33,8 +33,8 @@ How to find a Joomla! translation?

Learn Joomla!
---------------------
* Read ['Getting Started with Joomla!'](http://docs.joomla.org/Getting_Started_with_Joomla!) to learn the basics.
* Before installing, read the ['Beginners' Guide'](http://docs.joomla.org/Beginners).
* Read ['Getting Started with Joomla!'](https://docs.joomla.org/Getting_Started_with_Joomla!) to learn the basics.
* Before installing, read the ['Beginners' Guide'](https://docs.joomla.org/Beginners).

What are the benefits of Joomla?
---------------------
Expand All @@ -46,13 +46,13 @@ Is it easy to change the layout display?
---------------------
* The layout is controlled by templates that you can edit.
* There are a lot of ready-made professional templates that you can download.
* Template management information is [available here](http://docs.joomla.org/Portal:Administrators#Template_Management).
* Template management information is [available here](https://docs.joomla.org/Portal:Administrators#Template_Management).

Ready to install Joomla?
---------------------
* Check the [minimum requirements](http://www.joomla.org/technical-requirements.html).
* How do you [install Joomla](http://docs.joomla.org/Installing_Joomla!)?
* You could start your Joomla! experience by [building your site on a local test server](http://docs.joomla.org/Installing_Joomla_locally).
* 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!
Expand All @@ -61,32 +61,33 @@ Updates are free!

Where can you get support and help?
---------------------
* [Frequently Asked Questions](http://docs.joomla.org/Category:FAQ) (FAQ);
* Find the [information you need](http://docs.joomla.org/Start_here);
* [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);
* Post questions at [our forums](http://forum.joomla.org);
* [Joomla Resources Directory](http://resources.joomla.org/tos.html) (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 are the [main differences between 2.5 and 3.x](http://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](http://docs.joomla.org/Should_I_update_from_Joomla!_2.5_to_3.x%3F).
* What are the [main differences betwen 1.5 and 2.5](http://docs.joomla.org/Differences_from_Joomla_1.5_to_Joomla_2.5)?
* How to [migrate from 1.5.x to 3.x](http://docs.joomla.org/Migrating_from_Joomla_1.5_to_Joomla_3.0).
* How to[convert an existing website to Joomla](http://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site).
* 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).
* What are the [main differences betwen 1.5 and 2.5](https://docs.joomla.org/Differences_from_Joomla_1.5_to_Joomla_2.5)?
* How to [migrate from 1.5.x to 3.x](https://docs.joomla.org/Joomla_1.5_to_3.x_Step_by_Step_Migration).
* How to [convert an existing website to Joomla](https://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site).

Do you want to improve Joomla?
--------------------
* How do you [request a feature](http://docs.joomla.org/How_do_you_request_a_feature%3F)?
* How do you [report a bug](http://docs.joomla.org/Filing_bugs_and_issues)?
* How do you [request a feature](https://docs.joomla.org/How_do_you_request_a_feature%3F)?
* How do you [report a bug](https://docs.joomla.org/Filing_bugs_and_issues)?
* Get Involved: Joomla! is community developed software. [Join the community](http://www.joomla.org).
* Documentation for [Developers](http://docs.joomla.org/Developers).
* Documentation for [Web designers](http://docs.joomla.org/Web_designers).
* Documentation for [Developers](https://docs.joomla.org/Developers).
* Documentation for [Web designers](https://docs.joomla.org/Web_designers).

Copyright
---------------------
* Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
* [Credits](http://docs.joomla.org/Joomla!_Credits_and_Thanks)
* Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
* [Credits](https://docs.joomla.org/Joomla!_Credits_and_Thanks)
* Distributed under the GNU General Public License version 2 or later
* See [License details](http://docs.joomla.org/Joomla_Licenses)
* See [License details](https://docs.joomla.org/Joomla_Licenses)
43 changes: 22 additions & 21 deletions README.txt
View file
@@ -1,7 +1,7 @@
1- What is this?
* This is a Joomla! installation/upgrade package to version 3.x
* Joomla! Official site: http://www.joomla.org
* Joomla 3.3 version history - http://docs.joomla.org/Joomla_3.3_version_history
* Joomla 3.3 version history - https://docs.joomla.org/Joomla_3.3_version_history
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master

2- What is Joomla?
Expand All @@ -11,7 +11,7 @@
More details here: http://www.joomla.org/about-joomla.html

3- Is Joomla for you?
* Joomla is the right solution for any content web project: http://docs.joomla.org/Joomla_Is_it_for_me%3F
* 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
* Try out our online demo: http://demo.joomla.org/

Expand All @@ -20,8 +20,8 @@
* Directory of non-accredited language packs (see above for accredited): http://extensions.joomla.org/extensions/languages/translations-for-joomla

5- Learn Joomla!
* Read Getting Started with Joomla to find out the basics: http://docs.joomla.org/Getting_Started_with_Joomla!
* Before installing, read the beginners guide: http://docs.joomla.org/Beginners
* Read Getting Started with Joomla to find out the basics: https://docs.joomla.org/Getting_Started_with_Joomla!
* Before installing, read the beginners guide: https://docs.joomla.org/Beginners

6- What are the limits of Joomla?
* Joomla sites can be extended in functionalities with Extensions that you can create (or download) to suite your needs.
Expand All @@ -34,38 +34,39 @@

8- Ready to install Joomla?
* See minimum requirements here: http://www.joomla.org/technical-requirements.html
* How do you install Joomla! ? - http://docs.joomla.org/Installing_Joomla!
* 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: http://docs.joomla.org/Tutorial:Joomla_Local_install
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

10- Where can you get support and help?
* FAQ Frequently Asked Questions: http://docs.joomla.org/Category:FAQ
* Find the information you need: http://docs.joomla.org/Start_here
* 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
* Post questions at our forums: http://forum.joomla.org
* Joomla Resources Directory (JRD): http://resources.joomla.org/tos.html

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 are the main differences from 2.5 to 3? Table of contents: http://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0
* How to migrate from 2.5.x to 3.x? Tutorial: http://docs.joomla.org/Migrating_from_Joomla_2.5_to_Joomla_3.0
* What are the main differences from 1.5 to 2.5? Table of contents: http://docs.joomla.org/Differences_from_Joomla_1.5_to_Joomla_2.5
* How to migrate from 1.5.x to 3.x? Tutorial: http://docs.joomla.org/Migrating_from_Joomla_1.5_to_Joomla_3.0
* Convert an existing Web site to Joomla - http://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site
* What's new in Joomla 3.x: http://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
* What are the main differences from 1.5 to 2.5? Table of contents: https://docs.joomla.org/Differences_from_Joomla_1.5_to_Joomla_2.5
* 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
* Convert an existing Web site to Joomla: https://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site

12- Do you want to improve Joomla?
* How do you request a feature? http://docs.joomla.org/How_do_you_request_a_feature%3F
* How do you report a bug? http://docs.joomla.org/Filing_bugs_and_issues
* How do you request a feature? https://docs.joomla.org/How_do_you_request_a_feature%3F
* How do you report a bug? https://docs.joomla.org/Filing_bugs_and_issues
* Get Involved: Joomla! is a community developed software. Join the community at http://www.joomla.org
* Are you a Developer? http://docs.joomla.org/Developers
* Are you a Web designer? http://docs.joomla.org/Web_designers
* Are you a Developer? https://docs.joomla.org/Developers
* Are you a Web designer? https://docs.joomla.org/Web_designers

Copyright:
* Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved.
* Credits: http://docs.joomla.org/Joomla!_Credits_and_Thanks
* Copyright (C) 2005 - 2015 Open Source Matters. All rights reserved.
* Credits: https://docs.joomla.org/Joomla!_Credits_and_Thanks
* Distributed under the GNU General Public License version 2 or later
* See Licenses details at http://docs.joomla.org/Joomla_Licenses
* See Licenses details at https://docs.joomla.org/Joomla_Licenses
2 changes: 1 addition & 1 deletion administrator/components/com_admin/admin.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/admin.xml
View file
Expand Up @@ -3,7 +3,7 @@
<name>com_admin</name>
<author>Joomla! Project</author>
<creationDate>April 2006</creationDate>
<copyright>(C) 2005 - 2014 Open Source Matters. All rights reserved.</copyright>
<copyright>(C) 2005 - 2015 Open Source Matters. All rights reserved.</copyright>
<license>GNU General Public License version 2 or later; see LICENSE.txt</license>
<authorEmail>admin@joomla.org</authorEmail>
<authorUrl>www.joomla.org</authorUrl>
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/controller.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/controllers/profile.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/helpers/html/directory.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/helpers/html/phpsetting.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/helpers/html/system.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
4 changes: 2 additions & 2 deletions administrator/components/com_admin/models/help.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down Expand Up @@ -201,7 +201,7 @@ public function &getLatestVersionCheck()
{
if (!$this->latest_version_check)
{
$override = 'http://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help{major}{minor}:Joomla_Version_{major}_{minor}_{maintenance}/{langcode}&amp;lang={langcode}';
$override = 'https://help.joomla.org/proxy/index.php?option=com_help&amp;keyref=Help{major}{minor}:Joomla_Version_{major}_{minor}_{maintenance}/{langcode}&amp;lang={langcode}';
$this->latest_version_check = JHelp::createUrl('JVERSION', false, $override);
}

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/models/profile.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/models/sysinfo.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/eaccelerator.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for eAccelerator compatibility.
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/htaccess.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for notifying users of a change
Expand Down
2 changes: 1 addition & 1 deletion administrator/components/com_admin/postinstall/phpversion.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2013 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*
* This file contains post-installation message handling for the checking minimum PHP version support
Expand Down
11 changes: 10 additions & 1 deletion administrator/components/com_admin/script.php
View file
Expand Up @@ -3,7 +3,7 @@
* @package Joomla.Administrator
* @subpackage com_admin
*
* @copyright Copyright (C) 2005 - 2014 Open Source Matters, Inc. All rights reserved.
* @copyright Copyright (C) 2005 - 2015 Open Source Matters, Inc. All rights reserved.
* @license GNU General Public License version 2 or later; see LICENSE.txt
*/

Expand Down Expand Up @@ -217,6 +217,7 @@ protected function updateManifestCaches()
$extensions[] = array('plugin', 'tags', 'finder', 0);
$extensions[] = array('plugin', 'totp', 'twofactorauth', 0);
$extensions[] = array('plugin', 'yubikey', 'twofactorauth', 0);
$extensions[] = array('plugin', 'nocaptcha', 'captcha', 0);

// Templates
$extensions[] = array('template', 'beez3', '', 0);
Expand Down Expand Up @@ -1023,7 +1024,11 @@ public function deleteUnexistingFiles()
'/libraries/joomla/registry/format/php.php',
'/libraries/joomla/registry/format/xml.php',
// Joomla! 3.4
'/administrator/components/com_tags/helpers/html/index.html',
'/administrator/components/com_tags/models/fields/index.html',
'/administrator/manifests/libraries/phpmailer.xml',
'/administrator/templates/hathor/html/com_finder/filter/index.html',
'/administrator/templates/hathor/html/com_finder/statistics/index.html',
'/components/com_contact/helpers/icon.php',
'/language/en-GB/en-GB.lib_phpmailer.sys.ini',
'/libraries/compat/jsonserializable.php',
Expand Down Expand Up @@ -1136,6 +1141,10 @@ public function deleteUnexistingFiles()
'/libraries/joomla/registry/format',
'/libraries/joomla/registry',
// Joomla! 3.4
'/administrator/components/com_tags/helpers/html',
'/administrator/components/com_tags/models/fields',
'/administrator/templates/hathor/html/com_finder/filter',
'/administrator/templates/hathor/html/com_finder/statistics',
'/libraries/compat/password/lib',
'/libraries/compat/password',
'/libraries/compat',
Expand Down

0 comments on commit a677ef3

Please sign in to comment.