From c4b32f13264557f638474a12c2c0d2d1c2a24965 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 23 Jul 2015 20:25:52 +0930 Subject: [PATCH 01/51] Initial commit --- extensions/bbcode/.editorconfig | 32 ++++ extensions/bbcode/.eslintignore | 5 + extensions/bbcode/.eslintrc | 171 ++++++++++++++++++ extensions/bbcode/.gitignore | 4 + extensions/bbcode/bootstrap.php | 10 + extensions/bbcode/composer.json | 7 + extensions/bbcode/flarum.json | 16 ++ extensions/bbcode/js/.gitignore | 3 + extensions/bbcode/js/forum/Gulpfile.js | 5 + extensions/bbcode/js/forum/package.json | 7 + extensions/bbcode/js/forum/src/main.js | 6 + extensions/bbcode/less/forum/extension.less | 0 extensions/bbcode/locale/en.yml | 2 + extensions/bbcode/src/Extension.php | 28 +++ .../src/Listeners/AddBBCodeFormatter.php | 26 +++ .../bbcode/src/Listeners/AddClientAssets.php | 33 ++++ 16 files changed, 355 insertions(+) create mode 100644 extensions/bbcode/.editorconfig create mode 100644 extensions/bbcode/.eslintignore create mode 100644 extensions/bbcode/.eslintrc create mode 100644 extensions/bbcode/.gitignore create mode 100644 extensions/bbcode/bootstrap.php create mode 100644 extensions/bbcode/composer.json create mode 100644 extensions/bbcode/flarum.json create mode 100644 extensions/bbcode/js/.gitignore create mode 100644 extensions/bbcode/js/forum/Gulpfile.js create mode 100644 extensions/bbcode/js/forum/package.json create mode 100644 extensions/bbcode/js/forum/src/main.js create mode 100644 extensions/bbcode/less/forum/extension.less create mode 100644 extensions/bbcode/locale/en.yml create mode 100644 extensions/bbcode/src/Extension.php create mode 100644 extensions/bbcode/src/Listeners/AddBBCodeFormatter.php create mode 100644 extensions/bbcode/src/Listeners/AddClientAssets.php diff --git a/extensions/bbcode/.editorconfig b/extensions/bbcode/.editorconfig new file mode 100644 index 000000000..5612a5e74 --- /dev/null +++ b/extensions/bbcode/.editorconfig @@ -0,0 +1,32 @@ +# EditorConfig helps developers define and maintain consistent +# coding styles between different editors and IDEs +# editorconfig.org + +root = true + +[*] +end_of_line = lf +charset = utf-8 +trim_trailing_whitespace = true +insert_final_newline = true +indent_style = space +indent_size = 2 + +[*.js] +indent_style = space +indent_size = 2 + +[*.{css,less}] +indent_style = space +indent_size = 2 + +[*.html] +indent_style = space +indent_size = 2 + +[*.{diff,md}] +trim_trailing_whitespace = false + +[*.php] +indent_style = space +indent_size = 4 diff --git a/extensions/bbcode/.eslintignore b/extensions/bbcode/.eslintignore new file mode 100644 index 000000000..86b7c8854 --- /dev/null +++ b/extensions/bbcode/.eslintignore @@ -0,0 +1,5 @@ +**/bower_components/**/* +**/node_modules/**/* +vendor/**/* +**/Gulpfile.js +**/dist/**/* diff --git a/extensions/bbcode/.eslintrc b/extensions/bbcode/.eslintrc new file mode 100644 index 000000000..9cebc759d --- /dev/null +++ b/extensions/bbcode/.eslintrc @@ -0,0 +1,171 @@ +{ + "parser": "babel-eslint", // https://github.com/babel/babel-eslint + "env": { // http://eslint.org/docs/user-guide/configuring.html#specifying-environments + "browser": true // browser global variables + }, + "ecmaFeatures": { + "arrowFunctions": true, + "blockBindings": true, + "classes": true, + "defaultParams": true, + "destructuring": true, + "forOf": true, + "generators": false, + "modules": true, + "objectLiteralComputedProperties": true, + "objectLiteralDuplicateProperties": false, + "objectLiteralShorthandMethods": true, + "objectLiteralShorthandProperties": true, + "spread": true, + "superInFunctions": true, + "templateStrings": true, + "jsx": true + }, + "globals": { + "m": true, + "app": true, + "$": true, + "moment": true + }, + "rules": { +/** + * Strict mode + */ + // babel inserts "use strict"; for us + "strict": [2, "never"], // http://eslint.org/docs/rules/strict + +/** + * ES6 + */ + "no-var": 2, // http://eslint.org/docs/rules/no-var + "prefer-const": 2, // http://eslint.org/docs/rules/prefer-const + +/** + * Variables + */ + "no-shadow": 2, // http://eslint.org/docs/rules/no-shadow + "no-shadow-restricted-names": 2, // http://eslint.org/docs/rules/no-shadow-restricted-names + "no-unused-vars": [2, { // http://eslint.org/docs/rules/no-unused-vars + "vars": "local", + "args": "after-used" + }], + "no-use-before-define": 2, // http://eslint.org/docs/rules/no-use-before-define + +/** + * Possible errors + */ + "comma-dangle": [2, "never"], // http://eslint.org/docs/rules/comma-dangle + "no-cond-assign": [2, "always"], // http://eslint.org/docs/rules/no-cond-assign + "no-console": 1, // http://eslint.org/docs/rules/no-console + "no-debugger": 1, // http://eslint.org/docs/rules/no-debugger + "no-alert": 1, // http://eslint.org/docs/rules/no-alert + "no-constant-condition": 1, // http://eslint.org/docs/rules/no-constant-condition + "no-dupe-keys": 2, // http://eslint.org/docs/rules/no-dupe-keys + "no-duplicate-case": 2, // http://eslint.org/docs/rules/no-duplicate-case + "no-empty": 2, // http://eslint.org/docs/rules/no-empty + "no-ex-assign": 2, // http://eslint.org/docs/rules/no-ex-assign + "no-extra-boolean-cast": 0, // http://eslint.org/docs/rules/no-extra-boolean-cast + "no-extra-semi": 2, // http://eslint.org/docs/rules/no-extra-semi + "no-func-assign": 2, // http://eslint.org/docs/rules/no-func-assign + "no-inner-declarations": 2, // http://eslint.org/docs/rules/no-inner-declarations + "no-invalid-regexp": 2, // http://eslint.org/docs/rules/no-invalid-regexp + "no-irregular-whitespace": 2, // http://eslint.org/docs/rules/no-irregular-whitespace + "no-obj-calls": 2, // http://eslint.org/docs/rules/no-obj-calls + "no-reserved-keys": 2, // http://eslint.org/docs/rules/no-reserved-keys + "no-sparse-arrays": 2, // http://eslint.org/docs/rules/no-sparse-arrays + "no-unreachable": 2, // http://eslint.org/docs/rules/no-unreachable + "use-isnan": 2, // http://eslint.org/docs/rules/use-isnan + "block-scoped-var": 2, // http://eslint.org/docs/rules/block-scoped-var + +/** + * Best practices + */ + "consistent-return": 2, // http://eslint.org/docs/rules/consistent-return + "curly": [2, "multi-line"], // http://eslint.org/docs/rules/curly + "default-case": 2, // http://eslint.org/docs/rules/default-case + "dot-notation": [2, { // http://eslint.org/docs/rules/dot-notation + "allowKeywords": true + }], + "eqeqeq": 2, // http://eslint.org/docs/rules/eqeqeq + "no-caller": 2, // http://eslint.org/docs/rules/no-caller + "no-else-return": 2, // http://eslint.org/docs/rules/no-else-return + "no-eq-null": 2, // http://eslint.org/docs/rules/no-eq-null + "no-eval": 2, // http://eslint.org/docs/rules/no-eval + "no-extend-native": 2, // http://eslint.org/docs/rules/no-extend-native + "no-extra-bind": 2, // http://eslint.org/docs/rules/no-extra-bind + "no-fallthrough": 2, // http://eslint.org/docs/rules/no-fallthrough + "no-floating-decimal": 2, // http://eslint.org/docs/rules/no-floating-decimal + "no-implied-eval": 2, // http://eslint.org/docs/rules/no-implied-eval + "no-lone-blocks": 2, // http://eslint.org/docs/rules/no-lone-blocks + "no-loop-func": 2, // http://eslint.org/docs/rules/no-loop-func + "no-multi-str": 2, // http://eslint.org/docs/rules/no-multi-str + "no-native-reassign": 2, // http://eslint.org/docs/rules/no-native-reassign + "no-new": 2, // http://eslint.org/docs/rules/no-new + "no-new-func": 2, // http://eslint.org/docs/rules/no-new-func + "no-new-wrappers": 2, // http://eslint.org/docs/rules/no-new-wrappers + "no-octal": 2, // http://eslint.org/docs/rules/no-octal + "no-octal-escape": 2, // http://eslint.org/docs/rules/no-octal-escape + "no-param-reassign": 2, // http://eslint.org/docs/rules/no-param-reassign + "no-proto": 2, // http://eslint.org/docs/rules/no-proto + "no-redeclare": 2, // http://eslint.org/docs/rules/no-redeclare + "no-return-assign": 2, // http://eslint.org/docs/rules/no-return-assign + "no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare + "no-sequences": 2, // http://eslint.org/docs/rules/no-sequences + "no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal + "no-with": 2, // http://eslint.org/docs/rules/no-with + "radix": 2, // http://eslint.org/docs/rules/radix + "vars-on-top": 2, // http://eslint.org/docs/rules/vars-on-top + "wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife + "yoda": 2, // http://eslint.org/docs/rules/yoda + +/** + * Style + */ + "indent": [2, 2], // http://eslint.org/docs/rules/indent + "brace-style": [2, // http://eslint.org/docs/rules/brace-style + "1tbs", { + "allowSingleLine": true + }], + "quotes": [ + 2, "single", "avoid-escape" // http://eslint.org/docs/rules/quotes + ], + "camelcase": [2, { // http://eslint.org/docs/rules/camelcase + "properties": "never" + }], + "comma-spacing": [2, { // http://eslint.org/docs/rules/comma-spacing + "before": false, + "after": true + }], + "comma-style": [2, "last"], // http://eslint.org/docs/rules/comma-style + "eol-last": 2, // http://eslint.org/docs/rules/eol-last + "func-names": 1, // http://eslint.org/docs/rules/func-names + "key-spacing": [2, { // http://eslint.org/docs/rules/key-spacing + "beforeColon": false, + "afterColon": true + }], + "new-cap": [2, { // http://eslint.org/docs/rules/new-cap + "newIsCap": true + }], + "no-multiple-empty-lines": [2, { // http://eslint.org/docs/rules/no-multiple-empty-lines + "max": 2 + }], + "no-new-object": 2, // http://eslint.org/docs/rules/no-new-object + "no-spaced-func": 2, // http://eslint.org/docs/rules/no-spaced-func + "no-trailing-spaces": 2, // http://eslint.org/docs/rules/no-trailing-spaces + "no-wrap-func": 2, // http://eslint.org/docs/rules/no-wrap-func + "no-underscore-dangle": 0, // http://eslint.org/docs/rules/no-underscore-dangle + "one-var": [2, "never"], // http://eslint.org/docs/rules/one-var + "padded-blocks": [2, "never"], // http://eslint.org/docs/rules/padded-blocks + "semi": [2, "always"], // http://eslint.org/docs/rules/semi + "semi-spacing": [2, { // http://eslint.org/docs/rules/semi-spacing + "before": false, + "after": true + }], + "space-after-keywords": 2, // http://eslint.org/docs/rules/space-after-keywords + "space-before-blocks": 2, // http://eslint.org/docs/rules/space-before-blocks + "space-before-function-paren": [2, "never"], // http://eslint.org/docs/rules/space-before-function-paren + "space-infix-ops": 2, // http://eslint.org/docs/rules/space-infix-ops + "space-return-throw-case": 2, // http://eslint.org/docs/rules/space-return-throw-case + "spaced-line-comment": 2, // http://eslint.org/docs/rules/spaced-line-comment + } +} diff --git a/extensions/bbcode/.gitignore b/extensions/bbcode/.gitignore new file mode 100644 index 000000000..a4f3b125e --- /dev/null +++ b/extensions/bbcode/.gitignore @@ -0,0 +1,4 @@ +/vendor +composer.phar +.DS_Store +Thumbs.db diff --git a/extensions/bbcode/bootstrap.php b/extensions/bbcode/bootstrap.php new file mode 100644 index 000000000..c5398075a --- /dev/null +++ b/extensions/bbcode/bootstrap.php @@ -0,0 +1,10 @@ +=5.4.0", + "flarum": ">0.1.0" + } +} \ No newline at end of file diff --git a/extensions/bbcode/js/.gitignore b/extensions/bbcode/js/.gitignore new file mode 100644 index 000000000..372e20a51 --- /dev/null +++ b/extensions/bbcode/js/.gitignore @@ -0,0 +1,3 @@ +bower_components +node_modules +dist diff --git a/extensions/bbcode/js/forum/Gulpfile.js b/extensions/bbcode/js/forum/Gulpfile.js new file mode 100644 index 000000000..c0f1fbb5c --- /dev/null +++ b/extensions/bbcode/js/forum/Gulpfile.js @@ -0,0 +1,5 @@ +var gulp = require('flarum-gulp'); + +gulp({ + modulePrefix: 'bbcode' +}); diff --git a/extensions/bbcode/js/forum/package.json b/extensions/bbcode/js/forum/package.json new file mode 100644 index 000000000..3e0ef919d --- /dev/null +++ b/extensions/bbcode/js/forum/package.json @@ -0,0 +1,7 @@ +{ + "private": true, + "devDependencies": { + "gulp": "^3.8.11", + "flarum-gulp": "git+https://github.com/flarum/gulp.git" + } +} diff --git a/extensions/bbcode/js/forum/src/main.js b/extensions/bbcode/js/forum/src/main.js new file mode 100644 index 000000000..32f89cba1 --- /dev/null +++ b/extensions/bbcode/js/forum/src/main.js @@ -0,0 +1,6 @@ +import { extend } from 'flarum/extend'; +import app from 'flarum/app'; + +app.initializers.add('bbcode', function() { + // TODO +}); diff --git a/extensions/bbcode/less/forum/extension.less b/extensions/bbcode/less/forum/extension.less new file mode 100644 index 000000000..e69de29bb diff --git a/extensions/bbcode/locale/en.yml b/extensions/bbcode/locale/en.yml new file mode 100644 index 000000000..2d336e752 --- /dev/null +++ b/extensions/bbcode/locale/en.yml @@ -0,0 +1,2 @@ +bbcode: + # hello_world: "Hello, world!" diff --git a/extensions/bbcode/src/Extension.php b/extensions/bbcode/src/Extension.php new file mode 100644 index 000000000..1d50e6efe --- /dev/null +++ b/extensions/bbcode/src/Extension.php @@ -0,0 +1,28 @@ +subscribe('Flarum\BBCode\Listeners\AddClientAssets'); + $events->subscribe('Flarum\BBCode\Listeners\AddBBCodeFormatter'); + } + + /** + * Register the service provider. + * + * @return void + */ + public function register() + { + // + } +} diff --git a/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php b/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php new file mode 100644 index 000000000..d73cc1028 --- /dev/null +++ b/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php @@ -0,0 +1,26 @@ +listen(FormatterConfigurator::class, __CLASS__.'@addBBCodeFormatter'); + } + + public function addBBCodeFormatter(FormatterConfigurator $event) + { + $event->configurator->BBCodes->addFromRepository('B'); + $event->configurator->BBCodes->addFromRepository('I'); + $event->configurator->BBCodes->addFromRepository('U'); + $event->configurator->BBCodes->addFromRepository('S'); + $event->configurator->BBCodes->addFromRepository('URL'); + $event->configurator->BBCodes->addFromRepository('EMAIL'); + $event->configurator->BBCodes->addFromRepository('CODE'); + $event->configurator->BBCodes->addFromRepository('QUOTE'); + $event->configurator->BBCodes->addFromRepository('LIST'); + $event->configurator->BBCodes->addFromRepository('*'); + } +} diff --git a/extensions/bbcode/src/Listeners/AddClientAssets.php b/extensions/bbcode/src/Listeners/AddClientAssets.php new file mode 100644 index 000000000..a35f3e458 --- /dev/null +++ b/extensions/bbcode/src/Listeners/AddClientAssets.php @@ -0,0 +1,33 @@ +listen(RegisterLocales::class, __CLASS__.'@addLocale'); + $events->listen(BuildClientView::class, __CLASS__.'@addAssets'); + } + + public function addLocale(RegisterLocales $event) + { + $event->addTranslations('en', __DIR__.'/../../locale/en.yml'); + } + + public function addAssets(BuildClientView $event) + { + $event->forumAssets([ + __DIR__.'/../../js/forum/dist/extension.js', + __DIR__.'/../../less/forum/extension.less' + ]); + + $event->forumBootstrapper('bbcode/main'); + + $event->forumTranslations([ + // 'bbcode.hello_world' + ]); + } +} From 608d4a1a479fdd051aef29fd8400efe0c5c6e8fb Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 27 Jul 2015 11:53:55 +0930 Subject: [PATCH 02/51] PERF: avoid reinstantiation of event subscribers --- extensions/bbcode/src/Listeners/AddBBCodeFormatter.php | 2 +- extensions/bbcode/src/Listeners/AddClientAssets.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php b/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php index d73cc1028..dba0c9d1a 100644 --- a/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php +++ b/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php @@ -7,7 +7,7 @@ class AddBBCodeFormatter { public function subscribe(Dispatcher $events) { - $events->listen(FormatterConfigurator::class, __CLASS__.'@addBBCodeFormatter'); + $events->listen(FormatterConfigurator::class, [$this, 'addBBCodeFormatter']); } public function addBBCodeFormatter(FormatterConfigurator $event) diff --git a/extensions/bbcode/src/Listeners/AddClientAssets.php b/extensions/bbcode/src/Listeners/AddClientAssets.php index a35f3e458..8d2d15bec 100644 --- a/extensions/bbcode/src/Listeners/AddClientAssets.php +++ b/extensions/bbcode/src/Listeners/AddClientAssets.php @@ -8,8 +8,8 @@ class AddClientAssets { public function subscribe(Dispatcher $events) { - $events->listen(RegisterLocales::class, __CLASS__.'@addLocale'); - $events->listen(BuildClientView::class, __CLASS__.'@addAssets'); + $events->listen(RegisterLocales::class, [$this, 'addLocale']); + $events->listen(BuildClientView::class, [$this, 'addAssets']); } public function addLocale(RegisterLocales $event) From fb6e301cee714b60db797a8c076a7253f0092a74 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 27 Jul 2015 14:18:46 +0930 Subject: [PATCH 03/51] Update gulp module configuration --- extensions/bbcode/js/forum/Gulpfile.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/extensions/bbcode/js/forum/Gulpfile.js b/extensions/bbcode/js/forum/Gulpfile.js index c0f1fbb5c..3ddb4d259 100644 --- a/extensions/bbcode/js/forum/Gulpfile.js +++ b/extensions/bbcode/js/forum/Gulpfile.js @@ -1,5 +1,7 @@ var gulp = require('flarum-gulp'); gulp({ - modulePrefix: 'bbcode' + modules: { + 'bbcode': 'src/**/*.js' + } }); From 8c7a44c9ce69f82390076ae4d3282f54dc86fdd9 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 28 Jul 2015 10:14:11 +0930 Subject: [PATCH 04/51] Add IMG bbcode --- extensions/bbcode/src/Listeners/AddBBCodeFormatter.php | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php b/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php index dba0c9d1a..ffa2778b7 100644 --- a/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php +++ b/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php @@ -17,6 +17,7 @@ class AddBBCodeFormatter $event->configurator->BBCodes->addFromRepository('U'); $event->configurator->BBCodes->addFromRepository('S'); $event->configurator->BBCodes->addFromRepository('URL'); + $event->configurator->BBCodes->addFromRepository('IMG'); $event->configurator->BBCodes->addFromRepository('EMAIL'); $event->configurator->BBCodes->addFromRepository('CODE'); $event->configurator->BBCodes->addFromRepository('QUOTE'); From 06d5e1395e66c4921ba980a35cf5d6abb051517d Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 13 Aug 2015 12:48:16 +0930 Subject: [PATCH 05/51] Add icon --- extensions/bbcode/flarum.json | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/extensions/bbcode/flarum.json b/extensions/bbcode/flarum.json index 389f181fa..9a629c91c 100644 --- a/extensions/bbcode/flarum.json +++ b/extensions/bbcode/flarum.json @@ -2,7 +2,7 @@ "name": "bbcode", "title": "BBCode", "description": "Allow posts to be formatted with BBCode.", - "keywords": [], + "keywords": ["discussions"], "version": "0.1.0", "author": { "name": "Toby Zerner", @@ -12,5 +12,10 @@ "require": { "php": ">=5.4.0", "flarum": ">0.1.0" + }, + "icon": { + "name": "bold", + "backgroundColor": "#3F8A32", + "color": "#fff" } -} \ No newline at end of file +} From 6b92345e9de8182e2ed87b088d7e3dd26232a655 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 13 Aug 2015 12:48:52 +0930 Subject: [PATCH 06/51] Use new listen API --- extensions/bbcode/src/Extension.php | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/extensions/bbcode/src/Extension.php b/extensions/bbcode/src/Extension.php index 1d50e6efe..91f245fc8 100644 --- a/extensions/bbcode/src/Extension.php +++ b/extensions/bbcode/src/Extension.php @@ -5,24 +5,9 @@ use Illuminate\Events\Dispatcher; class Extension extends BaseExtension { - /** - * Bootstrap the application events. - * - * @return void - */ - public function boot(Dispatcher $events) + public function listen(Dispatcher $events) { $events->subscribe('Flarum\BBCode\Listeners\AddClientAssets'); $events->subscribe('Flarum\BBCode\Listeners\AddBBCodeFormatter'); } - - /** - * Register the service provider. - * - * @return void - */ - public function register() - { - // - } } From fb4308b0d99a354943360612b55d5447533f3302 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 4 Sep 2015 11:37:18 +0930 Subject: [PATCH 07/51] Add phpcs, Travis, clean up editorconfig and eslint --- extensions/bbcode/.editorconfig | 13 ------------- extensions/bbcode/.eslintrc | 5 +++++ extensions/bbcode/.php_cs | 27 +++++++++++++++++++++++++++ extensions/bbcode/.travis.yml | 23 +++++++++++++++++++++++ extensions/bbcode/composer.json | 3 +++ 5 files changed, 58 insertions(+), 13 deletions(-) create mode 100755 extensions/bbcode/.php_cs create mode 100644 extensions/bbcode/.travis.yml diff --git a/extensions/bbcode/.editorconfig b/extensions/bbcode/.editorconfig index 5612a5e74..87694ddab 100644 --- a/extensions/bbcode/.editorconfig +++ b/extensions/bbcode/.editorconfig @@ -12,21 +12,8 @@ insert_final_newline = true indent_style = space indent_size = 2 -[*.js] -indent_style = space -indent_size = 2 - -[*.{css,less}] -indent_style = space -indent_size = 2 - -[*.html] -indent_style = space -indent_size = 2 - [*.{diff,md}] trim_trailing_whitespace = false [*.php] -indent_style = space indent_size = 4 diff --git a/extensions/bbcode/.eslintrc b/extensions/bbcode/.eslintrc index 9cebc759d..534b50e27 100644 --- a/extensions/bbcode/.eslintrc +++ b/extensions/bbcode/.eslintrc @@ -27,7 +27,12 @@ "$": true, "moment": true }, + "plugins": [ + "react" + ], "rules": { + "react/jsx-uses-vars": 1, + /** * Strict mode */ diff --git a/extensions/bbcode/.php_cs b/extensions/bbcode/.php_cs new file mode 100755 index 000000000..c55085293 --- /dev/null +++ b/extensions/bbcode/.php_cs @@ -0,0 +1,27 @@ + + +For the full copyright and license information, please view the LICENSE +file that was distributed with this source code. +EOF; + +Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header); + +$finder = Symfony\CS\Finder\DefaultFinder::create() + ->exclude('js') + ->exclude('less') + ->in(__DIR__); + +return Symfony\CS\Config\Config::create() + ->setUsingCache(true) + ->level(Symfony\CS\FixerInterface::PSR2_LEVEL) + ->fixers([ + 'short_array_syntax', + 'header_comment', + '-psr0' + ]) + ->finder($finder); diff --git a/extensions/bbcode/.travis.yml b/extensions/bbcode/.travis.yml new file mode 100644 index 000000000..692e09f86 --- /dev/null +++ b/extensions/bbcode/.travis.yml @@ -0,0 +1,23 @@ +language: php + +php: + - 5.5 + - 5.6 + +matrix: + allow_failures: + - php: hhvm + fast_finish: true + +before_script: + - curl -s http://getcomposer.org/installer | php + - php composer.phar install + +script: + - php composer.phar style + +notifications: + email: + on_failure: change + +sudo: false diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index c3ee4d721..95f9dc5b4 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -3,5 +3,8 @@ "psr-4": { "Flarum\\BBCode\\": "src/" } + }, + "scripts": { + "style": "phpcs --standard=PSR2 -np src" } } From 134f15740b5ab1d17f96b728d6a4598ebb74544c Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 4 Sep 2015 12:07:58 +0930 Subject: [PATCH 08/51] Update flarum.json --- extensions/bbcode/flarum.json | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/extensions/bbcode/flarum.json b/extensions/bbcode/flarum.json index 9a629c91c..cf47da39c 100644 --- a/extensions/bbcode/flarum.json +++ b/extensions/bbcode/flarum.json @@ -3,19 +3,23 @@ "title": "BBCode", "description": "Allow posts to be formatted with BBCode.", "keywords": ["discussions"], - "version": "0.1.0", + "version": "0.1.0-beta.2", "author": { "name": "Toby Zerner", - "email": "toby.zerner@gmail.com" + "email": "toby@flarum.org", + "homepage": "http://tobyzerner.com" }, "license": "MIT", "require": { - "php": ">=5.4.0", - "flarum": ">0.1.0" + "flarum": ">=0.1.0-beta.2" + }, + "support": { + "source": "https://github.com/flarum/bbcode", + "issues": "https://github.com/flarum/core/issues" }, "icon": { - "name": "bold", - "backgroundColor": "#3F8A32", - "color": "#fff" + "name": "bold", + "backgroundColor": "#3F8A32", + "color": "#fff" } } From f3f315ee9e8b5095dacb5fcad229ad8cafe2dc44 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 4 Sep 2015 12:08:04 +0930 Subject: [PATCH 09/51] Update npm dependency --- extensions/bbcode/js/forum/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/js/forum/package.json b/extensions/bbcode/js/forum/package.json index 3e0ef919d..62ea6c691 100644 --- a/extensions/bbcode/js/forum/package.json +++ b/extensions/bbcode/js/forum/package.json @@ -2,6 +2,6 @@ "private": true, "devDependencies": { "gulp": "^3.8.11", - "flarum-gulp": "git+https://github.com/flarum/gulp.git" + "flarum-gulp": "^0.1.0" } } From c4ef5363c23d9600dc8d851f52e9bea05700cdb0 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 4 Sep 2015 12:33:23 +0930 Subject: [PATCH 10/51] Add LICENSE information --- extensions/bbcode/.php_cs | 1 - extensions/bbcode/LICENSE | 21 +++++++++++++++++++ extensions/bbcode/bootstrap.php | 14 ++++++++----- extensions/bbcode/src/Extension.php | 12 ++++++++++- .../src/Listeners/AddBBCodeFormatter.php | 12 ++++++++++- .../bbcode/src/Listeners/AddClientAssets.php | 12 ++++++++++- 6 files changed, 63 insertions(+), 9 deletions(-) create mode 100644 extensions/bbcode/LICENSE diff --git a/extensions/bbcode/.php_cs b/extensions/bbcode/.php_cs index c55085293..20d29c766 100755 --- a/extensions/bbcode/.php_cs +++ b/extensions/bbcode/.php_cs @@ -17,7 +17,6 @@ $finder = Symfony\CS\Finder\DefaultFinder::create() ->in(__DIR__); return Symfony\CS\Config\Config::create() - ->setUsingCache(true) ->level(Symfony\CS\FixerInterface::PSR2_LEVEL) ->fixers([ 'short_array_syntax', diff --git a/extensions/bbcode/LICENSE b/extensions/bbcode/LICENSE new file mode 100644 index 000000000..aa1e5fb86 --- /dev/null +++ b/extensions/bbcode/LICENSE @@ -0,0 +1,21 @@ +The MIT License (MIT) + +Copyright (c) 2014-2015 Toby Zerner + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/extensions/bbcode/bootstrap.php b/extensions/bbcode/bootstrap.php index c5398075a..7384ebccf 100644 --- a/extensions/bbcode/bootstrap.php +++ b/extensions/bbcode/bootstrap.php @@ -1,10 +1,14 @@ + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + require __DIR__.'/vendor/autoload.php'; -// Return the name of our Extension class. Flarum will register it as a service -// provider, allowing it to register bindings and execute code when the -// application boots. return 'Flarum\BBCode\Extension'; diff --git a/extensions/bbcode/src/Extension.php b/extensions/bbcode/src/Extension.php index 91f245fc8..3bab39caa 100644 --- a/extensions/bbcode/src/Extension.php +++ b/extensions/bbcode/src/Extension.php @@ -1,4 +1,14 @@ - + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flarum\BBCode; use Flarum\Support\Extension as BaseExtension; use Illuminate\Events\Dispatcher; diff --git a/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php b/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php index ffa2778b7..e59d3664c 100644 --- a/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php +++ b/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php @@ -1,4 +1,14 @@ - + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flarum\BBCode\Listeners; use Flarum\Events\FormatterConfigurator; use Illuminate\Contracts\Events\Dispatcher; diff --git a/extensions/bbcode/src/Listeners/AddClientAssets.php b/extensions/bbcode/src/Listeners/AddClientAssets.php index 8d2d15bec..731b5e150 100644 --- a/extensions/bbcode/src/Listeners/AddClientAssets.php +++ b/extensions/bbcode/src/Listeners/AddClientAssets.php @@ -1,4 +1,14 @@ - + * + * For the full copyright and license information, please view the LICENSE + * file that was distributed with this source code. + */ + +namespace Flarum\BBCode\Listeners; use Flarum\Events\RegisterLocales; use Flarum\Events\BuildClientView; From c472be933654e5c419d8df139bbb52c236ab2a65 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 17 Sep 2015 09:10:35 +0930 Subject: [PATCH 11/51] Add gitattributes --- extensions/bbcode/.gitattributes | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 extensions/bbcode/.gitattributes diff --git a/extensions/bbcode/.gitattributes b/extensions/bbcode/.gitattributes new file mode 100644 index 000000000..4afe79241 --- /dev/null +++ b/extensions/bbcode/.gitattributes @@ -0,0 +1,3 @@ +.gitattributes export-ignore +.gitignore export-ignore +.travis.yml export-ignore From 853e718b3e5d2b3dc5db21fa06aed296525c7bd3 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Mon, 12 Oct 2015 15:09:39 +1030 Subject: [PATCH 12/51] Update for composer branch --- extensions/bbcode/.gitignore | 2 + extensions/bbcode/bootstrap.php | 7 ++- extensions/bbcode/composer.json | 29 ++++++++++++- extensions/bbcode/flarum.json | 25 ----------- extensions/bbcode/js/.gitignore | 3 -- extensions/bbcode/js/forum/Gulpfile.js | 7 --- extensions/bbcode/js/forum/package.json | 7 --- extensions/bbcode/js/forum/src/main.js | 6 --- extensions/bbcode/less/forum/extension.less | 0 extensions/bbcode/locale/en.yml | 2 - extensions/bbcode/src/Extension.php | 23 ---------- .../FormatBBCode.php} | 16 ++++--- .../bbcode/src/Listeners/AddClientAssets.php | 43 ------------------- 13 files changed, 45 insertions(+), 125 deletions(-) delete mode 100644 extensions/bbcode/flarum.json delete mode 100644 extensions/bbcode/js/.gitignore delete mode 100644 extensions/bbcode/js/forum/Gulpfile.js delete mode 100644 extensions/bbcode/js/forum/package.json delete mode 100644 extensions/bbcode/js/forum/src/main.js delete mode 100644 extensions/bbcode/less/forum/extension.less delete mode 100644 extensions/bbcode/locale/en.yml delete mode 100644 extensions/bbcode/src/Extension.php rename extensions/bbcode/src/{Listeners/AddBBCodeFormatter.php => Listener/FormatBBCode.php} (75%) delete mode 100644 extensions/bbcode/src/Listeners/AddClientAssets.php diff --git a/extensions/bbcode/.gitignore b/extensions/bbcode/.gitignore index a4f3b125e..43eeee7fe 100644 --- a/extensions/bbcode/.gitignore +++ b/extensions/bbcode/.gitignore @@ -2,3 +2,5 @@ composer.phar .DS_Store Thumbs.db +bower_components +node_modules \ No newline at end of file diff --git a/extensions/bbcode/bootstrap.php b/extensions/bbcode/bootstrap.php index 7384ebccf..b823d21f9 100644 --- a/extensions/bbcode/bootstrap.php +++ b/extensions/bbcode/bootstrap.php @@ -9,6 +9,9 @@ * file that was distributed with this source code. */ -require __DIR__.'/vendor/autoload.php'; +use Flarum\BBCode\Listener; +use Illuminate\Contracts\Events\Dispatcher; -return 'Flarum\BBCode\Extension'; +return function (Dispatcher $events) { + $events->subscribe(Listener\FormatBBCode::class); +}; \ No newline at end of file diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index 95f9dc5b4..c5880d87c 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -1,10 +1,35 @@ { + "name": "flarum/bbcode", + "description": "Allow posts to be formatted with BBCode.", + "type": "flarum-extension", + "keywords": ["formatting"], + "license": "MIT", + "authors": [ + { + "name": "Toby Zerner", + "email": "toby.zerner@gmail.com" + } + ], + "support": { + "issues": "https://github.com/flarum/core/issues", + "source": "https://github.com/flarum/bbcode" + }, + "require": { + "flarum/core": "^0.1.0-beta.3" + }, "autoload": { "psr-4": { "Flarum\\BBCode\\": "src/" } }, - "scripts": { - "style": "phpcs --standard=PSR2 -np src" + "extra": { + "flarum-extension": { + "title": "BBCode", + "icon": { + "name": "bold", + "backgroundColor": "#238C59", + "color": "#fff" + } + } } } diff --git a/extensions/bbcode/flarum.json b/extensions/bbcode/flarum.json deleted file mode 100644 index cf47da39c..000000000 --- a/extensions/bbcode/flarum.json +++ /dev/null @@ -1,25 +0,0 @@ -{ - "name": "bbcode", - "title": "BBCode", - "description": "Allow posts to be formatted with BBCode.", - "keywords": ["discussions"], - "version": "0.1.0-beta.2", - "author": { - "name": "Toby Zerner", - "email": "toby@flarum.org", - "homepage": "http://tobyzerner.com" - }, - "license": "MIT", - "require": { - "flarum": ">=0.1.0-beta.2" - }, - "support": { - "source": "https://github.com/flarum/bbcode", - "issues": "https://github.com/flarum/core/issues" - }, - "icon": { - "name": "bold", - "backgroundColor": "#3F8A32", - "color": "#fff" - } -} diff --git a/extensions/bbcode/js/.gitignore b/extensions/bbcode/js/.gitignore deleted file mode 100644 index 372e20a51..000000000 --- a/extensions/bbcode/js/.gitignore +++ /dev/null @@ -1,3 +0,0 @@ -bower_components -node_modules -dist diff --git a/extensions/bbcode/js/forum/Gulpfile.js b/extensions/bbcode/js/forum/Gulpfile.js deleted file mode 100644 index 3ddb4d259..000000000 --- a/extensions/bbcode/js/forum/Gulpfile.js +++ /dev/null @@ -1,7 +0,0 @@ -var gulp = require('flarum-gulp'); - -gulp({ - modules: { - 'bbcode': 'src/**/*.js' - } -}); diff --git a/extensions/bbcode/js/forum/package.json b/extensions/bbcode/js/forum/package.json deleted file mode 100644 index 62ea6c691..000000000 --- a/extensions/bbcode/js/forum/package.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "private": true, - "devDependencies": { - "gulp": "^3.8.11", - "flarum-gulp": "^0.1.0" - } -} diff --git a/extensions/bbcode/js/forum/src/main.js b/extensions/bbcode/js/forum/src/main.js deleted file mode 100644 index 32f89cba1..000000000 --- a/extensions/bbcode/js/forum/src/main.js +++ /dev/null @@ -1,6 +0,0 @@ -import { extend } from 'flarum/extend'; -import app from 'flarum/app'; - -app.initializers.add('bbcode', function() { - // TODO -}); diff --git a/extensions/bbcode/less/forum/extension.less b/extensions/bbcode/less/forum/extension.less deleted file mode 100644 index e69de29bb..000000000 diff --git a/extensions/bbcode/locale/en.yml b/extensions/bbcode/locale/en.yml deleted file mode 100644 index 2d336e752..000000000 --- a/extensions/bbcode/locale/en.yml +++ /dev/null @@ -1,2 +0,0 @@ -bbcode: - # hello_world: "Hello, world!" diff --git a/extensions/bbcode/src/Extension.php b/extensions/bbcode/src/Extension.php deleted file mode 100644 index 3bab39caa..000000000 --- a/extensions/bbcode/src/Extension.php +++ /dev/null @@ -1,23 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flarum\BBCode; - -use Flarum\Support\Extension as BaseExtension; -use Illuminate\Events\Dispatcher; - -class Extension extends BaseExtension -{ - public function listen(Dispatcher $events) - { - $events->subscribe('Flarum\BBCode\Listeners\AddClientAssets'); - $events->subscribe('Flarum\BBCode\Listeners\AddBBCodeFormatter'); - } -} diff --git a/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php b/extensions/bbcode/src/Listener/FormatBBCode.php similarity index 75% rename from extensions/bbcode/src/Listeners/AddBBCodeFormatter.php rename to extensions/bbcode/src/Listener/FormatBBCode.php index e59d3664c..b08e4d673 100644 --- a/extensions/bbcode/src/Listeners/AddBBCodeFormatter.php +++ b/extensions/bbcode/src/Listener/FormatBBCode.php @@ -8,19 +8,25 @@ * file that was distributed with this source code. */ -namespace Flarum\BBCode\Listeners; +namespace Flarum\BBCode\Listener; -use Flarum\Events\FormatterConfigurator; +use Flarum\Event\ConfigureFormatter; use Illuminate\Contracts\Events\Dispatcher; -class AddBBCodeFormatter +class FormatBBCode { + /** + * @param Dispatcher $events + */ public function subscribe(Dispatcher $events) { - $events->listen(FormatterConfigurator::class, [$this, 'addBBCodeFormatter']); + $events->listen(ConfigureFormatter::class, [$this, 'addBBCodeFormatter']); } - public function addBBCodeFormatter(FormatterConfigurator $event) + /** + * @param ConfigureFormatter $event + */ + public function addBBCodeFormatter(ConfigureFormatter $event) { $event->configurator->BBCodes->addFromRepository('B'); $event->configurator->BBCodes->addFromRepository('I'); diff --git a/extensions/bbcode/src/Listeners/AddClientAssets.php b/extensions/bbcode/src/Listeners/AddClientAssets.php deleted file mode 100644 index 731b5e150..000000000 --- a/extensions/bbcode/src/Listeners/AddClientAssets.php +++ /dev/null @@ -1,43 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flarum\BBCode\Listeners; - -use Flarum\Events\RegisterLocales; -use Flarum\Events\BuildClientView; -use Illuminate\Contracts\Events\Dispatcher; - -class AddClientAssets -{ - public function subscribe(Dispatcher $events) - { - $events->listen(RegisterLocales::class, [$this, 'addLocale']); - $events->listen(BuildClientView::class, [$this, 'addAssets']); - } - - public function addLocale(RegisterLocales $event) - { - $event->addTranslations('en', __DIR__.'/../../locale/en.yml'); - } - - public function addAssets(BuildClientView $event) - { - $event->forumAssets([ - __DIR__.'/../../js/forum/dist/extension.js', - __DIR__.'/../../less/forum/extension.less' - ]); - - $event->forumBootstrapper('bbcode/main'); - - $event->forumTranslations([ - // 'bbcode.hello_world' - ]); - } -} From ffb9f7a34d5dc42d3106134c6f6c38675b801c8a Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 29 Dec 2015 12:54:51 +1030 Subject: [PATCH 13/51] Rename package --- extensions/bbcode/composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index c5880d87c..be97c3f89 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -1,5 +1,5 @@ { - "name": "flarum/bbcode", + "name": "flarum/flarum-ext-bbcode", "description": "Allow posts to be formatted with BBCode.", "type": "flarum-extension", "keywords": ["formatting"], @@ -12,7 +12,7 @@ ], "support": { "issues": "https://github.com/flarum/core/issues", - "source": "https://github.com/flarum/bbcode" + "source": "https://github.com/flarum/flarum-ext-bbcode" }, "require": { "flarum/core": "^0.1.0-beta.3" From b41ad78266316235abe888d12ba1a95c33ce0959 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 19 Jan 2016 17:19:46 +1030 Subject: [PATCH 14/51] Add Composer branch-alias This allows installations to require version 0.1.0 with minimum-stability=dev, and they will get the latest from master. See flarum/core#727 --- extensions/bbcode/composer.json | 3 +++ 1 file changed, 3 insertions(+) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index be97c3f89..a66873014 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -23,6 +23,9 @@ } }, "extra": { + "branch-alias": { + "dev-master": "0.1.x-dev" + }, "flarum-extension": { "title": "BBCode", "icon": { From ac69b264301d64dfc1b65711cb8d00dfb7ba57ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ma=C3=ABl=20Soucaze?= Date: Mon, 25 Jan 2016 16:50:30 +0100 Subject: [PATCH 15/51] Update license year range to 2016 --- extensions/bbcode/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/LICENSE b/extensions/bbcode/LICENSE index aa1e5fb86..a502a8545 100644 --- a/extensions/bbcode/LICENSE +++ b/extensions/bbcode/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2015 Toby Zerner +Copyright (c) 2014-2016 Toby Zerner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From c86ac304b4144fad5f6e560d0c0d2db71655f705 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 26 Feb 2016 14:01:42 +1030 Subject: [PATCH 16/51] Add StyleCI config --- extensions/bbcode/.styleci.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 extensions/bbcode/.styleci.yml diff --git a/extensions/bbcode/.styleci.yml b/extensions/bbcode/.styleci.yml new file mode 100644 index 000000000..00617d9b0 --- /dev/null +++ b/extensions/bbcode/.styleci.yml @@ -0,0 +1,13 @@ +preset: recommended + +enabled: + - logical_not_operators_with_successor_space + +disabled: + - align_double_arrow + - multiline_array_trailing_comma + - new_with_braces + - phpdoc_align + - phpdoc_order + - phpdoc_separation + - phpdoc_types From 41952d54fd5933721ce0a7f2ad80faacb1d30e65 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 25 Feb 2016 22:51:09 -0500 Subject: [PATCH 17/51] Applied fixes from StyleCI --- extensions/bbcode/bootstrap.php | 2 +- extensions/bbcode/src/Listener/FormatBBCode.php | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/extensions/bbcode/bootstrap.php b/extensions/bbcode/bootstrap.php index b823d21f9..c4e50e795 100644 --- a/extensions/bbcode/bootstrap.php +++ b/extensions/bbcode/bootstrap.php @@ -14,4 +14,4 @@ use Illuminate\Contracts\Events\Dispatcher; return function (Dispatcher $events) { $events->subscribe(Listener\FormatBBCode::class); -}; \ No newline at end of file +}; diff --git a/extensions/bbcode/src/Listener/FormatBBCode.php b/extensions/bbcode/src/Listener/FormatBBCode.php index b08e4d673..003fe859d 100644 --- a/extensions/bbcode/src/Listener/FormatBBCode.php +++ b/extensions/bbcode/src/Listener/FormatBBCode.php @@ -1,4 +1,5 @@ - Date: Wed, 2 Mar 2016 23:22:09 -0500 Subject: [PATCH 18/51] Add more BBCode tags --- extensions/bbcode/src/Listener/FormatBBCode.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/bbcode/src/Listener/FormatBBCode.php b/extensions/bbcode/src/Listener/FormatBBCode.php index 003fe859d..309a33c56 100644 --- a/extensions/bbcode/src/Listener/FormatBBCode.php +++ b/extensions/bbcode/src/Listener/FormatBBCode.php @@ -39,6 +39,10 @@ class FormatBBCode $event->configurator->BBCodes->addFromRepository('CODE'); $event->configurator->BBCodes->addFromRepository('QUOTE'); $event->configurator->BBCodes->addFromRepository('LIST'); + $event->configurator->BBCodes->addFromRepository('DEL'); + $event->configurator->BBCodes->addFromRepository('COLOR'); + $event->configurator->BBCodes->addFromRepository('CENTER'); + $event->configurator->BBCodes->addFromRepository('SIZE'); $event->configurator->BBCodes->addFromRepository('*'); } } From 185e0c934f8e01cdb19d17e10bdd6d298f1fe05a Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 10 Mar 2016 17:23:04 +1030 Subject: [PATCH 19/51] Clean up linting stuff --- extensions/bbcode/.eslintignore | 5 - extensions/bbcode/.eslintrc | 176 -------------------------------- extensions/bbcode/.php_cs | 26 ----- extensions/bbcode/.travis.yml | 23 ----- 4 files changed, 230 deletions(-) delete mode 100644 extensions/bbcode/.eslintignore delete mode 100644 extensions/bbcode/.eslintrc delete mode 100755 extensions/bbcode/.php_cs delete mode 100644 extensions/bbcode/.travis.yml diff --git a/extensions/bbcode/.eslintignore b/extensions/bbcode/.eslintignore deleted file mode 100644 index 86b7c8854..000000000 --- a/extensions/bbcode/.eslintignore +++ /dev/null @@ -1,5 +0,0 @@ -**/bower_components/**/* -**/node_modules/**/* -vendor/**/* -**/Gulpfile.js -**/dist/**/* diff --git a/extensions/bbcode/.eslintrc b/extensions/bbcode/.eslintrc deleted file mode 100644 index 534b50e27..000000000 --- a/extensions/bbcode/.eslintrc +++ /dev/null @@ -1,176 +0,0 @@ -{ - "parser": "babel-eslint", // https://github.com/babel/babel-eslint - "env": { // http://eslint.org/docs/user-guide/configuring.html#specifying-environments - "browser": true // browser global variables - }, - "ecmaFeatures": { - "arrowFunctions": true, - "blockBindings": true, - "classes": true, - "defaultParams": true, - "destructuring": true, - "forOf": true, - "generators": false, - "modules": true, - "objectLiteralComputedProperties": true, - "objectLiteralDuplicateProperties": false, - "objectLiteralShorthandMethods": true, - "objectLiteralShorthandProperties": true, - "spread": true, - "superInFunctions": true, - "templateStrings": true, - "jsx": true - }, - "globals": { - "m": true, - "app": true, - "$": true, - "moment": true - }, - "plugins": [ - "react" - ], - "rules": { - "react/jsx-uses-vars": 1, - -/** - * Strict mode - */ - // babel inserts "use strict"; for us - "strict": [2, "never"], // http://eslint.org/docs/rules/strict - -/** - * ES6 - */ - "no-var": 2, // http://eslint.org/docs/rules/no-var - "prefer-const": 2, // http://eslint.org/docs/rules/prefer-const - -/** - * Variables - */ - "no-shadow": 2, // http://eslint.org/docs/rules/no-shadow - "no-shadow-restricted-names": 2, // http://eslint.org/docs/rules/no-shadow-restricted-names - "no-unused-vars": [2, { // http://eslint.org/docs/rules/no-unused-vars - "vars": "local", - "args": "after-used" - }], - "no-use-before-define": 2, // http://eslint.org/docs/rules/no-use-before-define - -/** - * Possible errors - */ - "comma-dangle": [2, "never"], // http://eslint.org/docs/rules/comma-dangle - "no-cond-assign": [2, "always"], // http://eslint.org/docs/rules/no-cond-assign - "no-console": 1, // http://eslint.org/docs/rules/no-console - "no-debugger": 1, // http://eslint.org/docs/rules/no-debugger - "no-alert": 1, // http://eslint.org/docs/rules/no-alert - "no-constant-condition": 1, // http://eslint.org/docs/rules/no-constant-condition - "no-dupe-keys": 2, // http://eslint.org/docs/rules/no-dupe-keys - "no-duplicate-case": 2, // http://eslint.org/docs/rules/no-duplicate-case - "no-empty": 2, // http://eslint.org/docs/rules/no-empty - "no-ex-assign": 2, // http://eslint.org/docs/rules/no-ex-assign - "no-extra-boolean-cast": 0, // http://eslint.org/docs/rules/no-extra-boolean-cast - "no-extra-semi": 2, // http://eslint.org/docs/rules/no-extra-semi - "no-func-assign": 2, // http://eslint.org/docs/rules/no-func-assign - "no-inner-declarations": 2, // http://eslint.org/docs/rules/no-inner-declarations - "no-invalid-regexp": 2, // http://eslint.org/docs/rules/no-invalid-regexp - "no-irregular-whitespace": 2, // http://eslint.org/docs/rules/no-irregular-whitespace - "no-obj-calls": 2, // http://eslint.org/docs/rules/no-obj-calls - "no-reserved-keys": 2, // http://eslint.org/docs/rules/no-reserved-keys - "no-sparse-arrays": 2, // http://eslint.org/docs/rules/no-sparse-arrays - "no-unreachable": 2, // http://eslint.org/docs/rules/no-unreachable - "use-isnan": 2, // http://eslint.org/docs/rules/use-isnan - "block-scoped-var": 2, // http://eslint.org/docs/rules/block-scoped-var - -/** - * Best practices - */ - "consistent-return": 2, // http://eslint.org/docs/rules/consistent-return - "curly": [2, "multi-line"], // http://eslint.org/docs/rules/curly - "default-case": 2, // http://eslint.org/docs/rules/default-case - "dot-notation": [2, { // http://eslint.org/docs/rules/dot-notation - "allowKeywords": true - }], - "eqeqeq": 2, // http://eslint.org/docs/rules/eqeqeq - "no-caller": 2, // http://eslint.org/docs/rules/no-caller - "no-else-return": 2, // http://eslint.org/docs/rules/no-else-return - "no-eq-null": 2, // http://eslint.org/docs/rules/no-eq-null - "no-eval": 2, // http://eslint.org/docs/rules/no-eval - "no-extend-native": 2, // http://eslint.org/docs/rules/no-extend-native - "no-extra-bind": 2, // http://eslint.org/docs/rules/no-extra-bind - "no-fallthrough": 2, // http://eslint.org/docs/rules/no-fallthrough - "no-floating-decimal": 2, // http://eslint.org/docs/rules/no-floating-decimal - "no-implied-eval": 2, // http://eslint.org/docs/rules/no-implied-eval - "no-lone-blocks": 2, // http://eslint.org/docs/rules/no-lone-blocks - "no-loop-func": 2, // http://eslint.org/docs/rules/no-loop-func - "no-multi-str": 2, // http://eslint.org/docs/rules/no-multi-str - "no-native-reassign": 2, // http://eslint.org/docs/rules/no-native-reassign - "no-new": 2, // http://eslint.org/docs/rules/no-new - "no-new-func": 2, // http://eslint.org/docs/rules/no-new-func - "no-new-wrappers": 2, // http://eslint.org/docs/rules/no-new-wrappers - "no-octal": 2, // http://eslint.org/docs/rules/no-octal - "no-octal-escape": 2, // http://eslint.org/docs/rules/no-octal-escape - "no-param-reassign": 2, // http://eslint.org/docs/rules/no-param-reassign - "no-proto": 2, // http://eslint.org/docs/rules/no-proto - "no-redeclare": 2, // http://eslint.org/docs/rules/no-redeclare - "no-return-assign": 2, // http://eslint.org/docs/rules/no-return-assign - "no-self-compare": 2, // http://eslint.org/docs/rules/no-self-compare - "no-sequences": 2, // http://eslint.org/docs/rules/no-sequences - "no-throw-literal": 2, // http://eslint.org/docs/rules/no-throw-literal - "no-with": 2, // http://eslint.org/docs/rules/no-with - "radix": 2, // http://eslint.org/docs/rules/radix - "vars-on-top": 2, // http://eslint.org/docs/rules/vars-on-top - "wrap-iife": [2, "any"], // http://eslint.org/docs/rules/wrap-iife - "yoda": 2, // http://eslint.org/docs/rules/yoda - -/** - * Style - */ - "indent": [2, 2], // http://eslint.org/docs/rules/indent - "brace-style": [2, // http://eslint.org/docs/rules/brace-style - "1tbs", { - "allowSingleLine": true - }], - "quotes": [ - 2, "single", "avoid-escape" // http://eslint.org/docs/rules/quotes - ], - "camelcase": [2, { // http://eslint.org/docs/rules/camelcase - "properties": "never" - }], - "comma-spacing": [2, { // http://eslint.org/docs/rules/comma-spacing - "before": false, - "after": true - }], - "comma-style": [2, "last"], // http://eslint.org/docs/rules/comma-style - "eol-last": 2, // http://eslint.org/docs/rules/eol-last - "func-names": 1, // http://eslint.org/docs/rules/func-names - "key-spacing": [2, { // http://eslint.org/docs/rules/key-spacing - "beforeColon": false, - "afterColon": true - }], - "new-cap": [2, { // http://eslint.org/docs/rules/new-cap - "newIsCap": true - }], - "no-multiple-empty-lines": [2, { // http://eslint.org/docs/rules/no-multiple-empty-lines - "max": 2 - }], - "no-new-object": 2, // http://eslint.org/docs/rules/no-new-object - "no-spaced-func": 2, // http://eslint.org/docs/rules/no-spaced-func - "no-trailing-spaces": 2, // http://eslint.org/docs/rules/no-trailing-spaces - "no-wrap-func": 2, // http://eslint.org/docs/rules/no-wrap-func - "no-underscore-dangle": 0, // http://eslint.org/docs/rules/no-underscore-dangle - "one-var": [2, "never"], // http://eslint.org/docs/rules/one-var - "padded-blocks": [2, "never"], // http://eslint.org/docs/rules/padded-blocks - "semi": [2, "always"], // http://eslint.org/docs/rules/semi - "semi-spacing": [2, { // http://eslint.org/docs/rules/semi-spacing - "before": false, - "after": true - }], - "space-after-keywords": 2, // http://eslint.org/docs/rules/space-after-keywords - "space-before-blocks": 2, // http://eslint.org/docs/rules/space-before-blocks - "space-before-function-paren": [2, "never"], // http://eslint.org/docs/rules/space-before-function-paren - "space-infix-ops": 2, // http://eslint.org/docs/rules/space-infix-ops - "space-return-throw-case": 2, // http://eslint.org/docs/rules/space-return-throw-case - "spaced-line-comment": 2, // http://eslint.org/docs/rules/spaced-line-comment - } -} diff --git a/extensions/bbcode/.php_cs b/extensions/bbcode/.php_cs deleted file mode 100755 index 20d29c766..000000000 --- a/extensions/bbcode/.php_cs +++ /dev/null @@ -1,26 +0,0 @@ - - -For the full copyright and license information, please view the LICENSE -file that was distributed with this source code. -EOF; - -Symfony\CS\Fixer\Contrib\HeaderCommentFixer::setHeader($header); - -$finder = Symfony\CS\Finder\DefaultFinder::create() - ->exclude('js') - ->exclude('less') - ->in(__DIR__); - -return Symfony\CS\Config\Config::create() - ->level(Symfony\CS\FixerInterface::PSR2_LEVEL) - ->fixers([ - 'short_array_syntax', - 'header_comment', - '-psr0' - ]) - ->finder($finder); diff --git a/extensions/bbcode/.travis.yml b/extensions/bbcode/.travis.yml deleted file mode 100644 index 692e09f86..000000000 --- a/extensions/bbcode/.travis.yml +++ /dev/null @@ -1,23 +0,0 @@ -language: php - -php: - - 5.5 - - 5.6 - -matrix: - allow_failures: - - php: hhvm - fast_finish: true - -before_script: - - curl -s http://getcomposer.org/installer | php - - php composer.phar install - -script: - - php composer.phar style - -notifications: - email: - on_failure: change - -sudo: false From 29db39b47b5d2292cf91be24e18b268aa6f446df Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Tue, 29 Mar 2016 18:44:20 +1030 Subject: [PATCH 20/51] Require core v0.1.0-beta.5 --- extensions/bbcode/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index a66873014..aade01b63 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -15,7 +15,7 @@ "source": "https://github.com/flarum/flarum-ext-bbcode" }, "require": { - "flarum/core": "^0.1.0-beta.3" + "flarum/core": "^0.1.0-beta.5" }, "autoload": { "psr-4": { From a61b0ab2f1162078716a303e984cf8a68e4b716c Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 19 Oct 2016 21:12:43 +1030 Subject: [PATCH 21/51] v0.1.0-beta.6 --- extensions/bbcode/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index aade01b63..a138c8afd 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -15,7 +15,7 @@ "source": "https://github.com/flarum/flarum-ext-bbcode" }, "require": { - "flarum/core": "^0.1.0-beta.5" + "flarum/core": "^0.1.0-beta.6" }, "autoload": { "psr-4": { From 3445b2e5b6d8aa37be8c606cd453eedfdab96ea5 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 16 Nov 2016 15:46:06 +1030 Subject: [PATCH 22/51] Update StyleCI rules --- extensions/bbcode/.styleci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/extensions/bbcode/.styleci.yml b/extensions/bbcode/.styleci.yml index 00617d9b0..8806a5402 100644 --- a/extensions/bbcode/.styleci.yml +++ b/extensions/bbcode/.styleci.yml @@ -5,6 +5,7 @@ enabled: disabled: - align_double_arrow + - blank_line_after_opening_tag - multiline_array_trailing_comma - new_with_braces - phpdoc_align From 74e38f3bfd71f0fbf68b6fb001c5a72037f6d6a3 Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Sun, 1 Jan 2017 22:49:41 +0100 Subject: [PATCH 23/51] Update year --- extensions/bbcode/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/LICENSE b/extensions/bbcode/LICENSE index a502a8545..1e346ea06 100644 --- a/extensions/bbcode/LICENSE +++ b/extensions/bbcode/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2016 Toby Zerner +Copyright (c) 2014-2017 Toby Zerner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 30cbe766438ae993c135e852ab90aca5b4fa25ba Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sun, 1 Oct 2017 19:57:12 +0200 Subject: [PATCH 24/51] Update namespaces for beta 8 Refs flarum/core#1235. --- extensions/bbcode/src/Listener/FormatBBCode.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/bbcode/src/Listener/FormatBBCode.php b/extensions/bbcode/src/Listener/FormatBBCode.php index 309a33c56..58d39a41e 100644 --- a/extensions/bbcode/src/Listener/FormatBBCode.php +++ b/extensions/bbcode/src/Listener/FormatBBCode.php @@ -11,7 +11,7 @@ namespace Flarum\BBCode\Listener; -use Flarum\Event\ConfigureFormatter; +use Flarum\Formatter\Event\Configuring; use Illuminate\Contracts\Events\Dispatcher; class FormatBBCode @@ -21,13 +21,13 @@ class FormatBBCode */ public function subscribe(Dispatcher $events) { - $events->listen(ConfigureFormatter::class, [$this, 'addBBCodeFormatter']); + $events->listen(Configuring::class, [$this, 'addBBCodeFormatter']); } /** - * @param ConfigureFormatter $event + * @param Configuring $event */ - public function addBBCodeFormatter(ConfigureFormatter $event) + public function addBBCodeFormatter(Configuring $event) { $event->configurator->BBCodes->addFromRepository('B'); $event->configurator->BBCodes->addFromRepository('I'); From 3b030db1737ab5276e62f24c28dfea979355ad7a Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Wed, 3 Jan 2018 08:00:00 +0100 Subject: [PATCH 25/51] Use new extenders for bootstrapping --- extensions/bbcode/bootstrap.php | 26 ++++++++-- extensions/bbcode/composer.json | 5 -- .../bbcode/src/Listener/FormatBBCode.php | 48 ------------------- 3 files changed, 21 insertions(+), 58 deletions(-) delete mode 100644 extensions/bbcode/src/Listener/FormatBBCode.php diff --git a/extensions/bbcode/bootstrap.php b/extensions/bbcode/bootstrap.php index c4e50e795..ef0368b98 100644 --- a/extensions/bbcode/bootstrap.php +++ b/extensions/bbcode/bootstrap.php @@ -9,9 +9,25 @@ * file that was distributed with this source code. */ -use Flarum\BBCode\Listener; -use Illuminate\Contracts\Events\Dispatcher; +use Flarum\Extend; +use s9e\TextFormatter\Configurator; -return function (Dispatcher $events) { - $events->subscribe(Listener\FormatBBCode::class); -}; +return [ + new Extend\FormatterConfiguration(function (Configurator $config) { + $config->BBCodes->addFromRepository('B'); + $config->BBCodes->addFromRepository('I'); + $config->BBCodes->addFromRepository('U'); + $config->BBCodes->addFromRepository('S'); + $config->BBCodes->addFromRepository('URL'); + $config->BBCodes->addFromRepository('IMG'); + $config->BBCodes->addFromRepository('EMAIL'); + $config->BBCodes->addFromRepository('CODE'); + $config->BBCodes->addFromRepository('QUOTE'); + $config->BBCodes->addFromRepository('LIST'); + $config->BBCodes->addFromRepository('DEL'); + $config->BBCodes->addFromRepository('COLOR'); + $config->BBCodes->addFromRepository('CENTER'); + $config->BBCodes->addFromRepository('SIZE'); + $config->BBCodes->addFromRepository('*'); + }) +]; diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index a138c8afd..ebf3f65da 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -17,11 +17,6 @@ "require": { "flarum/core": "^0.1.0-beta.6" }, - "autoload": { - "psr-4": { - "Flarum\\BBCode\\": "src/" - } - }, "extra": { "branch-alias": { "dev-master": "0.1.x-dev" diff --git a/extensions/bbcode/src/Listener/FormatBBCode.php b/extensions/bbcode/src/Listener/FormatBBCode.php deleted file mode 100644 index 58d39a41e..000000000 --- a/extensions/bbcode/src/Listener/FormatBBCode.php +++ /dev/null @@ -1,48 +0,0 @@ - - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. - */ - -namespace Flarum\BBCode\Listener; - -use Flarum\Formatter\Event\Configuring; -use Illuminate\Contracts\Events\Dispatcher; - -class FormatBBCode -{ - /** - * @param Dispatcher $events - */ - public function subscribe(Dispatcher $events) - { - $events->listen(Configuring::class, [$this, 'addBBCodeFormatter']); - } - - /** - * @param Configuring $event - */ - public function addBBCodeFormatter(Configuring $event) - { - $event->configurator->BBCodes->addFromRepository('B'); - $event->configurator->BBCodes->addFromRepository('I'); - $event->configurator->BBCodes->addFromRepository('U'); - $event->configurator->BBCodes->addFromRepository('S'); - $event->configurator->BBCodes->addFromRepository('URL'); - $event->configurator->BBCodes->addFromRepository('IMG'); - $event->configurator->BBCodes->addFromRepository('EMAIL'); - $event->configurator->BBCodes->addFromRepository('CODE'); - $event->configurator->BBCodes->addFromRepository('QUOTE'); - $event->configurator->BBCodes->addFromRepository('LIST'); - $event->configurator->BBCodes->addFromRepository('DEL'); - $event->configurator->BBCodes->addFromRepository('COLOR'); - $event->configurator->BBCodes->addFromRepository('CENTER'); - $event->configurator->BBCodes->addFromRepository('SIZE'); - $event->configurator->BBCodes->addFromRepository('*'); - } -} From f1342aa0cb8a40421208f355db260c88a1c41357 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Thu, 11 Jan 2018 12:23:55 +1030 Subject: [PATCH 26/51] Require beta 8 --- extensions/bbcode/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index ebf3f65da..3c50f4a51 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -15,7 +15,7 @@ "source": "https://github.com/flarum/flarum-ext-bbcode" }, "require": { - "flarum/core": "^0.1.0-beta.6" + "flarum/core": "^0.1.0-beta.8" }, "extra": { "branch-alias": { From 256924706ddd815f701f382521d322f321044c6a Mon Sep 17 00:00:00 2001 From: Miles Cellar Date: Mon, 15 Jan 2018 19:34:03 +0100 Subject: [PATCH 27/51] Update license year range to 2018 --- extensions/bbcode/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/LICENSE b/extensions/bbcode/LICENSE index 1e346ea06..e6288c67a 100644 --- a/extensions/bbcode/LICENSE +++ b/extensions/bbcode/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2017 Toby Zerner +Copyright (c) 2014-2018 Toby Zerner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 14e093994757100f5490d59013eb885247bb2ac0 Mon Sep 17 00:00:00 2001 From: AFR Date: Sat, 24 Feb 2018 05:44:26 +0700 Subject: [PATCH 28/51] Adapt to FontAwesome v5.0.6 icon name changes (#7) --- extensions/bbcode/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index 3c50f4a51..69c610f1f 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -24,7 +24,7 @@ "flarum-extension": { "title": "BBCode", "icon": { - "name": "bold", + "name": "fa fa-bold", "backgroundColor": "#238C59", "color": "#fff" } From 1fcb84ebd3512168554fe06ed18c79cacafcbd45 Mon Sep 17 00:00:00 2001 From: Ammar Fadhlur Rahman Date: Thu, 10 May 2018 14:56:52 +0700 Subject: [PATCH 29/51] Change fa icon prefix to fas --- extensions/bbcode/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index 69c610f1f..c2964e3dd 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -24,7 +24,7 @@ "flarum-extension": { "title": "BBCode", "icon": { - "name": "fa fa-bold", + "name": "fas fa-bold", "backgroundColor": "#238C59", "color": "#fff" } From a4f71bae31b18056899da1b9abbff01effbcdeeb Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Sun, 17 Jun 2018 15:00:15 +0930 Subject: [PATCH 30/51] Use new Formatter extender --- extensions/bbcode/bootstrap.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/extensions/bbcode/bootstrap.php b/extensions/bbcode/bootstrap.php index ef0368b98..419f2661d 100644 --- a/extensions/bbcode/bootstrap.php +++ b/extensions/bbcode/bootstrap.php @@ -12,8 +12,8 @@ use Flarum\Extend; use s9e\TextFormatter\Configurator; -return [ - new Extend\FormatterConfiguration(function (Configurator $config) { +return (new Extend\Formatter) + ->configure(function (Configurator $config) { $config->BBCodes->addFromRepository('B'); $config->BBCodes->addFromRepository('I'); $config->BBCodes->addFromRepository('U'); @@ -29,5 +29,4 @@ return [ $config->BBCodes->addFromRepository('CENTER'); $config->BBCodes->addFromRepository('SIZE'); $config->BBCodes->addFromRepository('*'); - }) -]; + }); From 0944d34cc39b4a67e1f9dc666a7e563b2c864c1b Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Fri, 21 Sep 2018 11:44:32 +0930 Subject: [PATCH 31/51] Rename bootstrap.php --- extensions/bbcode/{bootstrap.php => extend.php} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename extensions/bbcode/{bootstrap.php => extend.php} (100%) diff --git a/extensions/bbcode/bootstrap.php b/extensions/bbcode/extend.php similarity index 100% rename from extensions/bbcode/bootstrap.php rename to extensions/bbcode/extend.php From 79fe257ad439b32b58000214d162e8f6828fced8 Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 17 Oct 2018 13:44:47 +1030 Subject: [PATCH 32/51] Rename package --- extensions/bbcode/composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index c2964e3dd..7d9531a77 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -1,5 +1,5 @@ { - "name": "flarum/flarum-ext-bbcode", + "name": "flarum/bbcode", "description": "Allow posts to be formatted with BBCode.", "type": "flarum-extension", "keywords": ["formatting"], @@ -12,7 +12,7 @@ ], "support": { "issues": "https://github.com/flarum/core/issues", - "source": "https://github.com/flarum/flarum-ext-bbcode" + "source": "https://github.com/flarum/bbcode" }, "require": { "flarum/core": "^0.1.0-beta.8" From d4959d24fc889d695ba4bca848080bc082ccb35b Mon Sep 17 00:00:00 2001 From: Toby Zerner Date: Wed, 21 Nov 2018 18:37:20 +1030 Subject: [PATCH 33/51] Remove copyright year from LICENSE --- extensions/bbcode/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/LICENSE b/extensions/bbcode/LICENSE index e6288c67a..8630ec76f 100644 --- a/extensions/bbcode/LICENSE +++ b/extensions/bbcode/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2014-2018 Toby Zerner +Copyright (c) Toby Zerner Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 4e43223d83b947a6c0469506e56720b0ec960e74 Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Sat, 30 Nov 2019 00:00:59 +0100 Subject: [PATCH 34/51] Update copyright claims in LICENSE --- extensions/bbcode/LICENSE | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/extensions/bbcode/LICENSE b/extensions/bbcode/LICENSE index 8630ec76f..86cf0b3ce 100644 --- a/extensions/bbcode/LICENSE +++ b/extensions/bbcode/LICENSE @@ -1,6 +1,7 @@ The MIT License (MIT) -Copyright (c) Toby Zerner +Copyright (c) 2019 Stichting Flarum (Flarum Foundation) +Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal From 2a092ae212f1fb3a96773f2d7f300e979ba4552e Mon Sep 17 00:00:00 2001 From: Franz Liedke Date: Fri, 29 Nov 2019 23:01:47 +0000 Subject: [PATCH 35/51] Apply fixes from StyleCI --- extensions/bbcode/extend.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/extensions/bbcode/extend.php b/extensions/bbcode/extend.php index 419f2661d..7783be0cf 100644 --- a/extensions/bbcode/extend.php +++ b/extensions/bbcode/extend.php @@ -3,10 +3,8 @@ /* * This file is part of Flarum. * - * (c) Toby Zerner - * - * For the full copyright and license information, please view the LICENSE - * file that was distributed with this source code. + * For detailed copyright and license information, please view the + * LICENSE file that was distributed with this source code. */ use Flarum\Extend; From 2813bc79ed7f961e1fb611d42c86a83cc80fa4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Wed, 4 Mar 2020 12:08:08 +0100 Subject: [PATCH 36/51] update deps, remove author --- extensions/bbcode/composer.json | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index 7d9531a77..c9b379edd 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -4,18 +4,12 @@ "type": "flarum-extension", "keywords": ["formatting"], "license": "MIT", - "authors": [ - { - "name": "Toby Zerner", - "email": "toby.zerner@gmail.com" - } - ], "support": { "issues": "https://github.com/flarum/core/issues", "source": "https://github.com/flarum/bbcode" }, "require": { - "flarum/core": "^0.1.0-beta.8" + "flarum/core": "^0.1.0-beta.12" }, "extra": { "branch-alias": { From 74dce3243f9f700eeacc0bd184f7eb99f87ea9c1 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Wed, 25 Nov 2020 01:10:43 -0500 Subject: [PATCH 37/51] Add composer metadata for admin ux redesign --- extensions/bbcode/composer.json | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index c9b379edd..964f2c4b6 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -17,6 +17,12 @@ }, "flarum-extension": { "title": "BBCode", + "category": "formatting", + "info": { + "donate": "https://flarum.org/donate/", + "website": "https://flarum.org", + "support": "https://discuss.flarum.org" + }, "icon": { "name": "fas fa-bold", "backgroundColor": "#238C59", From 15d0ff707efbe6dc305741246efe5b3a74bc0bd5 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Tue, 8 Dec 2020 19:53:48 -0500 Subject: [PATCH 38/51] Update composer metadata for admin dashboard --- extensions/bbcode/composer.json | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index 964f2c4b6..623533e9a 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -6,8 +6,16 @@ "license": "MIT", "support": { "issues": "https://github.com/flarum/core/issues", - "source": "https://github.com/flarum/bbcode" + "source": "https://github.com/flarum/bbcode", + "forum": "https://discuss.flarum.org" }, + "homepage": "https://flarum.org", + "funding": [ + { + "type": "website", + "url": "https://flarum.org/donate/" + } + ], "require": { "flarum/core": "^0.1.0-beta.12" }, @@ -18,11 +26,6 @@ "flarum-extension": { "title": "BBCode", "category": "formatting", - "info": { - "donate": "https://flarum.org/donate/", - "website": "https://flarum.org", - "support": "https://discuss.flarum.org" - }, "icon": { "name": "fas fa-bold", "backgroundColor": "#238C59", From 2cc8bf607ca4b514dc01a2b367b4464422daf62b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20Klabbers?= Date: Mon, 14 Dec 2020 21:15:22 +0100 Subject: [PATCH 39/51] changelog and constraint for beta 15 --- extensions/bbcode/CHANGELOG.md | 15 +++++++++++++++ extensions/bbcode/composer.json | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 extensions/bbcode/CHANGELOG.md diff --git a/extensions/bbcode/CHANGELOG.md b/extensions/bbcode/CHANGELOG.md new file mode 100644 index 000000000..6fbea6d28 --- /dev/null +++ b/extensions/bbcode/CHANGELOG.md @@ -0,0 +1,15 @@ +## [0.1.0-beta.15](https://github.com/flarum/bbcode/compare/v0.1.0-beta.12...v0.1.0-beta.15) + +### Changed +- Updated composer.json for new admin area. + +## [0.1.0-beta.8](https://github.com/flarum/bbcode/compare/v0.1.0-beta.5...v0.1.0-beta.8) + +### Changed +- Update for beta 8 +- Drop `flarum-ext-` prefix from package name ([5d47da1](https://github.com/flarum/bbcode/commit/5d47da142a3e340190dc37e461090226dddcf0cd)) + +## [0.1.0-beta.5](https://github.com/flarum/bbcode/compare/v0.1.0-beta.3...v0.1.0-beta.5) + +### Added +- New BBCode tags: DEL, COLOR, CENTER, SIZE (@wackymole) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index 623533e9a..f8a7aa9f8 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "flarum/core": "^0.1.0-beta.12" + "flarum/core": "^0.1.0-beta.15" }, "extra": { "branch-alias": { From e8f46e04ce87b894155c0a1190b2984e2823ccca Mon Sep 17 00:00:00 2001 From: Charlie <13856015+KyrneDev@users.noreply.github.com> Date: Mon, 8 Mar 2021 11:39:41 -0800 Subject: [PATCH 40/51] Change Category (#11) --- extensions/bbcode/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index f8a7aa9f8..f8b31aca4 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -25,7 +25,7 @@ }, "flarum-extension": { "title": "BBCode", - "category": "formatting", + "category": "feature", "icon": { "name": "fas fa-bold", "backgroundColor": "#238C59", From dc518b0f7509c60a44687a2846f8b439180b0ee4 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Mon, 15 Mar 2021 10:32:08 +0100 Subject: [PATCH 41/51] Release v0.1.0-beta.16 --- extensions/bbcode/CHANGELOG.md | 7 +++++++ extensions/bbcode/composer.json | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/extensions/bbcode/CHANGELOG.md b/extensions/bbcode/CHANGELOG.md index 6fbea6d28..e4966d7d0 100644 --- a/extensions/bbcode/CHANGELOG.md +++ b/extensions/bbcode/CHANGELOG.md @@ -1,3 +1,10 @@ +# Changelog + +## [0.1.0-beta.16](https://github.com/flarum/bbcode/compare/v0.1.0-beta.15...v0.1.0-beta.16) + +### Changed +- Updated admin category from formatting to feature (https://github.com/flarum/bbcode/pull/11) + ## [0.1.0-beta.15](https://github.com/flarum/bbcode/compare/v0.1.0-beta.12...v0.1.0-beta.15) ### Changed diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index f8b31aca4..b67d2b457 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "flarum/core": "^0.1.0-beta.15" + "flarum/core": "^0.1.0-beta.16" }, "extra": { "branch-alias": { From 9fe4694468fb745a7d2fbd943e5131beb20d2120 Mon Sep 17 00:00:00 2001 From: David Wheatley Date: Sat, 15 May 2021 00:47:46 +0100 Subject: [PATCH 42/51] Update copyright year --- extensions/bbcode/LICENSE | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/LICENSE b/extensions/bbcode/LICENSE index 86cf0b3ce..54ac29ab2 100644 --- a/extensions/bbcode/LICENSE +++ b/extensions/bbcode/LICENSE @@ -1,6 +1,6 @@ The MIT License (MIT) -Copyright (c) 2019 Stichting Flarum (Flarum Foundation) +Copyright (c) 2019-2021 Stichting Flarum (Flarum Foundation) Copyright (c) 2014-2019 Toby Zerner (toby.zerner@gmail.com) Permission is hereby granted, free of charge, to any person obtaining a copy From 7bd95e3121f4593236f5921091a19f0e2f30e4ab Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Sun, 16 May 2021 18:27:27 -0400 Subject: [PATCH 43/51] Bump composer reqs for 1.0.0 --- extensions/bbcode/composer.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index b67d2b457..53d649198 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -17,11 +17,11 @@ } ], "require": { - "flarum/core": "^0.1.0-beta.16" + "flarum/core": "^1.0.0" }, "extra": { "branch-alias": { - "dev-master": "0.1.x-dev" + "dev-master": "1.x.x-dev" }, "flarum-extension": { "title": "BBCode", From 5634d61f27819cd2cdd57b845bae331accb8a4e5 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Tue, 25 May 2021 15:27:04 +0200 Subject: [PATCH 44/51] changes for stable --- extensions/bbcode/CHANGELOG.md | 5 +++++ extensions/bbcode/composer.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/extensions/bbcode/CHANGELOG.md b/extensions/bbcode/CHANGELOG.md index e4966d7d0..214616bee 100644 --- a/extensions/bbcode/CHANGELOG.md +++ b/extensions/bbcode/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## [1.0.0](https://github.com/flarum/bbcode/compare/v0.1.0-beta.16...v1.0.0) + +### Changed +- Compatibility with Flarum v1.0.0. + ## [0.1.0-beta.16](https://github.com/flarum/bbcode/compare/v0.1.0-beta.15...v0.1.0-beta.16) ### Changed diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index 53d649198..9f81b8ad6 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "flarum/core": "^1.0.0" + "flarum/core": "^1.0" }, "extra": { "branch-alias": { From 5d1c1ce99861e60570844cdfd47c3ff5684fd388 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Tue, 25 May 2021 22:45:02 +0200 Subject: [PATCH 45/51] fix branch alias --- extensions/bbcode/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index 9f81b8ad6..cdb1e3943 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -21,7 +21,7 @@ }, "extra": { "branch-alias": { - "dev-master": "1.x.x-dev" + "dev-master": "1.x-dev" }, "flarum-extension": { "title": "BBCode", From d6c01890a33293b604ac8a985e55c9b884a5aabf Mon Sep 17 00:00:00 2001 From: Guillaume Kulakowski Date: Mon, 23 Aug 2021 23:11:51 +0200 Subject: [PATCH 46/51] Add translation support for quote. (#12) --- extensions/bbcode/extend.php | 45 ++++++++++++++++++++------------- extensions/bbcode/locale/en.yml | 10 ++++++++ 2 files changed, 37 insertions(+), 18 deletions(-) create mode 100644 extensions/bbcode/locale/en.yml diff --git a/extensions/bbcode/extend.php b/extensions/bbcode/extend.php index 7783be0cf..97df35340 100644 --- a/extensions/bbcode/extend.php +++ b/extensions/bbcode/extend.php @@ -10,21 +10,30 @@ use Flarum\Extend; use s9e\TextFormatter\Configurator; -return (new Extend\Formatter) - ->configure(function (Configurator $config) { - $config->BBCodes->addFromRepository('B'); - $config->BBCodes->addFromRepository('I'); - $config->BBCodes->addFromRepository('U'); - $config->BBCodes->addFromRepository('S'); - $config->BBCodes->addFromRepository('URL'); - $config->BBCodes->addFromRepository('IMG'); - $config->BBCodes->addFromRepository('EMAIL'); - $config->BBCodes->addFromRepository('CODE'); - $config->BBCodes->addFromRepository('QUOTE'); - $config->BBCodes->addFromRepository('LIST'); - $config->BBCodes->addFromRepository('DEL'); - $config->BBCodes->addFromRepository('COLOR'); - $config->BBCodes->addFromRepository('CENTER'); - $config->BBCodes->addFromRepository('SIZE'); - $config->BBCodes->addFromRepository('*'); - }); +return [ + new Extend\Locales(__DIR__.'/locale'), + + (new Extend\Formatter) + ->configure(function (Configurator $config) { + $config->BBCodes->addFromRepository('B'); + $config->BBCodes->addFromRepository('I'); + $config->BBCodes->addFromRepository('U'); + $config->BBCodes->addFromRepository('S'); + $config->BBCodes->addFromRepository('URL'); + $config->BBCodes->addFromRepository('IMG'); + $config->BBCodes->addFromRepository('EMAIL'); + $config->BBCodes->addFromRepository('CODE'); + $config->BBCodes->addFromRepository('LIST'); + $config->BBCodes->addFromRepository('DEL'); + $config->BBCodes->addFromRepository('COLOR'); + $config->BBCodes->addFromRepository('CENTER'); + $config->BBCodes->addFromRepository('SIZE'); + $config->BBCodes->addFromRepository('*'); + + // Quote translation + $config->BBCodes->addFromRepository('QUOTE'); + $config->rendering->parameters['L_WROTE'] = resolve('translator')->trans('flarum-bbcode.forum.quote.wrote'); + $tag = $config->tags['QUOTE']; + $tag->template = '
uncited
'; + }), +]; diff --git a/extensions/bbcode/locale/en.yml b/extensions/bbcode/locale/en.yml new file mode 100644 index 000000000..076fe78ce --- /dev/null +++ b/extensions/bbcode/locale/en.yml @@ -0,0 +1,10 @@ +flarum-bbcode: + + ## + # UNIQUE KEYS - The following keys are used in only one location each. + ## + + # Translations in this namespace are used by the forum user interface. + forum: + quote: + wrote: wrote From 428fc3131c157346d436aea529c691246c43905d Mon Sep 17 00:00:00 2001 From: David Wheatley Date: Sat, 28 Aug 2021 18:23:33 +0100 Subject: [PATCH 47/51] Revert "Add translation support for quote. (#12)" (#13) This reverts commit d6c01890a33293b604ac8a985e55c9b884a5aabf. --- extensions/bbcode/extend.php | 45 +++++++++++++-------------------- extensions/bbcode/locale/en.yml | 10 -------- 2 files changed, 18 insertions(+), 37 deletions(-) delete mode 100644 extensions/bbcode/locale/en.yml diff --git a/extensions/bbcode/extend.php b/extensions/bbcode/extend.php index 97df35340..7783be0cf 100644 --- a/extensions/bbcode/extend.php +++ b/extensions/bbcode/extend.php @@ -10,30 +10,21 @@ use Flarum\Extend; use s9e\TextFormatter\Configurator; -return [ - new Extend\Locales(__DIR__.'/locale'), - - (new Extend\Formatter) - ->configure(function (Configurator $config) { - $config->BBCodes->addFromRepository('B'); - $config->BBCodes->addFromRepository('I'); - $config->BBCodes->addFromRepository('U'); - $config->BBCodes->addFromRepository('S'); - $config->BBCodes->addFromRepository('URL'); - $config->BBCodes->addFromRepository('IMG'); - $config->BBCodes->addFromRepository('EMAIL'); - $config->BBCodes->addFromRepository('CODE'); - $config->BBCodes->addFromRepository('LIST'); - $config->BBCodes->addFromRepository('DEL'); - $config->BBCodes->addFromRepository('COLOR'); - $config->BBCodes->addFromRepository('CENTER'); - $config->BBCodes->addFromRepository('SIZE'); - $config->BBCodes->addFromRepository('*'); - - // Quote translation - $config->BBCodes->addFromRepository('QUOTE'); - $config->rendering->parameters['L_WROTE'] = resolve('translator')->trans('flarum-bbcode.forum.quote.wrote'); - $tag = $config->tags['QUOTE']; - $tag->template = '
uncited
'; - }), -]; +return (new Extend\Formatter) + ->configure(function (Configurator $config) { + $config->BBCodes->addFromRepository('B'); + $config->BBCodes->addFromRepository('I'); + $config->BBCodes->addFromRepository('U'); + $config->BBCodes->addFromRepository('S'); + $config->BBCodes->addFromRepository('URL'); + $config->BBCodes->addFromRepository('IMG'); + $config->BBCodes->addFromRepository('EMAIL'); + $config->BBCodes->addFromRepository('CODE'); + $config->BBCodes->addFromRepository('QUOTE'); + $config->BBCodes->addFromRepository('LIST'); + $config->BBCodes->addFromRepository('DEL'); + $config->BBCodes->addFromRepository('COLOR'); + $config->BBCodes->addFromRepository('CENTER'); + $config->BBCodes->addFromRepository('SIZE'); + $config->BBCodes->addFromRepository('*'); + }); diff --git a/extensions/bbcode/locale/en.yml b/extensions/bbcode/locale/en.yml deleted file mode 100644 index 076fe78ce..000000000 --- a/extensions/bbcode/locale/en.yml +++ /dev/null @@ -1,10 +0,0 @@ -flarum-bbcode: - - ## - # UNIQUE KEYS - The following keys are used in only one location each. - ## - - # Translations in this namespace are used by the forum user interface. - forum: - quote: - wrote: wrote From 1436f073a5bf3401c949540416f25645624433a4 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Mon, 11 Oct 2021 21:03:10 -0400 Subject: [PATCH 48/51] Release v1.1.0 --- extensions/bbcode/CHANGELOG.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/extensions/bbcode/CHANGELOG.md b/extensions/bbcode/CHANGELOG.md index 214616bee..de0734b88 100644 --- a/extensions/bbcode/CHANGELOG.md +++ b/extensions/bbcode/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [1.1.0](https://github.com/flarum/akismet/compare/v1.0.0...v1.1.0) + +No changes. + ## [1.0.0](https://github.com/flarum/bbcode/compare/v0.1.0-beta.16...v1.0.0) ### Changed From cf7c387e59680e1bfb70bb935a549d9d816c7cbb Mon Sep 17 00:00:00 2001 From: David Wheatley Date: Wed, 13 Oct 2021 08:04:06 +0100 Subject: [PATCH 49/51] chore: bump bundled extension constraint to core 1.1 --- extensions/bbcode/composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index cdb1e3943..8483b69ef 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -17,7 +17,7 @@ } ], "require": { - "flarum/core": "^1.0" + "flarum/core": "^1.1" }, "extra": { "branch-alias": { From 7e1995d86b3dc50a42eb1db3acdc05e3dde1e9a9 Mon Sep 17 00:00:00 2001 From: Alexander Skvortsov Date: Thu, 20 Jan 2022 03:17:07 -0500 Subject: [PATCH 50/51] chore: flarum-cli audit infra --fix --- extensions/bbcode/.editorconfig | 2 +- extensions/bbcode/.gitattributes | 15 +++++++++++++++ extensions/bbcode/.gitignore | 10 ++++++++-- extensions/bbcode/composer.json | 21 ++++++++++++++++++++- 4 files changed, 44 insertions(+), 4 deletions(-) diff --git a/extensions/bbcode/.editorconfig b/extensions/bbcode/.editorconfig index 87694ddab..a61a3ab36 100644 --- a/extensions/bbcode/.editorconfig +++ b/extensions/bbcode/.editorconfig @@ -15,5 +15,5 @@ indent_size = 2 [*.{diff,md}] trim_trailing_whitespace = false -[*.php] +[*.{php,xml,json}] indent_size = 4 diff --git a/extensions/bbcode/.gitattributes b/extensions/bbcode/.gitattributes index 4afe79241..ca0f40972 100644 --- a/extensions/bbcode/.gitattributes +++ b/extensions/bbcode/.gitattributes @@ -1,3 +1,18 @@ .gitattributes export-ignore .gitignore export-ignore +.gitmodules export-ignore +.github export-ignore +.travis export-ignore .travis.yml export-ignore +.editorconfig export-ignore +.styleci.yml export-ignore + +phpunit.xml export-ignore +tests export-ignore + +js/dist/* -diff +js/dist/* linguist-generated +js/dist-typings/* linguist-generated +js/yarn.lock -diff + +* text=auto eol=lf diff --git a/extensions/bbcode/.gitignore b/extensions/bbcode/.gitignore index 43eeee7fe..4ebb168a0 100644 --- a/extensions/bbcode/.gitignore +++ b/extensions/bbcode/.gitignore @@ -1,6 +1,12 @@ /vendor +composer.lock composer.phar + .DS_Store Thumbs.db -bower_components -node_modules \ No newline at end of file +tests/.phpunit.result.cache +/tests/integration/tmp +.vagrant +.idea/* +.vscode +js/coverage-ts diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index 8483b69ef..77e5ea78f 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -2,7 +2,9 @@ "name": "flarum/bbcode", "description": "Allow posts to be formatted with BBCode.", "type": "flarum-extension", - "keywords": ["formatting"], + "keywords": [ + "formatting" + ], "license": "MIT", "support": { "issues": "https://github.com/flarum/core/issues", @@ -31,6 +33,23 @@ "backgroundColor": "#238C59", "color": "#fff" } + }, + "flarum-cli": { + "modules": { + "admin": false, + "forum": false, + "js": false, + "jsCommon": false, + "css": false, + "gitConf": true, + "githubActions": false, + "prettier": false, + "typescript": false, + "bundlewatch": false, + "backendTesting": false, + "editorConfig": true, + "styleci": true + } } } } From 5b8fbdba8b10d1688fba74da9341e447d9da4f43 Mon Sep 17 00:00:00 2001 From: Daniel Klabbers Date: Thu, 20 Jan 2022 11:57:27 +0100 Subject: [PATCH 51/51] Release v1.2 --- extensions/bbcode/CHANGELOG.md | 4 ++++ extensions/bbcode/composer.json | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/extensions/bbcode/CHANGELOG.md b/extensions/bbcode/CHANGELOG.md index de0734b88..f4618053f 100644 --- a/extensions/bbcode/CHANGELOG.md +++ b/extensions/bbcode/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [1.2.0](https://github.com/flarum/akismet/compare/v1.1.0...v1.2.0) + +No changes. + ## [1.1.0](https://github.com/flarum/akismet/compare/v1.0.0...v1.1.0) No changes. diff --git a/extensions/bbcode/composer.json b/extensions/bbcode/composer.json index 77e5ea78f..564ffcd23 100644 --- a/extensions/bbcode/composer.json +++ b/extensions/bbcode/composer.json @@ -19,7 +19,7 @@ } ], "require": { - "flarum/core": "^1.1" + "flarum/core": "^1.2" }, "extra": { "branch-alias": {