Skip to content

Commit

Permalink
Merge branch 'hotfix/1.0.9'
Browse files Browse the repository at this point in the history
  • Loading branch information
danielmilner committed Aug 20, 2018
2 parents ad56f6c + e661824 commit 171adb4
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 9 deletions.
Binary file added assets/images/rock-shop-plugin.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 ft-rockpress.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Plugin Name: RockPress
* Plugin URI: http://rockpresswp.com/
* Description: Display information from Rock RMS on your WordPress site.
* Version: 1.0.8
* Version: 1.0.9
* Author: RockPress <support@rockpress.com>
* Author URI: https://rockpress.com/
* Text Domain: ft-rockpress
Expand Down Expand Up @@ -66,7 +66,7 @@ class RockPress {
* @var string
* @since 1.0.0
*/
public $version = '1.0.8';
public $version = '1.0.9';

/**
* Main RockPress Instance
Expand Down
10 changes: 5 additions & 5 deletions includes/admin/admin-pages.php
Original file line number Diff line number Diff line change
Expand Up @@ -158,20 +158,20 @@ private function getting_started_content() {
</div>
<div class="feature-section two-col">
<div class="col">
<h3><?php esc_html_e( '1. Create a REST Key', 'ft-rockpress' ); ?></h3>
<p><?php esc_html_e( 'A REST Key is created by navigating to the Security > REST Keys page of your Rock site. Click on the plus icon to create a new key.', 'ft-rockpress' ); ?></p>
<p><?php echo sprintf( '%s<strong>%s</strong>%s', esc_html__( 'You should name your key, ', 'ft-rockpress' ), esc_html__( 'RockPress', 'ft-rockpress' ), esc_html__( ', so that it is easy to identify in the future. Click on the Generate Key button, then click Save.', 'ft-rockpress' ) ); ?></p>
<h3><?php esc_html_e( '1. Install the RockPress plugin from the Rock Shop', 'ft-rockpress' ); ?></h3>
<p><?php esc_html_e( 'Log in to Rock, then navigate to Admin Tools > Rock Shop. Select the Web category and look for RockPress and install the plugin. After the plugin has been installed, navigate to Admin Tools > Installed Plugins > RockPress.', 'ft-rockpress' ); ?></p>
<p><?php esc_html_e( 'Click on the Generate API Key button to generate an API Key and User for RockPress.', 'ft-rockpress' ); ?></p>
</div>
<div class="col">
<img src="<?php echo esc_attr( ROCKPRESS_PLUGIN_URL ) . '/assets/images/rock-rest-key.png'; ?>" />
<img src="<?php echo esc_attr( ROCKPRESS_PLUGIN_URL ) . '/assets/images/rock-shop-plugin.png'; ?>" />
</div>
</div>
<hr />
<div class="feature-section two-col">
<div class="col">
<h3><?php esc_html_e( '2. Assign the REST Key to each REST Controller', 'ft-rockpress' ); ?></h3>
<?php echo sprintf( '<p>%s <strong>%s</strong> %s <em>%s</em></p>', esc_html__( 'For this step, you will need get a list of each REST Controller that RockPress needs access to. You can get this list by logging in to your WordPress Admin, and navigating to RockPress > Settings. Click on the', 'ft-rockpress' ), esc_html__( 'REST Controllers', 'ft-rockpress' ), esc_html__( 'button to view a list of the controllers that have been registered with RockPress.', 'ft-rockpress' ), esc_html__( 'This list will change as add-ons and updates are installed/removed. So, you may need to revisit this after installing an update or an add-on.', 'ft-rockpress' ) ); ?>
<?php echo sprintf( '<p>%s <strong>%s</strong> %s <strong>%s</strong> %s</p>', esc_html__( 'Now that you have the list of REST Controllers, go to your Rock RMS site and navigate to Security > REST Controllers. Find each Controller Name from your list and click on the Permissions (lock) button to the right of the name. Click on the', 'ft-rockpress' ), esc_html__( 'Add User', 'ft-rockpress' ), esc_html__( 'button and search for the', 'ft-rockpress' ), esc_html__( 'RockPress', 'ft-rockpress' ), esc_html__( 'REST Key that we created in the previous step. Add the user with at least View permissions for each Controller. Repeat this step for each REST Controller.', 'ft-rockpress' ) ); ?>
<?php echo sprintf( '<p>%s <strong>%s</strong> %s <strong>%s</strong> %s</p>', esc_html__( 'Now that you have the list of REST Controllers, go to your Rock RMS site and navigate to Security > REST Controllers. Find each Controller Name from your list and click on the Permissions (lock) button to the right of the name. Click on the', 'ft-rockpress' ), esc_html__( 'Add User', 'ft-rockpress' ), esc_html__( 'button and search for the', 'ft-rockpress' ), esc_html__( 'RockPress', 'ft-rockpress' ), esc_html__( 'API Key/User that we created in the previous step. Add the user with at least View permissions for each Controller. Repeat this step for each REST Controller.', 'ft-rockpress' ) ); ?>
</div>
<div class="col">
<img src="<?php echo esc_attr( ROCKPRESS_PLUGIN_URL ) . '/assets/images/rock-permissions.png'; ?>" />
Expand Down
7 changes: 5 additions & 2 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
Contributors: firetree, danielmilner
Tags: church, rockrms, chms, rock rms
Requires at least: 4.3
Tested up to: 4.8.2
Tested up to: 4.9
Requires PHP: 5.3
Stable tag: 1.0.8
Stable tag: 1.0.9
License: GPLv2 or later
License URI: http://ww.gnu.org/licenses/gpl-2.0.html

Expand Down Expand Up @@ -41,6 +41,9 @@ Extend the capabilities of RockPress with these add-ons:

== Changelog ==

= 1.0.9 =
* Updated the Getting Started documentation to reference the new plugin available in the Rock Shop.

= 1.0.8 =
* Improved the data import functions.

Expand Down

0 comments on commit 171adb4

Please sign in to comment.