Skip to content

Commit f5d571f

Browse files
committed
Prep for 2.1.0 release
1 parent 6293c8e commit f5d571f

File tree

2 files changed

+29
-30
lines changed

2 files changed

+29
-30
lines changed

README.md

Lines changed: 28 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
This is a simple plugin that may be used to load the latest **_release_** version of [Carbon Fields](http://carbonfields.net/).
44

5-
This plugin is **_not_** supported by [htmlBurger](https://htmlburger.com) and team, the creators and maintaners of Carbon Fields. The author of this loader plugin has no affiliation with htmlBurder and the Carbon Fields team.
5+
This plugin is **_not_** supported or maintained by [htmlBurger](https://htmlburger.com) and team, the creators and maintaners of [Carbon Fields](https://carbonfields.net/). The author of this loader plugin has no affiliation with htmlBurder or the Carbon Fields team.
66

77
* [Official Carbon Fields Framework Documentation](https://carbonfields.net/docs/)
88
* [Usage Examples for this Loader Plugin](https://github.com/dmhendricks/carbon-fields-loader/wiki/)
@@ -12,7 +12,7 @@ This plugin is **_not_** supported by [htmlBurger](https://htmlburger.com) and t
1212
* WordPress 4.0 or higher
1313
* PHP 5.3 or higher (using the `CFL_OPTIONS` constant requires PHP 7 or higher)
1414

15-
**NB!** This plugin will deactivate itself if a legacy version Carbon Fields is loaded (either via plugin or as a dependency of a plugin/theme). Legacy versions and current releases of Carbon Fields are not compatible and may not be concurrently loaded.
15+
**Note:** This plugin will deactivate itself if a legacy version Carbon Fields is loaded (either via plugin or as a dependency of a plugin/theme). Legacy versions and current releases of Carbon Fields are not compatible and may not be concurrently loaded.
1616

1717
## Options
1818

@@ -21,10 +21,10 @@ Because we don't like "admins" monkeying around and disabling (or touching) thin
2121
### PHP 5.3 and Higher
2222

2323
```
24-
define( 'CFL_MIN_VERSION', '2.0.3' );
24+
define( 'CFL_MIN_VERSION', '2.1.0' );
2525
```
2626

27-
Sets the minimum supported loaded version of Carbon Fields to >=2.0.3.
27+
Sets the minimum supported loaded version of Carbon Fields to >=2.1.0.
2828

2929
```
3030
define( 'CFL_DISABLE_UPDATE_NOTIFICATION', true );
@@ -81,25 +81,25 @@ define( 'CFL_OPTIONS', array( ... ) );
8181
#### Examples
8282

8383
```
84-
define( 'CFL_OPTIONS' , ['min_version' => '2.0.0', 'hide_plugins' => true ] );
84+
define( 'CFL_OPTIONS' , ['min_version' => '2.1.0', 'hide_plugins' => true ] );
8585
```
8686

87-
* Carbon Fields 2.0.0 or higher must be loaded, else notice is displayed.
87+
* Carbon Fields 2.1.0 or higher must be loaded, else notice is displayed.
8888
* This plugin *and* [GitHub Updater](https://github.com/afragen/github-updater) will be hidden from Plugins > Installed Plugins.
8989

9090
```
91-
define( 'CFL_OPTIONS' , ['deps' => [ 'carbon_fields' => '2.0.3', 'php' => '5.3.29' ], 'hide_plugins' => ['carbon-fields-loader', 'github-updater'], 'disable_updates' => true ] );
91+
define( 'CFL_OPTIONS' , ['deps' => [ 'carbon_fields' => '2.1.0', 'php' => '5.3.29' ], 'hide_plugins' => ['carbon-fields-loader', 'github-updater'], 'disable_updates' => true ] );
9292
````
9393
94-
* Carbon Fields >=2.0.3 and >=PHP 5.3.29 must be loaded, else notice is displayed.
94+
* Carbon Fields >=2.1.0 and >=PHP 5.3.29 must be loaded, else notice is displayed.
9595
* This plugin and GitHub Updater are hidden from Plugins > Installed Plugins.
9696
* Update notifications are disabled for this plugin. (If [GitHub Updater](https://github.com/afragen/github-updater) is installed.)
9797
9898
```
99-
define( 'CFL_OPTIONS' , ['min_version' => '2.0.4', 'hide_plugins' => 'carbon-fields-loader', 'remove_actions' => ['deactivate', 'edit'], 'disable_updates' => true ] );
99+
define( 'CFL_OPTIONS' , ['min_version' => '2.1.0', 'hide_plugins' => 'carbon-fields-loader', 'remove_actions' => ['deactivate', 'edit'], 'disable_updates' => true ] );
100100
```
101101
102-
* Carbon Fields 2.0.4 or higher must be loaded, else notice is displayed.
102+
* Carbon Fields 2.1.0 or higher must be loaded, else notice is displayed.
103103
* This plugin (but not GitHub Updater) is hidden from Plugins > Installed Plugins.
104104
* Removes "Deactivate" and "Edit" action links from this plugin.
105105
* Update notifications are disabled for this plugin.
@@ -116,29 +116,28 @@ Please see the wiki for [usage examples](https://github.com/dmhendricks/carbon-f
116116
117117
**_Q: How do I update this plugin to use a newer version or a different branch of the Carbon Fields Framework?_**
118118
119-
A: If you just want to pull the latest release version of Carbon Fields from the repo, run `composer update`. If you want to pull a different branch, open *composer.json* and edit the line: `"htmlburger/carbon-fields": ">=2.0.0"`. Set the version to `"dev-branch"` (for example, if you want the *development* branch, set it to `"dev-development"`), then run `composer update`.
119+
A: If you just want to pull the latest release version of Carbon Fields from the repo, run `composer update`. If you want to pull a different branch, open *composer.json* and edit the line: `"htmlburger/carbon-fields": "^2.1.0"`. Set the version to `"dev-branch"` (for example, if you want the *development* branch, set it to `"dev-development"`), then run `composer update`.
120120
121121
**_Q: How can I get auto-updates?_**
122122
123123
A: Install [GitHub Updater](https://github.com/afragen/github-updater).
124124
125125
## Change Log
126126
127-
#### Branch: master (unreleased)
128-
* Fixed several translation issues
129-
* Greatly improved dependency checking
130-
* Added configurable constants:
131-
* `CFL_OPTIONS` (PHP 7+ only)
132-
* `CFL_DISABLE_UPDATE_NOTIFICATION`
133-
* `CFL_HIDE_GITHUB_UPDATER`
134-
* `CFL_DISABLE_DEACTIVATE`
135-
* `CFL_DESCRIPTION_NOTICE`
136-
* Renamed `CFL_REMOVE_PLUGIN_LINKS` to `CFL_REMOVE_PLUGIN_ACTIONS`
137-
* Added min/max WordPress tested version compatibility to plugin header
138-
* Adjusted `readme.txt` formatting; updated version/content
139-
* Fixed bug with `show_notice()` breaking frontend when exception occurs.
140-
* Updated Carbon Fields framework to 2.1.0
141-
142-
#### Releases
143-
144-
Changes related to each release are maintained on the [Releases](https://github.com/dmhendricks/carbon-fields-loader/releases) page.
127+
Release changes are noted on the [Releases](https://github.com/dmhendricks/carbon-fields-loader/releases) page.
128+
129+
#### Branch: `master`
130+
131+
* None since release
132+
133+
## Credits
134+
135+
Please support [humans.txt](http://humanstxt.org/). It's an initiative for knowing the people behind a web site. It's an unobtrusive text file that contains information about the different people who have contributed to building the web site.
136+
137+
**Carbon Fields**
138+
139+
URL: http://carbonfields.net/
140+
Author: htmlBurger.com
141+
Twitter: @htmlburger
142+
Author URI: https://htmlburger.com/
143+
Location: London, England

readme.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,4 +47,4 @@ A. This may occur when you are running an outdated version of the Carbon Fields
4747
A: Install [GitHub Updater](https://github.com/afragen/github-updater).
4848

4949
#### Q. How do I update this thing to use a newer version or a different branch?
50-
If you just want to pull the latest release version of Carbon Fields from the repo, run `composer update`. If you want to pull a different branch, open *composer.json* and edit the line: `"htmlburger/carbon-fields": ">=2.0.0"`. Set the version to `"dev-branch"` (for example, if you want the *development* branch, set it to `"dev-development"`), then run `composer update`.
50+
If you just want to pull the latest release version of Carbon Fields from the repo, run `composer update`. If you want to pull a different branch, open *composer.json* and edit the line: `"htmlburger/carbon-fields": "^2.1.0"`. Set the version to `"dev-branch"` (for example, if you want the *development* branch, set it to `"dev-development"`), then run `composer update`.

0 commit comments

Comments
 (0)