mirror of
https://github.com/flarum/core.git
synced 2025-08-28 18:40:46 +02:00
Compare commits
4 Commits
v0.1.0-bet
...
v0.1.0-bet
Author | SHA1 | Date | |
---|---|---|---|
|
8a1bcf30d2 | ||
|
ff384569f8 | ||
|
f64a253450 | ||
|
da5628d125 |
@@ -1,5 +1,11 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.1.0-beta.11](https://github.com/flarum/core/compare/v0.1.0-beta.11...v0.1.0-beta.11.1)
|
||||||
|
|
||||||
|
### Fixed
|
||||||
|
|
||||||
|
- Saving custom css in admin failed (#1946)
|
||||||
|
|
||||||
## [0.1.0-beta.11](https://github.com/flarum/core/compare/v0.1.0-beta.10...v0.1.0-beta.11)
|
## [0.1.0-beta.11](https://github.com/flarum/core/compare/v0.1.0-beta.10...v0.1.0-beta.11)
|
||||||
|
|
||||||
### Added
|
### Added
|
||||||
|
@@ -23,7 +23,7 @@ class Application extends Container implements ApplicationContract
|
|||||||
*
|
*
|
||||||
* @var string
|
* @var string
|
||||||
*/
|
*/
|
||||||
const VERSION = '0.1.0-beta.11';
|
const VERSION = '0.1.0-beta.11.1';
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* The base path for the Flarum installation.
|
* The base path for the Flarum installation.
|
||||||
|
@@ -35,7 +35,7 @@ class OverrideSettingsRepository implements SettingsRepositoryInterface
|
|||||||
$this->overrides = $overrides;
|
$this->overrides = $overrides;
|
||||||
}
|
}
|
||||||
|
|
||||||
public function all()
|
public function all(): array
|
||||||
{
|
{
|
||||||
return array_merge($this->inner->all(), $this->overrides);
|
return array_merge($this->inner->all(), $this->overrides);
|
||||||
}
|
}
|
||||||
|
@@ -11,7 +11,7 @@ namespace Flarum\Settings;
|
|||||||
|
|
||||||
class UninstalledSettingsRepository implements SettingsRepositoryInterface
|
class UninstalledSettingsRepository implements SettingsRepositoryInterface
|
||||||
{
|
{
|
||||||
public function all()
|
public function all(): array
|
||||||
{
|
{
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user