Skip to content

Commit

Permalink
Merge pull request #70 from crowdfavorite/1.4.0
Browse files Browse the repository at this point in the history
1.4.0
  • Loading branch information
al-esc authored May 14, 2020
2 parents 8bc73f9 + fd362c8 commit d2ca89a
Show file tree
Hide file tree
Showing 28 changed files with 14,368 additions and 101 deletions.
3 changes: 3 additions & 0 deletions CHANDELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## Version 1.4.0
- added EDD licensing/updating

## Version 1.3.0
- fixed warning when editing posts in the backend
- replace icon
Expand Down
19 changes: 19 additions & 0 deletions config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?php

/**
* Theme configuration file.
*
* @package capsule-server
*/

define('WP_CAPSULE_AUTHOR', 'Crowd Favorite');
define('WP_CAPSULE_THEME_NAME', 'Capsule');
define('WP_CAPSULE_THEME_SLUG', 'wp-capsule');
define('WP_CAPSULE_THEME_VERSION', '1.4.0');
define('WP_CAPSULE_DIR', get_template_directory());
define('WP_CAPSULE_URI', get_template_directory_uri());
define('WP_CAPSULE_UPDATER_ITEM_ID', '42723');
define('WP_CAPSULE_UPDATER_REMOTE_API_URL', 'https://shop.crowdfavorite.com/');
define('WP_CAPSULE_UPDATER_USE_BETA', false);
define('WP_CAPSULE_UPDATER_DIR', WP_CAPSULE_DIR . '/ui/updater');
define('WP_CAPSULE_UPDATER_URI', WP_CAPSULE_URI . '/ui/updater');
1 change: 1 addition & 0 deletions functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
* @package capsule
*/

require_once 'config.php';
require_once 'ui/functions.php';
require_once 'inc/class-capsule-client.php';

Expand Down
2 changes: 1 addition & 1 deletion style.css
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Theme URI: https://crowdfavorite.com/capsule/
Description: The developer's code journal.
Author: Crowd Favorite
Author URI: https://crowdfavorite.com/
Version: 1.3.0
Version: 1.4.0
License: GPL v2
License URI: https://opensource.org/licenses/GPL-2.0
*/
2 changes: 1 addition & 1 deletion ui/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,5 @@ node_modules/
build/
composer/
composer.lock
package-lock.json
/package-lock.json
!lib/ace/build/
3 changes: 3 additions & 0 deletions ui/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## Version 1.4.0
- added EDD licensing/updating

## Version 1.3.0
- fixed warning when editing posts in the backend
- replace icon
Expand Down
3 changes: 2 additions & 1 deletion ui/functions.php
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
remove_post_type_support('post', 'post-formats');

require_once dirname(__FILE__) . '/lib/wp-taxonomy-filter/taxonomy-filter.php';
require_once dirname(__FILE__) . '/updater/updater.php';

/**
* Test if this is a Capsule server.
Expand Down Expand Up @@ -867,7 +868,7 @@ function capsule_wp_editor_warning()
<div class="capsule-editor-warning">
<h3><?php esc_html_e('Whoa Cowboy!', 'capsule'); ?></h3>
<p>
<b><?php esc_html_e('<b>Capsule is designed for front-end editing only.', 'capsule'); ?></b>
<b><?php esc_html_e('Capsule is designed for front-end editing only.', 'capsule'); ?></b>
<br>
<?php
esc_html_e(
Expand Down
126 changes: 29 additions & 97 deletions ui/package-lock.json

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

2 changes: 1 addition & 1 deletion ui/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "capsule-ui",
"version": "1.3.0",
"version": "1.4.0",
"devDependencies": {},
"dependencies": {
"requirejs": "",
Expand Down
3 changes: 3 additions & 0 deletions ui/updater/.babelrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"presets": ["@babel/env", "@babel/preset-react"]
}
1 change: 1 addition & 0 deletions ui/updater/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
node_modules
1 change: 1 addition & 0 deletions ui/updater/assets/img/loading.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading

0 comments on commit d2ca89a

Please sign in to comment.