mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-07-17 23:01:17 +02:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/main'

Browse Source
This commit is contained in:
Sami Mazouz
2022-11-16 11:22:47 +01:00
parent f49cf887dc 2b413b06c5
commit 18bdd48835
5 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -1,5 +1,6 @@
# Changelog # Changelog
## [v1.6.0](https://github.com/flarum/framework/compare/v1.5.0...v1.6.0) ## [v1.6.0](https://github.com/flarum/framework/compare/v1.5.0...v1.6.0)
### Fixed ### Fixed
- (approval) posts approved for deleted users error ([b5874a0](b5874a08e482196f50af50aa78e43c93c29fb647)) - (approval) posts approved for deleted users error ([b5874a0](b5874a08e482196f50af50aa78e43c93c29fb647))

2
framework/core/js/dist-typings/common/helpers/userOnline.d.ts generated vendored
View File

@@ -1,6 +1,6 @@
import type Mithril from 'mithril'; import type Mithril from 'mithril';
import User from '../models/User'; import User from '../models/User';
/** /**
* The `useronline` helper displays a green circle if the user is online * The `useronline` helper displays a green circle if the user is online.
*/ */
export default function userOnline(user: User): Mithril.Vnode<{}, {}> | null; export default function userOnline(user: User): Mithril.Vnode<{}, {}> | null;

2
framework/core/js/dist/admin.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

2
framework/core/js/dist/forum.js.map generated vendored
View File

File diff suppressed because one or more lines are too long

2
framework/core/js/src/common/helpers/userOnline.tsx
View File

@@ -3,7 +3,7 @@ import User from '../models/User';
import icon from './icon'; import icon from './icon';
/** /**
* The `useronline` helper displays a green circle if the user is online * The `useronline` helper displays a green circle if the user is online.
*/ */
export default function userOnline(user: User): Mithril.Vnode<{}, {}> | null { export default function userOnline(user: User): Mithril.Vnode<{}, {}> | null {
if (user.lastSeenAt() && user.isOnline()) { if (user.lastSeenAt() && user.isOnline()) {