Skip to content

Commit

Permalink
Merge pull request #83 from JBZoo-CCK/develop
Browse files Browse the repository at this point in the history
Dev 4.12 to Master
  • Loading branch information
CB9TOIIIA authored Apr 22, 2021
2 parents b396db9 + 2a30f99 commit 24bced4
Show file tree
Hide file tree
Showing 328 changed files with 24,176 additions and 6,494 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
.idea
.DS_Store

# phpunit
.phpunit.result.cache

# composer
/vendor/*
/composer.lock
Expand Down
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
language: php

php:
- 7.3
- 7.4

matrix:
fast_finish: true
include:
- php: 7.3
- php: 7.4

script:
- make dev
Expand Down
2 changes: 1 addition & 1 deletion CODE_OF_CONDUCT.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ Project maintainers who do not follow or enforce the Code of Conduct in good fai
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, available at [http://contributor-covenant.org/version/1/4][version]

[homepage]: http://contributor-covenant.org
[version]: http://contributor-covenant.org/version/1/4/
[version]: http://contributor-covenant.org/version/1/4/
18 changes: 9 additions & 9 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# JBZoo CCK - Community Edition

[![Build Status](https://travis-ci.org/JBZoo-CCK/JBZoo.svg)](https://travis-ci.org/JBZoo-CCK/JBZoo) [![Latest Stable Version](https://poser.pugx.org/jbzoo-cck/jbzoo/v/stable)](https://github.com/JBZoo-CCK/JBZoo/releases) [![HitCount](http://hits.dwyl.com/jbzoo-cck/jbzoo.svg)](http://hits.dwyl.com/jbzoo-cck/jbzoo)

* All Features are included
Expand All @@ -13,10 +13,10 @@


## System requirements
* YooTheme Zoo Component [![Zoo](https://img.shields.io/badge/Zoo-3.3.31-blue.svg?style=plastic)](https://www.yootheme.com/zoo)
* Joomla! CMS [![Joomla](https://img.shields.io/badge/Joomla!-3.8.10-blue.svg?style=plastic)](https://downloads.joomla.org/)
* ![PHP 7.2.0+](https://img.shields.io/badge/PHP-7.2.0+-blue.svg?style=plastic) is recommended with modules mbstring, xml, json, opcache, mysqli.
* Works fine with PHP v5.5, v5.6, v7.1
* YooTheme Zoo Component [![Zoo](https://img.shields.io/badge/Zoo-4.0.8-blue.svg?style=plastic)](https://www.yootheme.com/zoo)
* Joomla! CMS [![Joomla](https://img.shields.io/badge/Joomla!-3.9.25-blue.svg?style=plastic)](https://downloads.joomla.org/)
* ![PHP 7.2.0+](https://img.shields.io/badge/PHP-7.4.0+-blue.svg?style=plastic) is recommended with modules mbstring, xml, json, opcache, mysqli.
* Works fine with PHP v5.5, v5.6, v7.1, v7.2, v7.3, v7.4
* Joomla! CMS 4.0 (on your own risk)

## FAQ
Expand All @@ -33,14 +33,14 @@ Run in the root directory of project `make prod build` and see `./build/` folder
### 4. I have found some bugs. What should I do?
Just create [new issue](https://github.com/JBZoo-CCK/JBZoo/issues/new/choose) and we will try to fix it.

### 5. How to use jbzoo_update.zip?
### 5. How to use jbzoo_update.zip?
- Backup your website (database, all files)
- Install file "jbzoo_update.zip" as Joomla Extention (via control Panel).
- That's all.
- If you have any bugs - [just create new issue](https://github.com/JBZoo-CCK/JBZoo/issues/new/choose)

### 6. Where I can download the ready-to-use JBZoo?
See files `jbzoo_clean_install.zip` and `jbzoo_update.zip` in [releases](https://github.com/JBZoo-CCK/JBZoo/releases)
See files `jbzoo_clean_install.zip` and `jbzoo_update.zip` in [releases](https://github.com/JBZoo-CCK/JBZoo/releases)


## Useful links
Expand All @@ -62,9 +62,9 @@ See files `jbzoo_clean_install.zip` and `jbzoo_update.zip` in [releases](https:/
* [YT Zoo Performance Hacks](https://github.com/JBZoo-CCK/Zoo-Hacks)


## Contributors
## Contributors
* [Denis Smetannikov](https://github.com/SmetDenis) (SmetDenis) `-=! Author, Founder and General Maintainer !=-`
* [Dmitriy](https://github.com/fiction13) (fiction13)
* [Dmitriy Vasyukov](https://github.com/fiction13) (fiction13)
* [Eugene Kopylov](https://github.com/CB9TOIIIA) (CB9TOIIIA)
* [Sergey Kalistratov](https://github.com/Cheren) (Cheren)
* [Alexandr Oganov](https://github.com/Tapakan) (Tapakan)
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
},

"require-dev" : {
"jbzoo/phpunit" : "^2.3",
"jbzoo/phpunit" : "^3.2",
"symfony/var-dumper" : "^4.1.1"
}
}
4 changes: 2 additions & 2 deletions src/packages/jbuniversal/file_jbuniversal.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<extension type="file" version="2.5" method="upgrade">
<name>JBZoo App</name>
<author>JBZoo.com</author>
<creationDate>2018 June</creationDate>
<creationDate>2020 August</creationDate>
<copyright>Copyright (C) JBZoo.com, All rights reserved.</copyright>
<authorEmail>[email protected]</authorEmail>
<authorUrl>http://jbzoo.com</authorUrl>
<version>4.10.3</version>
<version>4.12.0</version>
<license>GPL-2.0</license>
<description>JBZoo App is universal Joomla CCK, application for YooTheme Zoo component</description>
<fileset>
Expand Down
2 changes: 1 addition & 1 deletion src/packages/jbuniversal/jbuniversal/application.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
*/
final class JBUniversalApplication extends Application
{
const JBZOO_VERSION = '4.0.2';
const JBZOO_VERSION = '4.12.0';

/**
* @var bool
Expand Down
4 changes: 2 additions & 2 deletions src/packages/jbuniversal/jbuniversal/application.xml
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@
<application>
<name>JBZoo App</name>
<group>jbuniversal</group>
<version>4.10.3</version>
<creationDate>2018 June</creationDate>
<version>4.12.0</version>
<creationDate>2020 August</creationDate>
<author>JBZoo.com</author>
<authorEmail>[email protected]</authorEmail>
<authorUrl>http://jbzoo.com</authorUrl>
Expand Down

Large diffs are not rendered by default.

Loading

0 comments on commit 24bced4

Please sign in to comment.