Merge branch 'master' of github.com:sbrl/Pepperminty-Wiki

This commit is contained in:
Starbeamrainbowlabs 2017-12-10 15:18:51 +00:00
commit ce925660c4
Signed by: sbrl
GPG Key ID: 1BE5172E637709C2
2 changed files with 5 additions and 5 deletions

View File

@ -6,7 +6,7 @@ Pepperminty Wiki is a complete wiki contained in a single file, inspired by @am2
Developed by Starbeamrainbowlabs (though contributions from others are welcome!), Pepperminty Wiki has a variety of useful (and cool!) features - such as file upload, a dynamic help page, page revision history, page tags, and more! Other amazing features are in the works too (like a theme gallery, autoupdate, and user watchlists), so check the release notes to see what's been added recently.
**Latest Version:** v0.14 (stable) v0.15-dev (development) ([Changelog](https://github.com/sbrl/Pepperminty-Wiki/blob/master/Changelog.md))
**Latest Version:** v0.15 (stable) v0.16-dev (development) ([Changelog](https://github.com/sbrl/Pepperminty-Wiki/blob/master/Changelog.md))
## Table of Contents
- [Screenshots and Demo](#screenshots-and-demo)

View File

@ -385,7 +385,7 @@ if($settings->css === "auto")
////// Do not edit below this line unless you know what you are doing! //////
/////////////////////////////////////////////////////////////////////////////
/** The version of Pepperminty Wiki currently running. */
$version = "v0.15-beta2";
$version = "v0.16-dev";
/// Environment ///
/** Holds information about the current request environment. */
$env = new stdClass();
@ -1467,7 +1467,7 @@ class page_renderer
{extra}
<footer>
<p>{footer-message}</p>
<p>Powered by Pepperminty Wiki v0.15-beta2, which was built by <a href='//starbeamrainbowlabs.com/'>Starbeamrainbowlabs</a>. Send bugs to 'bugs at starbeamrainbowlabs dot com' or <a href='//github.com/sbrl/Pepperminty-Wiki' title='Github Issue Tracker'>open an issue</a>.</p>
<p>Powered by Pepperminty Wiki v0.16-dev, which was built by <a href='//starbeamrainbowlabs.com/'>Starbeamrainbowlabs</a>. Send bugs to 'bugs at starbeamrainbowlabs dot com' or <a href='//github.com/sbrl/Pepperminty-Wiki' title='Github Issue Tracker'>open an issue</a>.</p>
<p>Your local friendly moderators are {admins-name-list}.</p>
<p>This wiki is managed by <a href='mailto:{admin-details-email}'>{admin-details-name}</a>.</p>
</footer>
@ -1485,7 +1485,7 @@ class page_renderer
<p><em>From {sitename}, which is managed by {admin-details-name}.</em></p>
<p>{footer-message}</p>
<p><em>Timed at {generation-date}</em></p>
<p><em>Powered by Pepperminty Wiki v0.15-beta2.</em></p>
<p><em>Powered by Pepperminty Wiki v0.16-dev.</em></p>
</footer>";
/**
@ -1563,7 +1563,7 @@ class page_renderer
"{body}" => $body_template,
"{sitename}" => $logo_html,
"v0.15-beta2" => $version,
"v0.16-dev" => $version,
"{favicon-url}" => $settings->favicon,
"{header-html}" => self::get_header_html(),