-
-
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 https://github.com/joomla/joomla-cms into gsoc-mootools-jquery-…
…usertemplates Conflicts: templates/beez3/javascript/hide.js
- Loading branch information
Showing
5,723 changed files
with
369,824 additions
and
173,306 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
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,26 @@ | ||
| Contributing to the Joomla! CMS | ||
| Contributing to the Joomla! CMS™ | ||
| =============== | ||
| All contributions are welcome to be submitted for review for inclusion in the Joomla! CMS, but before they will be accepted, we ask that you follow these simple steps: | ||
| You are welcome to submit a contribution for review and possible inclusion in the Joomla! CMS but, before it will be accepted, we ask that you follow these simple steps: | ||
|
|
||
| 1) Open an item on the Joomlacode tracker in the appropriate area. | ||
| * CMS Bug Reports: http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&tracker_id=8103 | ||
| * CMS Feature Requests: http://joomlacode.org/gf/project/joomla/tracker/?action=TrackerItemBrowse&tracker_id=8549 | ||
| 1) Open an issue on our [Issue Tracker](http://issues.joomla.org/) or here on GitHub. If you can, please provide a fix and create a pull request (PR) instead; this will automatically create an issue for you. | ||
|
|
||
| 2) After submitting the item to the Joomlacode tracker, add a link to the Joomlacode tracker item and the GitHub issue or pull request. | ||
| 2) Follow the [Joomla! Coding Standards](http://joomla.github.io/coding-standards). | ||
|
|
||
| 3) When filing an issue or opening a PR, please include a clear title and description. The title should be a short summary of an issue and, if possible, should include a reference to an open issue. For example, `Invalid Query in com_admin (Ref #1234)` would be sufficient. All issues and PRs should include a description with as much detail as possible. | ||
| If it is a PR, include what the issue is, what the PR is addressing, testing instructions and environmental information (PHP version, database driver and version, and other data you can retrieve from your site's system information view) in case the issue is specific to certain environments. If additional information is needed, please be prepared to provide it as our community members review your submission. | ||
|
|
||
| 4) Report security issues to the Joomla! Security Strike Team (JSST) at security@joomla.org or use the [JSST contact form](http://developer.joomla.org/contact-security-team.html). Please do not use the public tracker for security issues. | ||
|
|
||
| Please be patient as not all items will be tested immediately (remember, all bug testing for the Joomla! CMS is done by volunteers) and be receptive to feedback about your code. | ||
|
|
||
| #### Branches | ||
| PRs should usually be made to the `staging` branch as this contains the most recent version of the code. | ||
| There are other branches available which serve specific purposes. | ||
|
|
||
| | Branch | Purpose | | ||
| | ------ | ------- | | ||
| | staging | Current codebase. | | ||
| | master | Each commit made to staging gets tested if it passes unit tests and codestyle rules. It is then merged into master. This is done automatically. | | ||
| | 2.5.x | Branch for the Joomla 2.5.x series. Currently in maintenance mode with EOL end of 2014. No new features are accepted here. | | ||
| | 3.2.x | Branch for the Joomla 3.2.x series. Currently in security mode with EOL Oct 2014. Only security issues are fixed. | | ||
| | 3.4-dev | Branch for the next minor Joomla version. New backward compatible features go into this branch. Commits to staging will be applied to this branch as well. | |
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,86 +1,92 @@ | ||
| Joomla! CMS [](https://travis-ci.org/joomla/joomla-cms) | ||
| Joomla! CMS™ [](https://github.com/igrigorik/ga-beacon) | ||
| ==================== | ||
|
|
||
| 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.0.x | ||
| * Joomla! [Official site](http://www.joomla.org) | ||
| * Joomla! 3.0 [version history](http://docs.joomla.org/Joomla_3.0_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! 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). | ||
| * 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 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) | ||
| * 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). | ||
| * 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 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) | ||
| * Joomla is [the right solution for most content web projects](http://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). | ||
|
|
||
| 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) | ||
| * 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). | ||
| * You can also add languages directly to your website via your Joomla! administration panel. | ||
|
|
||
| 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) | ||
| * 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). | ||
|
|
||
| What are the limits of Joomla? | ||
| What are the benefits 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) | ||
| * The functionality of a Joomla website can be extended by installing extensions that you can create (or download) to suit your needs. | ||
| * There are many ready-made extensions that you can download and install. | ||
| * Check out 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. | ||
| * 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). | ||
|
|
||
| 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. | ||
| * 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/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) | ||
| * 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): | ||
| * [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.0.x ? | ||
| Do you already have a Joomla site that isn't built with Joomla 3.x? | ||
| --------------------- | ||
| * What's [new in Joomla 3.0.x](http://www.joomla.org/3) | ||
| * What are the [main differences from 2.5 to 3.0](http://docs.joomla.org/Differences_from_Joomla_2.5_to_Joomla_3.0)? | ||
| * How to [migrate from 2.5.x to 3.0.x](http://docs.joomla.org/Migrating_from_Joomla_2.5_to_Joomla_3.0)? | ||
| * 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.0.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) | ||
| * 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). | ||
|
|
||
| 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) | ||
| * 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). | ||
|
|
||
| Copyright: | ||
| Copyright | ||
| --------------------- | ||
| * Copyright (C) 2005 - 2013 Open Source Matters. All rights reserved. | ||
| * [Credits](http://docs.joomla.org/Joomla_3.0_Credits) | ||
| * Copyright (C) 2005 - 2014 Open Source Matters. All rights reserved. | ||
| * [Credits](http://docs.joomla.org/Joomla!_Credits_and_Thanks) | ||
| * Distributed under the GNU General Public License version 2 or later | ||
| * See [Licenses details](http://docs.joomla.org/Joomla_Licenses) | ||
| * See [License 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
Oops, something went wrong.