-
-
Notifications
You must be signed in to change notification settings - Fork 3.6k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' of github.com:joomla/joomla-cms
Conflicts: administrator/components/com_modules/models/module.php administrator/components/com_modules/models/select.php administrator/components/com_plugins/models/plugin.php
- Loading branch information
Showing
5,227 changed files
with
461,679 additions
and
145,032 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,5 +1,27 @@ | ||
| *~ | ||
| /.project | ||
| /.settings | ||
| /.buildpath | ||
| # IDE & System Related Files # | ||
| .buildpath | ||
| .project | ||
| .settings | ||
| .DS_Store | ||
| .idea | ||
|
|
||
| # Local System Files (i.e. cache, logs, etc.) # | ||
| /administrator/cache | ||
| /cache | ||
| /logs | ||
| /tmp | ||
| /configuration.php | ||
| /.htaccess | ||
| /web.config | ||
|
|
||
| # Test Related Files # | ||
| /phpunit.xml | ||
| /tests/system/webdriver/tests/logs/ | ||
|
|
||
| # phpDocumentor Logs # | ||
| phpdoc-* | ||
|
|
||
| # Patch Tester | ||
| administrator/components/com_patchtester/ | ||
| administrator/templates/hathor/html/com_patchtester | ||
| components/com_patchtester/ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,22 @@ | ||
| language: php | ||
|
|
||
| php: | ||
| - 5.3 | ||
| - 5.4 | ||
|
|
||
| before_script: | ||
| - composer self-update | ||
| - pyrus channel-discover pear.phpunit.de | ||
| - pyrus install --force phpunit/DbUnit | ||
| - phpenv rehash | ||
| - mysql -e 'create database joomla_ut;' | ||
| - mysql joomla_ut < tests/unit/suites/database/stubs/mysql.sql | ||
| - psql -c 'create database joomla_ut;' -U postgres | ||
| - psql -d joomla_ut -a -f tests/unit/suites/database/stubs/postgresql.sql | ||
|
|
||
| script: | ||
| - phpunit --configuration travisci-phpunit.xml | ||
|
|
||
| branches: | ||
| except: | ||
| - 2.5.x |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| Joomla! CMS | ||
| ==================== | ||
|
|
||
| Build Status | ||
| --------------------- | ||
| Travis-CI: [](https://travis-ci.org/joomla/joomla-cms) | ||
| Jenkins: [](http://build.joomla.org/job/cms/) | ||
|
|
||
| What is this? | ||
| --------------------- | ||
| * This is a Joomla! installation/upgrade package to version 3.x | ||
| * Joomla! [Official site](http://www.joomla.org) | ||
| * Joomla! 3.2 [version history](http://docs.joomla.org/Joomla_3.2_version_history) | ||
| * Detailed changes 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 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) | ||
|
|
||
| Is Joomla! for you? | ||
| --------------------- | ||
| * Joomla! is [the right solution for any content web project](http://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) | ||
|
|
||
| How to find a Joomla! translation? | ||
| --------------------- | ||
| * Repository of accredited [language packs](http://community.joomla.org/translations.html) | ||
| * Directory of [non-accredited language packs](http://extensions.joomla.org/extensions/languages/translations-for-joomla) (see above for accredited) | ||
|
|
||
| Learn Joomla! | ||
| --------------------- | ||
| * Read [Getting Started with Joomla](http://docs.joomla.org/Getting_Started_with_Joomla!) to find out the basics | ||
| * Before installing, read the [beginners guide](http://docs.joomla.org/Beginners) | ||
|
|
||
| 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. | ||
| * There are lots of ready made extensions that you can download and install. | ||
| * See the [Joomla! Extensions Directory (JED)](http://extensions.joomla.org) | ||
|
|
||
| Is it easy to change the layout display? | ||
| --------------------- | ||
| * The layout is controlled by templates that you can edit. | ||
| * There are lots of ready made templates that you can download. | ||
|
|
||
| Ready to install Joomla? | ||
| --------------------- | ||
| * See [minimum requirements](http://www.joomla.org/technical-requirements.html) | ||
| * How do you [install Joomla!](http://docs.joomla.org/Installing_Joomla!) ? | ||
| * Start your Joomla! experience [building your site with a local test server](http://docs.joomla.org/Tutorial:Joomla_Local_install). | ||
| 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) | ||
|
|
||
| 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) | ||
| * 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'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.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 from 1.5 to 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)? | ||
| * [Convert an existing Web site to Joomla](http://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)? | ||
| * Get Involved: Joomla! is a 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) | ||
|
|
||
| Copyright: | ||
| --------------------- | ||
| * Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved. | ||
| * [Credits](http://docs.joomla.org/Joomla_3_Credits) | ||
| * Distributed under the GNU General Public License version 2 or later | ||
| * See [Licenses details](http://docs.joomla.org/Joomla_Licenses) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,70 +1,71 @@ | ||
| 1- What is this? | ||
| * This is a Joomla! installation/upgrade package to version 2.5.x | ||
| * Joomla! Official site: http://www.joomla.org | ||
| * Joomla 2.5 version history - http://docs.joomla.org/Joomla_2.5_version_history | ||
| * Detailed changes in the Changelog: http://joomlacode.org/gf/project/joomla/scmsvn/?action=browse&path=/development/trunk/administrator/&view=log | ||
| * This is a Joomla! installation/upgrade package to version 3.x | ||
| * Joomla! Official site: http://www.joomla.org | ||
| * Joomla 3.1 version history - http://docs.joomla.org/Joomla_3.1_version_history | ||
| * Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master | ||
|
|
||
| 2- What is Joomla? | ||
| * Joomla it's 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 MySQL to run it. | ||
| * 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 | ||
|
|
||
| 3- Is Joomla for you? | ||
| * Joomla its the right solution for any content web project: http://docs.joomla.org/Joomla_Is_it_for-me%3F | ||
| * See Features - http://docs.joomla.org/Joomla_Core_Features | ||
| * Try out our online demo: http://demo.joomla.org/ | ||
| * Joomla is the right solution for any content web project: http://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/ | ||
|
|
||
| 4- How to find a Joomla! translation? | ||
| * Joomla speak your language: http://docs.joomla.org/Joomla_and_languages/translations | ||
| * Repository of accredited language packs: http://community.joomla.org/translations.html | ||
| * Repository of accredited language packs: http://community.joomla.org/translations.html | ||
| * 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: http://docs.joomla.org/Getting_Started_with_Joomla! | ||
| * Before installing, read the beginners guide: http://docs.joomla.org/Beginners | ||
|
|
||
| 6- What are the limits of Joomla? | ||
| * Joomla sites can be extended in functionalities with Extensions that you can create to suite your needs. | ||
| * There are lots of ready made extensions that you can download and install. | ||
| * See the Joomla! Extensions Directory (JED): http://extensions.joomla.org | ||
| * Joomla sites can be extended in functionalities with Extensions that you can create (or download) to suite your needs. | ||
| * There are lots of ready made extensions that you can download and install. | ||
| * See the Joomla! Extensions Directory (JED): http://extensions.joomla.org | ||
|
|
||
| 7- Is it easy to change the layout display? | ||
| * The layout its controlled by templates that you can edit. | ||
| * There are lots of ready made templates that you can download. | ||
| * The layout is controlled by templates that you can edit. | ||
| * 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 | ||
| * How do you install Joomla! ? - http://docs.joomla.org/Installing_Joomla!_1.7 | ||
| * 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 minimum requirements here: http://www.joomla.org/technical-requirements.html | ||
| * How do you install Joomla! ? - http://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 | ||
|
|
||
| 9- Updates are free! | ||
| * Always use the latest version: http://www.joomla.org/download.html | ||
| * 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 | ||
| * 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 | ||
| * FAQ Frequently Asked Questions: http://docs.joomla.org/Category:FAQ | ||
| * Find the information you need: http://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- Already have a site but its not built with Joomla 2.5 ? | ||
| * What's new in Joomla 2.5+ - http://docs.joomla.org/What%27s_new_in_Joomla_2.5 | ||
| * 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 ? Tutorial: http://docs.joomla.org/Tutorial:Migrating_from_Joomla_1.5_to_Joomla_2.5 | ||
| * Upgrade Instructions: http://docs.joomla.org/Upgrade_Instructions | ||
| * Convert an existing Web site to Joomla - http://docs.joomla.org/How_to_Convert_an_existing_Web_site_to_a_Joomla!_Web_site | ||
| 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 | ||
|
|
||
| 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/How_do_you_report_a_bug%3F | ||
| * Get Involved: Joomla! its 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 | ||
| * 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 | ||
| * 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 | ||
|
|
||
| Copyright: | ||
| * Copyright (C) 2005 - 2012 Open Source Matters. All rights reserved. | ||
| * Credits: http://docs.joomla.org/Joomla_1.6_Credits | ||
| * Distributed under the GNU General Public License version 2 or later | ||
| * See Licenses details at http://docs.joomla.org/Joomla_Licenses | ||
| * Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved. | ||
| * Credits: http://docs.joomla.org/Joomla_3_Credits | ||
| * Distributed under the GNU General Public License version 2 or later | ||
| * See Licenses details at http://docs.joomla.org/Joomla_Licenses |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.