Skip to content

Commit

Permalink
Add compatibility with links to blog articles in discussion list
Browse files Browse the repository at this point in the history
  • Loading branch information
clarkwinkelmann committed Dec 5, 2022
1 parent d2f5ee6 commit d417d67
Show file tree
Hide file tree
Showing 10 changed files with 977 additions and 1,021 deletions.
9 changes: 8 additions & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
"require": {
"flarum/core": "^1.2"
},
"require-dev": {
"flarum/tags": "*"
},
"authors": [
{
"name": "Clark Winkelmann",
Expand All @@ -31,7 +34,11 @@
"name": "fas fa-eye",
"backgroundColor": "#684ba6",
"color": "#fff"
}
},
"optional-dependencies": [
"flarum/tags",
"v17development/flarum-blog"
]
}
}
}
2 changes: 1 addition & 1 deletion js/dist/admin.js.map

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/forum.js

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/forum.js.map

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions js/shims.d.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
import SettingsPage from 'flarum/forum/components/SettingsPage';

declare module 'flarum/forum/components/SettingsPage' {
export default interface SettingsPage {
discussionOpenLastReadLoading?: string | null
}
}
Loading

0 comments on commit d417d67

Please sign in to comment.