Skip to content

Commit

Permalink
Merge pull request #11 from imorland/master
Browse files Browse the repository at this point in the history
Update for beta 14
  • Loading branch information
jordanjay29 authored Dec 25, 2020
2 parents 688de4c + f1899ef commit f3a3605
Show file tree
Hide file tree
Showing 11 changed files with 3,694 additions and 2,685 deletions.
6 changes: 4 additions & 2 deletions composer.json
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,11 @@
],
"support": {
"issues": "https://github.com/jordanjay29/flarum-ext-summaries/issues",
"source": "https://github.com/jordanjay29/flarum-ext-summaries"
"source": "https://github.com/jordanjay29/flarum-ext-summaries",
"forum": "https://discuss.flarum.org/d/2151"
},
"require": {
"flarum/core": "^0.1.0-beta.8"
"flarum/core": ">=0.1.0-beta.14 <0.1.0-beta.16"
},
"autoload": {
"psr-4": {
Expand All @@ -38,6 +39,7 @@
},
"flarum-extension": {
"title": "Summaries",
"category": "discussion",
"icon": {
"name": "fas fa-sticky-note",
"backgroundColor": "#00bac9",
Expand Down
6 changes: 5 additions & 1 deletion extend.php
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,21 @@

namespace JordanJay29\Summaries;

use Flarum\Api\Event\Serializing;
use Flarum\Extend;
use Illuminate\Contracts\Events\Dispatcher;

return [
(new Extend\Frontend('forum'))
->js(__DIR__ . '/js/dist/forum.js')
->css(__DIR__ . '/resources/less/forum/extension.less'),

(new Extend\Frontend('admin'))
->js(__DIR__ . '/js/dist/admin.js'),

(new Extend\Event())
->listen(Serializing::class, Listeners\LoadUserSettings::class),

function (Dispatcher $events) {
$events->subscribe(Listeners\AddApiAttributes::class);
$events->subscribe(Listeners\LoadUserSettings::class);
}];
2 changes: 1 addition & 1 deletion js/dist/admin.js
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion js/dist/admin.js.map
100644 → 100755

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit f3a3605

Please sign in to comment.