beta 14 update

FriendsOfFlarum · Nov 7, 2020 · bb14297 · bb14297
1 parent 8af2a64
commit bb14297
Show file tree

Hide file tree

Showing 12 changed files with 4,696 additions and 63 deletions.
diff --git a/composer.json b/composer.json
@@ -14,8 +14,8 @@
  }
  ],
  "require": {
- "flarum/core": "^0.1.0-beta.12",
- "fof/components": ">=0.1.1",
+ "flarum/core": ">=0.1.0-beta.14 <0.1.0-beta.15",
+ "fof/components": ">=0.2.0",
  "guzzlehttp/guzzle": "6.*"
  },
  "replace": {
@@ -34,6 +34,9 @@
  "backgroundColor": "#e74c3c",
  "color": "#fff"
  }
+ },
+ "flagrow": {
+ "discuss": "https://discuss.flarum.org/d/18348"
  }
  }
 }
diff --git a/extend.php b/extend.php
@@ -17,15 +17,23 @@
 
 return [
  new AddFofComponents(),
+
  new Extend\Locales(__DIR__.'/locale'),
+
  (new Extend\Frontend('forum'))
  ->js(__DIR__.'/js/dist/forum.js'),
+
  (new Extend\Frontend('admin'))
  ->js(__DIR__.'/js/dist/admin.js'),
+
  (new Extend\Middleware('forum'))
  ->add(Middleware\PreventPwnedPassword::class)
  ->add(Middleware\CheckLoginPassword::class)
  ->add(Middleware\CheckPasswordReset::class),
+
+ (new Extend\User())
+,
+
  function (Dispatcher $events) {
  $events->subscribe(Access\GlobalPolicy::class);
 

diff --git a/js/dist/admin.js b/js/dist/admin.js
diff --git a/js/dist/admin.js.map b/js/dist/admin.js.map