-
Notifications
You must be signed in to change notification settings - Fork 29
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #83 from JBZoo-CCK/develop
Dev 4.12 to Master
- Loading branch information
Showing
328 changed files
with
24,176 additions
and
6,494 deletions.
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 |
---|---|---|
|
@@ -15,6 +15,9 @@ | |
.idea | ||
.DS_Store | ||
|
||
# phpunit | ||
.phpunit.result.cache | ||
|
||
# composer | ||
/vendor/* | ||
/composer.lock | ||
|
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,12 +1,12 @@ | ||
language: php | ||
|
||
php: | ||
- 7.3 | ||
- 7.4 | ||
|
||
matrix: | ||
fast_finish: true | ||
include: | ||
- php: 7.3 | ||
- php: 7.4 | ||
|
||
script: | ||
- make dev | ||
|
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 |
---|---|---|
|
@@ -19,7 +19,7 @@ | |
}, | ||
|
||
"require-dev" : { | ||
"jbzoo/phpunit" : "^2.3", | ||
"jbzoo/phpunit" : "^3.2", | ||
"symfony/var-dumper" : "^4.1.1" | ||
} | ||
} |
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 |
---|---|---|
|
@@ -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> | ||
|
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 |
---|---|---|
|
@@ -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> | ||
|
6 changes: 1 addition & 5 deletions
6
src/packages/jbuniversal/jbuniversal/assets/css/libs/fancybox.css
Large diffs are not rendered by default.
Oops, something went wrong.
Oops, something went wrong.