sbrl-github/Pepperminty-Wiki
sbrl-github/Pepperminty-Wiki
1
0
Fork 0
mirror of https://github.com/sbrl/Pepperminty-Wiki.git synced 2024-11-21 16:13:00 +00:00
Code Activity

Re-update version

Browse source
This commit is contained in:
Starbeamrainbowlabs 2016-09-11 20:23:38 +01:00
parent 4834b8e4b7
commit eb1a9f9103
4 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Changelog.md
View file

@ -1,5 +1,6 @@
# Changelog # Changelog
<<<<<<< 4834b8e4b70f5432b4029ef617d0d8d5222b950b
## v0.13-dev ## v0.13-dev
### Added ### Added
@ -14,6 +15,9 @@
- Fxed huge issue with `contentonly` display mode. - Fxed huge issue with `contentonly` display mode.
## v0.12.1-dev ## v0.12.1-dev
=======
## v0.12.1-beta1
>>>>>>> Re-update version
### Added ### Added
- Added a class to the search term highlighting to aid theming (#92) - Added a class to the search term highlighting to aid theming (#92)

8
build/index.php
View file

@ -308,7 +308,7 @@ Actions:
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
/////////////// Do not edit below this line unless you know what you are doing! /////////////// /////////////// Do not edit below this line unless you know what you are doing! ///////////////
/////////////////////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////////////////////
$version = "v0.12.1"; $version = "v0.12.1-beta1";
/// Environment /// /// Environment ///
$env = new stdClass(); $env = new stdClass();
$env->action = $settings->defaultaction; $env->action = $settings->defaultaction;
@ -1049,7 +1049,7 @@ class page_renderer
<footer> <footer>
<p>{footer-message}</p> <p>{footer-message}</p>
<p>Powered by Pepperminty Wiki v0.12.1, 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.12.1-beta1, 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 administrators are {admins-name-list}.</p> <p>Your local friendly administrators are {admins-name-list}.</p>
<p>This wiki is managed by <a href='mailto:{admin-details-email}'>{admin-details-name}</a>.</p> <p>This wiki is managed by <a href='mailto:{admin-details-email}'>{admin-details-name}</a>.</p>
</footer> </footer>
@ -1061,7 +1061,7 @@ class page_renderer
<p><em>From {sitename}, which is managed by {admin-details-name}.</em></p> <p><em>From {sitename}, which is managed by {admin-details-name}.</em></p>
<p>{footer-message}</p> <p>{footer-message}</p>
<p><em>Timed at {generation-date}</em></p> <p><em>Timed at {generation-date}</em></p>
<p><em>Powered by Pepperminty Wiki v0.12.1.</em></p> <p><em>Powered by Pepperminty Wiki v0.12.1-beta1.</em></p>
</footer>"; </footer>";
// An array of functions that have been registered to process the // An array of functions that have been registered to process the
@ -1116,7 +1116,7 @@ class page_renderer
"{body}" => $body_template, "{body}" => $body_template,
"{sitename}" => $logo_html, "{sitename}" => $logo_html,
"v0.12.1" => $version, "v0.12.1-beta1" => $version,
"{favicon-url}" => $settings->favicon, "{favicon-url}" => $settings->favicon,
"{header-html}" => self::get_header_html(), "{header-html}" => self::get_header_html(),

4
module_index.json
View file

@ -50,11 +50,7 @@
"author": "Starbeamrainbowlabs", "author": "Starbeamrainbowlabs",
"description": "Adds recent changes. Access through the 'recent-changes' action.", "description": "Adds recent changes. Access through the 'recent-changes' action.",
"id": "feature-recent-changes", "id": "feature-recent-changes",
<<<<<<< 9f2efb2c02ffa0eb71eae35cf73c95fa85b076a3
"lastupdate": 1476813264, "lastupdate": 1476813264,
=======
"lastupdate": 1473616618,
>>>>>>> Bump version~!
"optional": false "optional": false
}, },
{ {

2
version
View file

@ -1 +1 @@
v0.12.1 v0.12.1-beta1