Skip to content

Commit

Permalink
Merge branch 'release/160223'
Browse files Browse the repository at this point in the history
  • Loading branch information
raamdev committed Feb 22, 2016
2 parents 3cab1a6 + d1bdade commit 4b82991
Show file tree
Hide file tree
Showing 186 changed files with 1,191 additions and 3,702 deletions.
22 changes: 11 additions & 11 deletions .build.props
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
project_title = ZenCache Pro
project_title = Comet Cache Pro
project_owner = websharks
project_slug = zencache-pro
project_namespace = WebSharks\\ZenCache\\Pro
project_sub_namespace = ZenCachePro
project_slug = comet-cache-pro
project_namespace = WebSharks\\CometCache\\Pro
project_sub_namespace = CometCachePro
project_other_phar_fileset_exclusions = README.md
project_other_zip_tgz_fileset_exclusions = README.md

project_lite_title = ZenCache
project_lite_slug = zencache
project_lite_namespace = WebSharks\\ZenCache
project_lite_sub_namespace = ZenCache
project_lite_other_phar_fileset_exclusions = README.md, **/AutoCache.php, **/AutoCacheUtils.php, **/CdnFilters.php, **/CdnUtils.php, **/WcpCdnUtils.php, **/cdn-filters.txt, **/HtmlCUtils.php, **/WcpHtmlCUtils.php, **/StatsUtils.php, **/WcpEvalUtils.php, **/WcpS2cleanUtils.php, **/WcpTransientUtils.php, **/WcpUrlUtils.php, **/WcpUserUtils.php, **/MenuPageProUpdater.php, **/MenuPageStats.php, **/DirStats.php, **/admin-bar*.js, **/AdminBarUtils.php, **/options-pro.png, **/pro-updater.png, **/stats*.png, **/zencache-pro.pot
project_lite_other_zip_tgz_fileset_exclusions = README.md, **/AutoCache.php, **/AutoCacheUtils.php, **/CdnFilters.php, **/CdnUtils.php, **/WcpCdnUtils.php, **/cdn-filters.txt, **/HtmlCUtils.php, **/WcpHtmlCUtils.php, **/StatsUtils.php, **/WcpEvalUtils.php, **/WcpS2cleanUtils.php, **/WcpTransientUtils.php, **/WcpUrlUtils.php, **/WcpUserUtils.php, **/MenuPageProUpdater.php, **/MenuPageStats.php, **/DirStats.php, **/admin-bar*.js, **/AdminBarUtils.php, **/options-pro.png, **/pro-updater.png, **/stats*.png, **/zencache-pro.pot
project_lite_title = Comet Cache
project_lite_slug = comet-cache
project_lite_namespace = WebSharks\\CometCache
project_lite_sub_namespace = CometCache
project_lite_other_phar_fileset_exclusions = README.md, **/AutoCache.php, **/AutoCacheUtils.php, **/CdnFilters.php, **/CdnUtils.php, **/WcpCdnUtils.php, **/cdn-filters.txt, **/HtmlCUtils.php, **/WcpHtmlCUtils.php, **/StatsUtils.php, **/WcpEvalUtils.php, **/WcpS2cleanUtils.php, **/WcpTransientUtils.php, **/WcpUrlUtils.php, **/WcpUserUtils.php, **/MenuPageProUpdater.php, **/MenuPageStats.php, **/DirStats.php, **/admin-bar*.js, **/AdminBarUtils.php, **/options-pro.png, **/pro-updater.png, **/stats*.png, **/comet-cache-pro.pot
project_lite_other_zip_tgz_fileset_exclusions = README.md, **/AutoCache.php, **/AutoCacheUtils.php, **/CdnFilters.php, **/CdnUtils.php, **/WcpCdnUtils.php, **/cdn-filters.txt, **/HtmlCUtils.php, **/WcpHtmlCUtils.php, **/StatsUtils.php, **/WcpEvalUtils.php, **/WcpS2cleanUtils.php, **/WcpTransientUtils.php, **/WcpUrlUtils.php, **/WcpUserUtils.php, **/MenuPageProUpdater.php, **/MenuPageStats.php, **/DirStats.php, **/admin-bar*.js, **/AdminBarUtils.php, **/options-pro.png, **/pro-updater.png, **/stats*.png, **/comet-cache-pro.pot
project_lite_text_domain_regex_replacement_pattern = \$this\-\>text_domain|SLUG_TD
project_lite_alter_namespace_in_other_files_pattern = src/includes/templates/advanced-cache.txt

project_version = %y%m%d
project_php_required_version = 5.3.2
project_php_required_version = 5.4
project_php_tested_up_to_version = ${php.version}
project_wp_required_version = 4.1
project_wp_tested_up_to_version = 4.5-alpha
333 changes: 218 additions & 115 deletions CHANGELOG.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion LICENSE.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ This Software is Comprised of Two Parts

1. All PHP code in this WordPress plugin has been released under a GPL license—just like WordPress itself. You can redistribute and/or modify it under the terms of the GNU General Public License, as published by the Free Software Foundation. A copy of the GPL license is included below.

2. With the exception of any Additional Acknowledgments (as detailed below), all other parts of this software; including (but not limited to) application-specific CSS/JavaScript/images, the overall design, and all support-related services and documentation, are licensed commercially and should NOT be redistributed. See: <http://zencache.com/>
2. With the exception of any Additional Acknowledgments (as detailed below), all other parts of this software; including (but not limited to) application-specific CSS/JavaScript/images, the overall design, and all support-related services and documentation, are licensed commercially and should NOT be redistributed. See: <http://cometcache.com/>

Unless you have our prior written consent, you must NOT directly or indirectly license, sub-license, sell, resell, or provide for free; part (2) of this software; or make an offer to do any of these things. All of these things are strictly prohibited with part (2) of this software.

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
## ZenCache Pro
## Comet Cache Pro

Caching plugin for WordPress®.

ZenCache™ Pro is a commercial plugin available at [http://zencache.com](http://zencache.com). The plugin is hosted here on a public Github repository in order to better faciliate community contributions from developers and users alike. If you have a suggestion, a bug report, or a patch for an issue, feel free to submit it here. We do ask, however, that if you are using the plugin on a live site that you please purchase a valid license from the [website](http://zencache.com). We cannot provide support to anyone that does not hold a valid license key.
Comet Cache™ Pro is a commercial plugin available at [http://cometcache.com](http://cometcache.com). The plugin is hosted here on a public Github repository in order to better faciliate community contributions from developers and users alike. If you have a suggestion, a bug report, or a patch for an issue, feel free to submit it here. We do ask, however, that if you are using the plugin on a live site that you please purchase a valid license from the [website](http://cometcache.com). We cannot provide support to anyone that does not hold a valid license key.
4 changes: 2 additions & 2 deletions assets/assets-lite/banner-772x250.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/icon-128x128.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/icon-256x256.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-10.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-11.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-12.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-13.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-14.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/assets-lite/screenshot-15.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions assets/assets-lite/screenshot-16.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-5.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-6.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-7.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-8.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/assets-lite/screenshot-9.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions assets/banner-772x250.sketch
Git LFS file not shown
3 changes: 0 additions & 3 deletions assets/font-icon-logo.sketch

This file was deleted.

3 changes: 0 additions & 3 deletions assets/font-icon-logo.svg

This file was deleted.

3 changes: 0 additions & 3 deletions assets/font-icon.sketch

This file was deleted.

3 changes: 0 additions & 3 deletions assets/font-icon.svg

This file was deleted.

3 changes: 0 additions & 3 deletions assets/icon-color.sketch

This file was deleted.

3 changes: 0 additions & 3 deletions assets/icon-grey.png

This file was deleted.

3 changes: 0 additions & 3 deletions assets/icon-grey.sketch

This file was deleted.

3 changes: 0 additions & 3 deletions assets/icon-with-logo.png

This file was deleted.

3 changes: 0 additions & 3 deletions assets/icon-with-logo.sketch

This file was deleted.

3 changes: 0 additions & 3 deletions assets/icon.png

This file was deleted.

3 changes: 0 additions & 3 deletions assets/logo.sketch

This file was deleted.

4 changes: 2 additions & 2 deletions assets/options-pro.sketch
Git LFS file not shown
4 changes: 2 additions & 2 deletions assets/options.sketch
Git LFS file not shown
2 changes: 1 addition & 1 deletion assets/source-code-ss.sketch
Git LFS file not shown
4 changes: 2 additions & 2 deletions assets/stats.sketch
Git LFS file not shown
4 changes: 2 additions & 2 deletions assets/updater-pro.sketch
Git LFS file not shown
4 changes: 2 additions & 2 deletions assets/updater.sketch
Git LFS file not shown
10 changes: 5 additions & 5 deletions zencache-pro.php → comet-cache-pro.php
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
<?php
/*
Version: 160222
Text Domain: zencache
Plugin Name: ZenCache Pro
Version: 160223
Text Domain: comet-cache
Plugin Name: Comet Cache Pro
Network: true
Author: WebSharks, Inc.
Author URI: http://websharks-inc.com/
Plugin URI: http://zencache.com/
Description: ZenCache is an advanced WordPress caching plugin inspired by simplicity.
Plugin URI: http://cometcache.com/
Description: Comet Cache is an advanced WordPress caching plugin inspired by simplicity.
*/
if (!defined('WPINC')) {
exit('Do NOT access this file directly: '.basename(__FILE__));
Expand Down
14 changes: 7 additions & 7 deletions composer.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "websharks/zencache-pro",
"homepage": "https://github.com/websharks/zencache-pro",
"name": "websharks/comet-cache-pro",
"homepage": "https://github.com/websharks/comet-cache-pro",
"description": "A popular caching plugin for WordPress.",
"keywords": [
"websharks",
"zencache",
"comet cache",
"wordpress",
"caching",
"cache"
Expand All @@ -25,11 +25,11 @@
"role": "developer"
}],
"support": {
"source": "https://github.com/websharks/zencache-pro",
"issues": "https://github.com/websharks/zencache/issues"
"source": "https://github.com/websharks/comet-cache-pro",
"issues": "https://github.com/websharks/comet-cache/issues"
},
"require": {
"php": ">=5.3",
"php": ">=5.4",
"websharks/wp-php-rv": "150511",
"websharks/html-compressor": "160118",
"websharks/sharkicons": "160221"
Expand All @@ -43,7 +43,7 @@

"autoload": {
"psr-4": {
"WebSharks\\ZenCache\\Pro\\": "src/includes/classes/"
"WebSharks\\CometCache\\Pro\\": "src/includes/classes/"
}
},
"config": {
Expand Down
6 changes: 3 additions & 3 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 4b82991

Please sign in to comment.