Skip to content

Commit

Permalink
Merge pull request #793 from Joomla-Bible-Study/development
Browse files Browse the repository at this point in the history
v9.2.0
  • Loading branch information
bcordis authored Feb 28, 2019
2 parents ffe4098 + 68f9343 commit 9de1197
Show file tree
Hide file tree
Showing 820 changed files with 4,601 additions and 123,332 deletions.
175 changes: 126 additions & 49 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,53 +1,130 @@
/tests/test.css
# System files #
.gitignore
.idea
.c9revisions
.DS_Store
.joomla-dev
.buildpath
.project
.settings
.vagrant

# Misc
composer.lock
*.log

# Test Related Files #
/tests/system/servers/configdef.php
/phpunit.xml
# Created by .ignore support plugin (hsz.mobi)
### Example user template template
### Example user template

# IntelliJ project files
.idea
out
gen
bin/
build/reports/pmd.html
com_biblestudy/admin/biblestudy.script.php

com_biblestudy/admin/biblestudy.xml

com_biblestudy/admin/views/test/tmpl/default.php

com_biblestudy/admin/views/test/view.html.php

com_biblestudy/admin/views/test/index.html

com_biblestudy/admin/views/test/tmpl/index.html

tests/unit/.joomla-cms/

/vendor
/composer.phar

tests/.joomla-cms

tests/test.php

com_biblestudy/admin/help/
com_biblestudy/media/css/site/
com_biblestudy/media/google/
docs/namespaces/
docs/packages/
*.html
/bin/
com_biblestudy/media/css/biblestudy.css.map
com_biblestudy/media/css/general.css.map
node_modules/yui-compressor/
package-lock.json
/node_modules/
composer.lock
composer.phar
joomla/.gitignore
joomla/.travis.yml
joomla/CONTRIBUTING.md
joomla/LICENSE.txt
joomla/README.md
joomla/README.txt
joomla/administrator/components/
joomla/administrator/help/
joomla/administrator/includes/
joomla/administrator/index.php
joomla/administrator/language/
joomla/administrator/manifests/
joomla/administrator/modules/
joomla/administrator/templates/
joomla/bin/
joomla/build.xml
joomla/build/
joomla/cli/
joomla/components/
joomla/htaccess.txt
joomla/images/
joomla/includes/
joomla/index.php
joomla/installation/
joomla/language/
joomla/layouts/
joomla/libraries/
joomla/media/
joomla/modules/
joomla/phpunit.xml.dist
joomla/plugins/
joomla/robots.txt.dist
joomla/templates/
joomla/tests/
joomla/travisci-phpunit.xml
joomla/web.config.txt
vendor/autoload.php
vendor/cilex/
vendor/composer/
vendor/container-interop/
vendor/doctrine/
vendor/erusev/
vendor/friendsofphp/
vendor/herrera-io/
vendor/ircmaxell/
vendor/jms/
vendor/justinrainbow/
vendor/kherge/
vendor/leafo/
vendor/monolog/
vendor/nikic/
vendor/paragonie/
vendor/pdepend/
Would skip repository vendor/pear/versioncontrol_git
Would skip repository vendor/pear/pear_exception
vendor/pear/cache_lite
vendor/pear/console_getopt
vendor/pear/pear-core-minimal
vendor/phing/
vendor/phpcollection/
vendor/phpdocumentor/
vendor/phpmailer/
vendor/phpmd/
vendor/phpoption/
vendor/phpspec/
vendor/phpunit/dbunit/.gitattributes
vendor/phpunit/dbunit/.gitignore
vendor/phpunit/dbunit/.travis.yml
vendor/phpunit/dbunit/ChangeLog.markdown
vendor/phpunit/dbunit/LICENSE
vendor/phpunit/dbunit/PHPUnit/
vendor/phpunit/dbunit/Samples/
vendor/phpunit/dbunit/Tests/
vendor/phpunit/dbunit/Vagrantfile
vendor/phpunit/dbunit/build.xml
vendor/phpunit/dbunit/build/
vendor/phpunit/dbunit/composer.json
vendor/phpunit/dbunit/dbunit.bat
vendor/phpunit/dbunit/dbunit.php
vendor/phpunit/dbunit/package.xml
vendor/phpunit/dbunit/phpunit.xml.dist
vendor/phpunit/php-code-coverage/
vendor/phpunit/php-file-iterator/
vendor/phpunit/php-text-template/
vendor/phpunit/php-timer/
vendor/phpunit/php-token-stream/
vendor/phpunit/phpunit-mock-objects/
vendor/phpunit/phpunit/
vendor/pimple/
vendor/psr/
vendor/sebastian/
vendor/seld/
vendor/simplepie/simplepie/.gitignore
vendor/simplepie/simplepie/.travis.yml
vendor/simplepie/simplepie/LICENSE.txt
vendor/simplepie/simplepie/README.markdown
vendor/simplepie/simplepie/autoloader.php
vendor/simplepie/simplepie/build/
vendor/simplepie/simplepie/compatibility_test/
vendor/simplepie/simplepie/composer.json
vendor/simplepie/simplepie/db.sql
vendor/simplepi
e/simplepie/demo/cli_test.php
vendor/simplepie/simplepie/demo/for_the_demo/
vendor/simplepie/simplepie/demo/index.php
vendor/simplepie/simplepie/demo/test.php
vendor/simplepie/simplepie/idn/
vendor/simplepie/simplepie/library/
vendor/simplepie/simplepie/phpunit.xml.dist
vendor/simplepie/simplepie/tests/
vendor/squizlabs/
vendor/symfony/
vendor/twig/
vendor/zendframework/
vendor/zetacomponents/
18 changes: 13 additions & 5 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,25 @@ language: php

env:
global:
- RUN_UNIT_TESTS="yes"
- INSTALL_MEMCACHE="yes"
- INSTALL_MEMCACHED="yes"
- INSTALL_REDIS="yes"
- RUN_PHPCS="yes"
- RUN_UNIT_TESTS="no"

matrix:
fast_finish: true
include:
- php: 5.4
# - php: 5.4
# - php: 5.5
# - php: 5.6
# - php: 7.0
- php: 7.2
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no"
- php: 7.3
env: INSTALL_APCU="yes" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no"
- php: nightly
env: INSTALL_APCU="no" INSTALL_MEMCACHE="no" INSTALL_MEMCACHED="no"
allow_failures:
- php: 7.3
- php: nightly

services:

Expand Down
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Proclaim
CWM Proclaim
==================

Status
Expand All @@ -14,15 +14,15 @@ Status
<tr>
<td align="center"><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=development"/></a></td>
<td align="center">Development</td>
<td align="center">9.1.8</td>
<td align="center">9.3.0</td>
<td align="center">TBD</td>
<td align="center">3.8+</td>
</tr>
<tr>
<td align="center"><a href="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study" target="_blank"><img src="https://travis-ci.org/Joomla-Bible-Study/Joomla-Bible-Study.png?branch=master"/></a></td>
<td align="center">Master</td>
<td align="center">9.1.7</td>
<td align="center">Nov 14, 2018</td>
<td align="center">9.2.0</td>
<td align="center">Feb 27, 2019</td>
<td align="center">3.8+</td>
</tr>
</table>
Expand Down
Binary file modified build/packages/component/com_proclaim.zip
Binary file not shown.
Binary file modified build/packages/modules/mod_proclaim.zip
Binary file not shown.
Binary file modified build/packages/modules/mod_proclaim_podcast.zip
Binary file not shown.
Binary file modified build/packages/pkg_proclaim.zip
Binary file not shown.
Binary file modified build/packages/plugins/plg_proclaim_backup.zip
Binary file not shown.
Binary file modified build/packages/plugins/plg_proclaim_finder.zip
Binary file not shown.
Binary file modified build/packages/plugins/plg_proclaim_podcast.zip
Binary file not shown.
Binary file modified build/packages/plugins/plg_proclaim_search.zip
Binary file not shown.
6 changes: 3 additions & 3 deletions build/pkg_proclaim_package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<author>CWM Team</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>https://www.christianwebministries.org</authorUrl>
<copyright>(C) 2007 - 2018 Proclaim All rights reserved.</copyright>
<version>9.1.7</version>
<creationDate>Nov 14, 2018</creationDate>
<copyright>(C) 2007 - 2019 Proclaim All rights reserved.</copyright>
<version>9.2.0</version>
<creationDate>Feb 27, 2019</creationDate>
<license>http://www.gnu.org/licenses/gpl.html</license>
<packager>CWM Team</packager>
<packagerurl>https://www.christianwebministries.org</packagerurl>
Expand Down
Loading

0 comments on commit 9de1197

Please sign in to comment.