From d15fccb3abf2bdcc9436f7325cf054871b033b6f Mon Sep 17 00:00:00 2001 From: Ben Harris Date: Wed, 3 Jul 2019 01:11:55 -0400 Subject: [PATCH] use tildeverse/wiki --- .editorconfig | 2 +- blacklist.example | 2 - composer.json | 11 +- composer.lock | 113 +++-- discord/index.php | 47 -- footer.php | 16 +- jasny-bootstrap.js | 1024 ------------------------------------------- js/bootstrap.min.js | 7 + js/jquery.min.js | 4 + navbar.php | 16 +- wiki/index.php | 20 +- 11 files changed, 109 insertions(+), 1153 deletions(-) delete mode 100644 blacklist.example delete mode 100644 discord/index.php delete mode 100644 jasny-bootstrap.js create mode 100644 js/bootstrap.min.js create mode 100644 js/jquery.min.js diff --git a/.editorconfig b/.editorconfig index 6fd9491..9c20296 100644 --- a/.editorconfig +++ b/.editorconfig @@ -1,4 +1,4 @@ -# EdeitorConfig to make ben's editor stop defaulting to spaces +# EditorConfig to make ben's editor stop defaulting to spaces root = true # yes, this is the root editorconfig for this project diff --git a/blacklist.example b/blacklist.example deleted file mode 100644 index 7b05f07..0000000 --- a/blacklist.example +++ /dev/null @@ -1,2 +0,0 @@ -#mysecrets -#dontlookhere \ No newline at end of file diff --git a/composer.json b/composer.json index 3e0c4b4..a9c70dc 100644 --- a/composer.json +++ b/composer.json @@ -1,6 +1,11 @@ { "require": { - "michelf/php-markdown": "^1.8", - "mnapoli/front-yaml": "^1.6" - } + "tildeverse/wiki": "dev-master" + }, + "repositories": [ + { + "type": "vcs", + "url": "https://tildegit.org/ben/tildewiki" + } + ] } diff --git a/composer.lock b/composer.lock index 5157a83..605dc72 100644 --- a/composer.lock +++ b/composer.lock @@ -4,23 +4,24 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d6a1ecb21bac8642fb0b75ee1e70eced", + "content-hash": "3ab3df15c4e40417f427b37691e83088", "packages": [ { "name": "erusev/parsedown", - "version": "1.7.0", + "version": "1.7.3", "source": { "type": "git", "url": "https://github.com/erusev/parsedown.git", - "reference": "6678d59be48c4be64eaca6ce70bea48a09488cc2" + "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/erusev/parsedown/zipball/6678d59be48c4be64eaca6ce70bea48a09488cc2", - "reference": "6678d59be48c4be64eaca6ce70bea48a09488cc2", + "url": "https://api.github.com/repos/erusev/parsedown/zipball/6d893938171a817f4e9bc9e86f2da1e370b7bcd7", + "reference": "6d893938171a817f4e9bc9e86f2da1e370b7bcd7", "shasum": "" }, "require": { + "ext-mbstring": "*", "php": ">=5.3.0" }, "require-dev": { @@ -49,53 +50,51 @@ "markdown", "parser" ], - "time": "2018-02-28T11:41:37+00:00" + "time": "2019-03-17T18:48:37+00:00" }, { - "name": "michelf/php-markdown", - "version": "1.8.0", + "name": "erusev/parsedown-extra", + "version": "0.7.1", "source": { "type": "git", - "url": "https://github.com/michelf/php-markdown.git", - "reference": "01ab082b355bf188d907b9929cd99b2923053495" + "url": "https://github.com/erusev/parsedown-extra.git", + "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/michelf/php-markdown/zipball/01ab082b355bf188d907b9929cd99b2923053495", - "reference": "01ab082b355bf188d907b9929cd99b2923053495", + "url": "https://api.github.com/repos/erusev/parsedown-extra/zipball/0db5cce7354e4b76f155d092ab5eb3981c21258c", + "reference": "0db5cce7354e4b76f155d092ab5eb3981c21258c", "shasum": "" }, "require": { - "php": ">=5.3.0" + "erusev/parsedown": "~1.4" }, "type": "library", "autoload": { - "psr-4": { - "Michelf\\": "Michelf/" + "psr-0": { + "ParsedownExtra": "" } }, "notification-url": "https://packagist.org/downloads/", "license": [ - "BSD-3-Clause" + "MIT" ], "authors": [ { - "name": "Michel Fortin", - "email": "michel.fortin@michelf.ca", - "homepage": "https://michelf.ca/", - "role": "Developer" - }, - { - "name": "John Gruber", - "homepage": "https://daringfireball.net/" + "name": "Emanuil Rusev", + "email": "hello@erusev.com", + "homepage": "http://erusev.com" } ], - "description": "PHP Markdown", - "homepage": "https://michelf.ca/projects/php-markdown/", + "description": "An extension of Parsedown that adds support for Markdown Extra.", + "homepage": "https://github.com/erusev/parsedown-extra", "keywords": [ - "markdown" + "markdown", + "markdown extra", + "parsedown", + "parser" ], - "time": "2018-01-15T00:49:33+00:00" + "time": "2015-11-01T10:19:22+00:00" }, { "name": "mnapoli/front-yaml", @@ -134,16 +133,16 @@ }, { "name": "symfony/polyfill-ctype", - "version": "v1.9.0", + "version": "v1.11.0", "source": { "type": "git", "url": "https://github.com/symfony/polyfill-ctype.git", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19" + "reference": "82ebae02209c21113908c229e9883c419720738a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/e3d826245268269cd66f8326bd8bc066687b4a19", - "reference": "e3d826245268269cd66f8326bd8bc066687b4a19", + "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/82ebae02209c21113908c229e9883c419720738a", + "reference": "82ebae02209c21113908c229e9883c419720738a", "shasum": "" }, "require": { @@ -155,7 +154,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "1.9-dev" + "dev-master": "1.11-dev" } }, "autoload": { @@ -188,20 +187,20 @@ "polyfill", "portable" ], - "time": "2018-08-06T14:22:27+00:00" + "time": "2019-02-06T07:57:58+00:00" }, { "name": "symfony/yaml", - "version": "v4.1.4", + "version": "v4.3.2", "source": { "type": "git", "url": "https://github.com/symfony/yaml.git", - "reference": "b832cc289608b6d305f62149df91529a2ab3c314" + "reference": "c60ecf5ba842324433b46f58dc7afc4487dbab99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/yaml/zipball/b832cc289608b6d305f62149df91529a2ab3c314", - "reference": "b832cc289608b6d305f62149df91529a2ab3c314", + "url": "https://api.github.com/repos/symfony/yaml/zipball/c60ecf5ba842324433b46f58dc7afc4487dbab99", + "reference": "c60ecf5ba842324433b46f58dc7afc4487dbab99", "shasum": "" }, "require": { @@ -220,7 +219,7 @@ "type": "library", "extra": { "branch-alias": { - "dev-master": "4.1-dev" + "dev-master": "4.3-dev" } }, "autoload": { @@ -247,13 +246,45 @@ ], "description": "Symfony Yaml Component", "homepage": "https://symfony.com", - "time": "2018-08-18T16:52:46+00:00" + "time": "2019-04-06T14:04:46+00:00" + }, + { + "name": "tildeverse/wiki", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://tildegit.org/ben/tildewiki", + "reference": "751eb64c383cb7c6ec643eaf683b88aa1de351ea" + }, + "require": { + "erusev/parsedown-extra": "^0.7.1", + "mnapoli/front-yaml": "^1.6" + }, + "type": "library", + "autoload": { + "psr-4": { + "Tildeverse\\Wiki\\": "src/" + } + }, + "license": [ + "GPLv3" + ], + "authors": [ + { + "name": "Ben Harris", + "email": "ben@tilde.team" + } + ], + "description": "parsedown extensions for tilde wikis", + "time": "2019-07-03T05:06:34+00:00" } ], "packages-dev": [], "aliases": [], "minimum-stability": "stable", - "stability-flags": [], + "stability-flags": { + "tildeverse/wiki": 20 + }, "prefer-stable": false, "prefer-lowest": false, "platform": [], diff --git a/discord/index.php b/discord/index.php deleted file mode 100644 index 03b87c5..0000000 --- a/discord/index.php +++ /dev/null @@ -1,47 +0,0 @@ - - -

tilde.chat discord

- -
-khuxkm Today at 1:39 AM
-
-ATTENTION @everyone:
-
-Due to recent events in the Discord server, we have decided to lock this Discord and accompanying IRC bridge until
-further notice. On Monday, the IRC to Discord bridge will be shut down and all channels in this Discord will be set
-to READ-ONLY. This decision will only be reversed when a full discussion has been held on moderation requirements,
-rules, and certain members of our moderation team who appear to be missing.
-
-How this affects you:
-
- - If you primarily use Discord, you will have to use IRC from now on. tilde.team users can use our TheLounge instance at
-https://irc.tilde.team/ for a Discord-like experience (or any other client of their choosing), whereas members of
-other tildes can continue using their tilde's node in the tilde.chat network.
-
- - If you primarily use IRC, all that changes is that you will not be able to use this Discord.
-
-The behavior of some users in this Discord has been unacceptable and does not comply with our code of conduct.
-Upon further review, we have decided that managing this Discord server is a bit more than we can handle without discussing
-moderation in-depth. As such, ben and I (khuxkm) have decided to make this Discord READ-ONLY until we have come to a more
-permanent decision (which may be to close this server permanently).
-
-If you have any thoughts/ideas for the future of the discord bridge, please drop a line to ben or myself on IRC or by email
-(@tilde.team). We can be found in the #sudoers channel.
-
-Thanks for being a member of the tildeverse and working with us to figure out a chat solution that works for everyone!
-
- -