Skip to content

Commit f3a3605

Browse files
authored
Merge pull request #11 from imorland/master
Update for beta 14
2 parents 688de4c + f1899ef commit f3a3605

11 files changed

Lines changed: 3694 additions & 2685 deletions

File tree

composer.json

100644100755
Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,11 @@
1919
],
2020
"support": {
2121
"issues": "https://github.com/jordanjay29/flarum-ext-summaries/issues",
22-
"source": "https://github.com/jordanjay29/flarum-ext-summaries"
22+
"source": "https://github.com/jordanjay29/flarum-ext-summaries",
23+
"forum": "https://discuss.flarum.org/d/2151"
2324
},
2425
"require": {
25-
"flarum/core": "^0.1.0-beta.8"
26+
"flarum/core": ">=0.1.0-beta.14 <0.1.0-beta.16"
2627
},
2728
"autoload": {
2829
"psr-4": {
@@ -38,6 +39,7 @@
3839
},
3940
"flarum-extension": {
4041
"title": "Summaries",
42+
"category": "discussion",
4143
"icon": {
4244
"name": "fas fa-sticky-note",
4345
"backgroundColor": "#00bac9",

extend.php

100644100755
Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,21 @@
1212

1313
namespace JordanJay29\Summaries;
1414

15+
use Flarum\Api\Event\Serializing;
1516
use Flarum\Extend;
1617
use Illuminate\Contracts\Events\Dispatcher;
1718

1819
return [
1920
(new Extend\Frontend('forum'))
2021
->js(__DIR__ . '/js/dist/forum.js')
2122
->css(__DIR__ . '/resources/less/forum/extension.less'),
23+
2224
(new Extend\Frontend('admin'))
2325
->js(__DIR__ . '/js/dist/admin.js'),
2426

27+
(new Extend\Event())
28+
->listen(Serializing::class, Listeners\LoadUserSettings::class),
29+
2530
function (Dispatcher $events) {
2631
$events->subscribe(Listeners\AddApiAttributes::class);
27-
$events->subscribe(Listeners\LoadUserSettings::class);
2832
}];

js/dist/admin.js

100644100755
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

js/dist/admin.js.map

100644100755
Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)