From 2853cf4da595832f9d7e3519c3fb96cfb714d745 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Mon, 2 Jul 2018 12:23:11 +0100 Subject: [PATCH] Add link to user table on credits page Also fix a typo in the API status module description --- Changelog.md | 1 + build/index.php | 14 +++++++------- module_index.json | 8 ++++---- modules/api-status.php | 2 +- modules/page-credits.php | 8 ++++---- 5 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Changelog.md b/Changelog.md index 137263b..9e8c175 100644 --- a/Changelog.md +++ b/Changelog.md @@ -7,6 +7,7 @@ This file holds the changelog for Pepperminty Wiki. This is the master list of t - [Module API] Added `save_settings()` convenience method - [Rest API] Add `user-add` and `set-password` moderator actions - Added `random_page_exclude_redirects` setting that prevents the `random` action from returning redirect pages. + - Added link to user table on the credits page ### Fixed - Updated the search system to transliterate characters to better support searching pages that are written in other languages. diff --git a/build/index.php b/build/index.php index d35973d..228115b 100644 --- a/build/index.php +++ b/build/index.php @@ -402,7 +402,7 @@ if($settings->sessionprefix == "auto") ///////////////////////////////////////////////////////////////////////////// /** The version of Pepperminty Wiki currently running. */ $version = "v0.17-dev"; -$commit = "0e3104415acdf339000212466bc7e978d48e3d50"; +$commit = "10b374871faaaebe84139ac36c7708c2598313ca"; /// Environment /// /** Holds information about the current request environment. */ $env = new stdClass(); @@ -6206,7 +6206,7 @@ function generate_password($length) { register_module([ "name" => "Credits", - "version" => "0.7.7", + "version" => "0.7.8", "author" => "Starbeamrainbowlabs", "description" => "Adds the credits page. You *must* have this module :D", "id" => "page-credits", @@ -6296,7 +6296,7 @@ register_module([ "author" => "ProDigySML", "author_url" => "https://github.com/ProDigySML", "thing_url" => "https://github.com/sbrl/Pepperminty-Wiki/issues/152", - "icon" => "https://starbeamrainbowlabs.com/images/placeholder/?width=24&height=24" + "icon" => "https://avatars3.githubusercontent.com/u/16996819?s=24&v=4" ] ]; @@ -6307,7 +6307,7 @@ register_module([ $credits_html .= "
  • "; $credits_html .= "$thing by "; if(isset($author_details["icon"])) - $credits_html .= " "; + $credits_html .= " "; $credits_html .= "" . $author_details["author"] . ""; $credits_html .= "
    • \n"; } @@ -6341,7 +6341,7 @@ register_module([ $credits_html

    Site status

    - + @@ -8425,7 +8425,7 @@ register_module([ register_module([ "name" => "Parsedown", - "version" => "0.9.11", + "version" => "0.9.12", "author" => "Emanuil Rusev & Starbeamrainbowlabs", "description" => "An upgraded (now default!) parser based on Emanuil Rusev's Parsedown Extra PHP library (https://github.com/erusev/parsedown-extra), which is licensed MIT. Please be careful, as this module adds some weight to your installation, and also *requires* write access to the disk on first load.", "id" => "parser-parsedown", @@ -8592,7 +8592,7 @@ register_module([ - +
    Site name:$settings->sitename ({$settings->admindisplaychar}Update, {$settings->admindisplaychar}Edit master settings, Export as zip - Check for permission first)
    Site name:$settings->sitename ({$settings->admindisplaychar}Update, {$settings->admindisplaychar}Edit master settings, {$settings->admindisplaychar} Edit user table, Export as zip - Check for permission first)
    Pepperminty Wiki version:$version
    Number of pages:" . count(get_object_vars($pageindex)) . "
    Number of modules:" . count($modules) . "
    [[Internal link]]Internal LinkAn internal link.
    [[Display Text|Internal link]]Display TextAn internal link with some display text.
    ![Alt text](http://example.com/path/to/image.png | 256x256 | right)Alt textAn image floating to the right of the page that fits inside a 256px x 256px box, preserving aspect ratio.
    ![Alt text](http://example.com/path/to/image.png | 256x256 | caption)
    Alt text
    Alt text
    		An image with a caption that fits inside a 256px x 256px box, preserving aspect ratio. The caption is taken from the alt text.
    ![Alt text](http://example.com/path/to/image.png | 256x256 | caption)
    Alt text
    Alt text
    		An image with a caption that fits inside a 256px x 256px box, preserving aspect ratio. The presence of the word caption in the regular braces causes the alt text to be taken and displayed below the image itself.
    ![Alt text](Files/Cheese.png)Alt textAn example of the short url syntax for images. Simply enter the page name of an image (or video / audio file), and Pepperminty Wiki will sort out the url for you.

    Note that the all image image syntax above can be mixed and matched to your liking. The caption option in particular must come last or next to last.

    diff --git a/module_index.json b/module_index.json index 9e69f8b..f88f3c1 100755 --- a/module_index.json +++ b/module_index.json @@ -145,11 +145,11 @@ }, { "name": "Credits", - "version": "0.7.7", + "version": "0.7.8", "author": "Starbeamrainbowlabs", "description": "Adds the credits page. You *must* have this module :D", "id": "page-credits", - "lastupdate": 1522695072, + "lastupdate": 1530530402, "optional": false }, { @@ -271,11 +271,11 @@ }, { "name": "Parsedown", - "version": "0.9.11", + "version": "0.9.12", "author": "Emanuil Rusev & Starbeamrainbowlabs", "description": "An upgraded (now default!) parser based on Emanuil Rusev's Parsedown Extra PHP library (https:\/\/github.com\/erusev\/parsedown-extra), which is licensed MIT. Please be careful, as this module adds some weight to your installation, and also *requires* write access to the disk on first load.", "id": "parser-parsedown", - "lastupdate": 1524909840, + "lastupdate": 1530474936, "optional": false } ] \ No newline at end of file diff --git a/modules/api-status.php b/modules/api-status.php index 2183b82..c2f73af 100644 --- a/modules/api-status.php +++ b/modules/api-status.php @@ -3,7 +3,7 @@ register_module([ "name" => "API status", "version" => "0.1", "author" => "Starbeamrainbowlabs", - "description" => "Provides a basic JSON status action that provices a few useful bits of information for API consumption.", + "description" => "Provides a basic JSON status action that provides a few useful bits of information for API consumption.", "id" => "api-status", "code" => function() { global $settings; diff --git a/modules/page-credits.php b/modules/page-credits.php index 5d96edb..3e33b12 100644 --- a/modules/page-credits.php +++ b/modules/page-credits.php @@ -1,7 +1,7 @@ "Credits", - "version" => "0.7.7", + "version" => "0.7.8", "author" => "Starbeamrainbowlabs", "description" => "Adds the credits page. You *must* have this module :D", "id" => "page-credits", @@ -91,7 +91,7 @@ register_module([ "author" => "ProDigySML", "author_url" => "https://github.com/ProDigySML", "thing_url" => "https://github.com/sbrl/Pepperminty-Wiki/issues/152", - "icon" => "https://starbeamrainbowlabs.com/images/placeholder/?width=24&height=24" + "icon" => "https://avatars3.githubusercontent.com/u/16996819?s=24&v=4" ] ]; @@ -102,7 +102,7 @@ register_module([ $credits_html .= "
  • "; $credits_html .= "$thing by "; if(isset($author_details["icon"])) - $credits_html .= " "; + $credits_html .= " "; $credits_html .= "" . $author_details["author"] . ""; $credits_html .= "
    • \n"; } @@ -136,7 +136,7 @@ register_module([ $credits_html

    Site status

    - +
    Site name:$settings->sitename ({$settings->admindisplaychar}Update, {$settings->admindisplaychar}Edit master settings, Export as zip - Check for permission first)
    Site name:$settings->sitename ({$settings->admindisplaychar}Update, {$settings->admindisplaychar}Edit master settings, {$settings->admindisplaychar} Edit user table, Export as zip - Check for permission first)
    Pepperminty Wiki version:$version
    Number of pages:" . count(get_object_vars($pageindex)) . "
    Number of modules:" . count($modules) . "