mirror of
https://github.com/flarum/framework.git
synced 2024-11-26 10:14:16 +08:00
Merge remote-tracking branch 'origin/main'
This commit is contained in:
commit
18bdd48835
|
@ -1,5 +1,6 @@
|
|||
# Changelog
|
||||
|
||||
|
||||
## [v1.6.0](https://github.com/flarum/framework/compare/v1.5.0...v1.6.0)
|
||||
### Fixed
|
||||
- (approval) posts approved for deleted users error ([b5874a0](b5874a08e482196f50af50aa78e43c93c29fb647))
|
||||
|
|
2
framework/core/js/dist-typings/common/helpers/userOnline.d.ts
generated
vendored
2
framework/core/js/dist-typings/common/helpers/userOnline.d.ts
generated
vendored
|
@ -1,6 +1,6 @@
|
|||
import type Mithril from 'mithril';
|
||||
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;
|
||||
|
|
2
framework/core/js/dist/admin.js.map
generated
vendored
2
framework/core/js/dist/admin.js.map
generated
vendored
File diff suppressed because one or more lines are too long
2
framework/core/js/dist/forum.js.map
generated
vendored
2
framework/core/js/dist/forum.js.map
generated
vendored
File diff suppressed because one or more lines are too long
|
@ -3,7 +3,7 @@ import User from '../models/User';
|
|||
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 {
|
||||
if (user.lastSeenAt() && user.isOnline()) {
|
||||
|
|
Loading…
Reference in New Issue
Block a user