Skip to content

Commit

Permalink
a
Browse files Browse the repository at this point in the history
  • Loading branch information
zero-24 committed Aug 13, 2017
2 parents a9f8c35 + 81dc289 commit 18400ab
Show file tree
Hide file tree
Showing 1,037 changed files with 53,654 additions and 16,594 deletions.
2 changes: 1 addition & 1 deletion .appveyor.yml
Expand Up @@ -94,7 +94,7 @@ install:
- IF %PHP%==1 echo @php %%~dp0composer.phar %%* > composer.bat
- appveyor-retry appveyor DownloadFile https://getcomposer.org/composer.phar
- cd C:\projects\joomla-cms
- appveyor-retry composer install --no-progress --profile
- appveyor-retry composer install --ignore-platform-reqs --no-progress --profile

before_test:
# Database setup for MySQL via PowerShell tools
Expand Down
16 changes: 16 additions & 0 deletions .gitignore
Expand Up @@ -12,6 +12,8 @@
/administrator/logs
/cache
/installation/cache
/installation/sessions
/libraries/autoload_psr4.php
/tmp
/configuration.php
/.htaccess
Expand All @@ -21,6 +23,9 @@
# Test Related Files #
/phpunit.xml

# Stubs file holding mapped classes
/stubs.php

# Node modules #
node_modules/

Expand Down Expand Up @@ -71,12 +76,14 @@ Desktop.ini
/libraries/vendor/ircmaxell/password-compat/phpunit.xml.dist
/libraries/vendor/ircmaxell/password-compat/README.md
/libraries/vendor/ircmaxell/password-compat/version-test.php
/libraries/vendor/joomla/*/.gitattributes
/libraries/vendor/joomla/*/.github
/libraries/vendor/joomla/*/.gitignore
/libraries/vendor/joomla/*/.gitmodules
/libraries/vendor/joomla/*/docs
/libraries/vendor/joomla/*/Tests
/libraries/vendor/joomla/*/vendor
/libraries/vendor/joomla/*/.scrutinizer.yml
/libraries/vendor/joomla/*/.travis.yml
/libraries/vendor/joomla/*/CONTRIBUTING.md
/libraries/vendor/joomla/*/composer.json
Expand Down Expand Up @@ -113,6 +120,12 @@ Desktop.ini
/libraries/vendor/paragonie/random_compat/psalm-autoload.php
/libraries/vendor/paragonie/random_compat/psalm.xml
/libraries/vendor/paragonie/random_compat/tests
/libraries/vendor/paragonie/sodium_compat/.gitignore
/libraries/vendor/paragonie/sodium_compat/composer.json
/libraries/vendor/paragonie/sodium_compat/composer.lock
/libraries/vendor/paragonie/sodium_compat/phpunit.xml.dist
/libraries/vendor/paragonie/sodium_compat/README.md
/libraries/vendor/paragonie/sodium_compat/src/Core/Curve25519/README.md
/libraries/vendor/phpmailer/phpmailer/docs
/libraries/vendor/phpmailer/phpmailer/examples
/libraries/vendor/phpmailer/phpmailer/language
Expand All @@ -122,8 +135,11 @@ Desktop.ini
/libraries/vendor/phpmailer/phpmailer/.travis.yml
/libraries/vendor/phpmailer/phpmailer/changelog.md
/libraries/vendor/phpmailer/phpmailer/composer.json
/libraries/vendor/phpmailer/phpmailer/ISSUE_TEMPLATE.md
/libraries/vendor/phpmailer/phpmailer/phpdoc.dist.xml
/libraries/vendor/phpmailer/phpmailer/README.md
/libraries/vendor/phpmailer/phpmailer/travis.phpunit.xml.dist
/libraries/vendor/phpmailer/phpmailer/UPGRADING.md
/libraries/vendor/phpmailer/phpmailer/extras/README.md
/libraries/vendor/phpmailer/phpmailer/get_oauth_token.php
/libraries/vendor/psr/log/Psr/Log/Test
Expand Down
3 changes: 3 additions & 0 deletions .travis.yml
Expand Up @@ -29,9 +29,12 @@ matrix:
env: INSTALL_APCU="yes"
- php: 5.6
env: INSTALL_APCU="yes"
- php: 7.2
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
- php: nightly
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
allow_failures:
- php: 7.2
- php: nightly

services:
Expand Down
4 changes: 2 additions & 2 deletions README.md
Expand Up @@ -15,8 +15,8 @@ What is this?
---------------------
* This is a Joomla! 3.x installation/upgrade package.
* Joomla's [Official website](https://www.joomla.org).
* Joomla! 3.7 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.7_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/master).
* Joomla! 3.8 [version history](https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history).
* Detailed changes are in the [changelog](https://github.com/joomla/joomla-cms/commits/staging).

What is Joomla?
---------------------
Expand Down
4 changes: 2 additions & 2 deletions README.txt
@@ -1,8 +1,8 @@
1- What is this?
* This is a Joomla! installation/upgrade package to version 3.x
* Joomla! Official site: https://www.joomla.org
* Joomla! 3.7 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.7_version_history
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/master
* Joomla! 3.8 version history - https://docs.joomla.org/Special:MyLanguage/Joomla_3.8_version_history
* Detailed changes in the Changelog: https://github.com/joomla/joomla-cms/commits/staging

2- What is Joomla?
* Joomla! is a Content Management System (CMS) which enables you to build Web sites and powerful online applications.
Expand Down

0 comments on commit 18400ab

Please sign in to comment.