1
0
mirror of https://github.com/flarum/core.git synced 2025-08-17 22:01:44 +02:00

Compare commits

...

4 Commits

Author SHA1 Message Date
StyleCI Bot
453d272874 Apply fixes from StyleCI 2024-06-16 11:53:11 +00:00
Daniël Klabbers
f04542e8fb feat: adds ability for blueprints to ignore user emai; verification 2024-06-16 13:52:45 +02:00
flarum-bot
64cd6d1988 Bundled output for commit 51bd7a7e32
Includes transpiled JS/TS, and Typescript declaration files (typings).

[skip ci]
2023-05-27 09:37:18 +00:00
Darkle
51bd7a7e32 Update the scheduler info link in admin (#3826) 2023-05-27 11:29:56 +02:00
28 changed files with 132 additions and 123 deletions

View File

@@ -40,6 +40,7 @@ class AddCanFlagAttribute
// If $actor is the post author, check to see if the setting is enabled // If $actor is the post author, check to see if the setting is enabled
return (bool) $this->settings->get('flarum-flags.can_flag_own'); return (bool) $this->settings->get('flarum-flags.can_flag_own');
} }
// $actor is not the post author // $actor is not the post author
return true; return true;
} }

2
framework/core/js/dist/admin.js generated vendored

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -40,7 +40,7 @@ export default class StatusWidget extends DashboardWidget {
[ [
<span> <span>
<strong>{app.translator.trans('core.admin.dashboard.status.headers.scheduler-status')}</strong>{' '} <strong>{app.translator.trans('core.admin.dashboard.status.headers.scheduler-status')}</strong>{' '}
<LinkButton href="https://discuss.flarum.org/d/24118" external={true} target="_blank" icon="fas fa-info-circle" /> <LinkButton href="https://docs.flarum.org/scheduler" external={true} target="_blank" icon="fas fa-info-circle" />
</span>, </span>,
<br />, <br />,
app.data.schedulerStatus, app.data.schedulerStatus,

View File

@@ -24,33 +24,40 @@ interface BlueprintInterface
* *
* @return User|null * @return User|null
*/ */
public function getFromUser(); public function getFromUser(): ?User;
/** /**
* Get the model that is the subject of this activity. * Get the model that is the subject of this activity.
* *
* @return AbstractModel|null * @return AbstractModel|null
*/ */
public function getSubject(); public function getSubject(): ?AbstractModel;
/** /**
* Get the data to be stored in the notification. * Get the data to be stored in the notification.
* *
* @return mixed * @return mixed
*/ */
public function getData(); public function getData(): mixed;
/** /**
* Get the serialized type of this activity. * Get the serialized type of this activity.
* *
* @return string * @return string
*/ */
public static function getType(); public static function getType(): string;
/** /**
* Get the name of the model class for the subject of this activity. * Get the name of the model class for the subject of this activity.
* *
* @return string * @return string
*/ */
public static function getSubjectModel(); public static function getSubjectModel(): string;
/**
* Whether the blueprint ignores that a user has not verified their email address.
*
* @return bool
*/
public function ignoresUserVerification(): bool;
} }

View File

@@ -192,6 +192,7 @@ abstract class TestCase extends \PHPUnit\Framework\TestCase
protected function database(): ConnectionInterface protected function database(): ConnectionInterface
{ {
$this->app(); $this->app();
// Set in `BeginTransactionAndSetDatabase` extender. // Set in `BeginTransactionAndSetDatabase` extender.
return $this->database; return $this->database;
} }