mirror of
https://github.com/flarum/framework.git
synced 2025-02-26 21:00:54 +08:00
chore: update flarum/core references to flarum/monorepo
This commit is contained in:
Alexander Skvortsov
parent
b5e5ae8c4c
commit
246bf54155
@ -1,11 +1,11 @@
|
||||
<p align="center"><img src="https://flarum.org/assets/img/logo.png"></p>
|
||||
|
||||
<p align="center">
|
||||
<a href="https://github.com/flarum/core/actions?query=workflow%3ATests"><img src="https://github.com/flarum/core/workflows/Tests/badge.svg" alt="PHP Tests"></a>
|
||||
<a href="https://github.com/flarum/framework/actions?query=workflow%3ATests"><img src="https://github.com/flarum/framework/workflows/Tests/badge.svg" alt="PHP Tests"></a>
|
||||
<a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/dt/flarum/core" alt="Total Downloads"></a>
|
||||
<a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/github/v/release/flarum/core?sort=semver" alt="Latest Version"></a>
|
||||
<a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/github/v/release/flarum/framework?sort=semver" alt="Latest Version"></a>
|
||||
<a href="https://packagist.org/packages/flarum/core"><img src="https://img.shields.io/packagist/l/flarum/core" alt="License"></a>
|
||||
<a href="https://huntr.dev/bounties/disclose/?target=https://github.com/flarum/core"><img src="https://cdn.huntr.dev/huntr_security_badge_mono.svg" alt="huntr"></a>
|
||||
<a href="https://huntr.dev/bounties/disclose/?target=https://github.com/flarum/framework"><img src="https://cdn.huntr.dev/huntr_security_badge_mono.svg" alt="huntr"></a>
|
||||
<a href="https://github.styleci.io/repos/28257573"><img src="https://github.styleci.io/repos/28257573/shield?style=flat" alt="StyleCI"></a>
|
||||
</p>
|
||||
|
||||
@ -31,7 +31,7 @@ Thank you for considering contributing to Flarum! Please read the **[Contributin
|
||||
|
||||
## Security Vulnerabilities
|
||||
|
||||
If you discover a security vulnerability within Flarum, please send an e-mail to [security@flarum.org](mailto:security@flarum.org). All security vulnerabilities will be promptly addressed. More details can be found in our [security policy](https://github.com/flarum/core/security/policy).
|
||||
If you discover a security vulnerability within Flarum, please send an e-mail to [security@flarum.org](mailto:security@flarum.org). All security vulnerabilities will be promptly addressed. More details can be found in our [security policy](https://github.com/flarum/framework/security/policy).
|
||||
|
||||
## License
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/akismet",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/approval",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/bbcode",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/embed",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/emoji",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -39,7 +39,7 @@ export default function renderEmoji() {
|
||||
// wrap it in a node. In our `parseHTML` implementation, we wrap it in a `<body>`
|
||||
// element. This gets stripped below.
|
||||
//
|
||||
// See https://github.com/flarum/core/issues/2958
|
||||
// See https://github.com/flarum/framework/issues/2958
|
||||
const emojifiedDom = twemoji.parse(parseHTML(contentHtml), options);
|
||||
|
||||
// Steal the HTML string inside the emojified DOM `<body>` tag.
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/flags",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -66,8 +66,8 @@ No changes.
|
||||
## [0.1.0-beta.13](https://github.com/flarum/lang-english/compare/v0.1.0-beta.12...v0.1.0-beta.13)
|
||||
|
||||
### Added
|
||||
- Keys for hidden permission groups (#153, flarum/core#2129, flarum/core#845)
|
||||
- Keys for post deletion confirmation (#162, flarum/core#2135)
|
||||
- Keys for hidden permission groups (#153, flarum/framework#2129, flarum/framework#845)
|
||||
- Keys for post deletion confirmation (#162, flarum/framework#2135)
|
||||
- Keys for HTML meta data (#154, flarum/tags#72)
|
||||
|
||||
### Changed
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/likes",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/lock",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/markdown",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -33,8 +33,8 @@ No changes.
|
||||
|
||||
### Fixed
|
||||
- Unrecognised user/post mentions (https://github.com/flarum/mentions/pulls/71)
|
||||
- Reduced bugginess in mentions username search (https://github.com/flarum/core/issues/3095)
|
||||
- Fixed missing space after mentions inserted via post reply (https://github.com/flarum/core/issues/3096)
|
||||
- Reduced bugginess in mentions username search (https://github.com/flarum/framework/issues/3095)
|
||||
- Fixed missing space after mentions inserted via post reply (https://github.com/flarum/framework/issues/3096)
|
||||
|
||||
## [1.0.0](https://github.com/flarum/mentions/compare/v0.1.0-beta.16...v1.0.0)
|
||||
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/mentions",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/nicknames",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/pusher",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/statistics",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/sticky",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/subscriptions",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/suspend",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -30,7 +30,7 @@
|
||||
- Broken side nav tag listing (https://github.com/flarum/tags/pulls/137)
|
||||
- Discussions hidden from all users including admins (https://github.com/flarum/tags/pulls/140)
|
||||
- Unauthorized view of restricted tags (https://github.com/flarum/tags/pulls/145)
|
||||
- Make clicking edit tag button easier on mobile (https://github.com/flarum/core/issues/3098)
|
||||
- Make clicking edit tag button easier on mobile (https://github.com/flarum/framework/issues/3098)
|
||||
|
||||
|
||||
## [1.0.3](https://github.com/flarum/tags/compare/v1.0.2...v1.0.3)
|
||||
|
||||
@ -7,7 +7,7 @@
|
||||
],
|
||||
"license": "MIT",
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/tags",
|
||||
"forum": "https://discuss.flarum.org"
|
||||
},
|
||||
|
||||
@ -128,7 +128,7 @@
|
||||
],
|
||||
"core": {
|
||||
"name": "core",
|
||||
"gitRemote": "git@github.com:flarum/core.git",
|
||||
"gitRemote": "git@github.com:flarum/flarum-core.git",
|
||||
"mainBranch": "master"
|
||||
}
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -29,8 +29,8 @@
|
||||
}
|
||||
],
|
||||
"support": {
|
||||
"issues": "https://github.com/flarum/core/issues",
|
||||
"source": "https://github.com/flarum/core",
|
||||
"issues": "https://github.com/flarum/framework/issues",
|
||||
"source": "https://github.com/flarum/framework",
|
||||
"docs": "https://docs.flarum.org",
|
||||
"forum": "https://discuss.flarum.org",
|
||||
"chat": "https://flarum.org/chat"
|
||||
|
||||
@ -31,7 +31,7 @@ export interface AdminHeaderOptions {
|
||||
*
|
||||
* Note: this will be exported from a different location in the future.
|
||||
*
|
||||
* @see https://github.com/flarum/core/issues/3039
|
||||
* @see https://github.com/flarum/framework/issues/3039
|
||||
*/
|
||||
export type HTMLInputTypes =
|
||||
| 'button'
|
||||
|
||||
@ -14,7 +14,7 @@ export default class EditCustomCssModal extends SettingsModal {
|
||||
return [
|
||||
<p>
|
||||
{app.translator.trans('core.admin.edit_css.customize_text', {
|
||||
a: <a href="https://github.com/flarum/core/tree/master/less" target="_blank" />,
|
||||
a: <a href="https://github.com/flarum/framework/tree/main/framework/core/less" target="_blank" />,
|
||||
})}
|
||||
</p>,
|
||||
<div className="Form-group">
|
||||
|
||||
@ -36,7 +36,7 @@ $.fn.tooltip = function (options, caller) {
|
||||
// This functionality is deprecated and should not be used.
|
||||
if (!['DANGEROUS_tooltip_jquery_fn_deprecation_exempt'].includes(caller)) {
|
||||
console.warn(
|
||||
"Calling `$.tooltip` is now deprecated. Please use the `<Tooltip>` component exposed by flarum/core instead. `$.tooltip` may be removed in a future version of Flarum.\n\nIf this component doesn't meet your requirements, please open an issue: https://github.com/flarum/core/issues/new?assignees=davwheat&labels=type/bug,needs-verification&template=bug-report.md&title=Tooltip%20component%20unsuitable%20for%20use%20case"
|
||||
"Calling `$.tooltip` is now deprecated. Please use the `<Tooltip>` component exposed by flarum/core instead. `$.tooltip` may be removed in a future version of Flarum.\n\nIf this component doesn't meet your requirements, please open an issue: https://github.com/flarum/framework/issues/new?assignees=davwheat&labels=type/bug,needs-verification&template=bug-report.md&title=Tooltip%20component%20unsuitable%20for%20use%20case"
|
||||
);
|
||||
}
|
||||
|
||||
|
||||
@ -79,7 +79,7 @@ export default class Drawer {
|
||||
* correctly animates out, while ensuring it is not part of the navigation
|
||||
* tree while off-screen.
|
||||
*
|
||||
* More info: https://github.com/flarum/core/pull/2666#discussion_r595381014
|
||||
* More info: https://github.com/flarum/framework/pull/2666#discussion_r595381014
|
||||
*/
|
||||
|
||||
this.focusTrap.deactivate();
|
||||
|
||||
@ -222,7 +222,7 @@ export default class ItemList<T> {
|
||||
* @param keepPrimitives Converts item content to objects and sets the
|
||||
* `itemName` property on them.
|
||||
*
|
||||
* @see https://github.com/flarum/core/issues/3030
|
||||
* @see https://github.com/flarum/framework/issues/3030
|
||||
*/
|
||||
toArray(keepPrimitives?: false): (T & { itemName: string })[];
|
||||
/**
|
||||
|
||||
@ -272,12 +272,12 @@ export default class Composer extends Component {
|
||||
if (app.screen() === 'phone') {
|
||||
// On safari fixed position doesn't properly work on mobile,
|
||||
// So we use absolute and set the top value.
|
||||
// https://github.com/flarum/core/issues/2652
|
||||
// https://github.com/flarum/framework/issues/2652
|
||||
|
||||
// Due to another safari bug, `scrollTop` is unreliable when
|
||||
// at the very bottom of the page AND opening the composer.
|
||||
// So we fallback to a calculated version of scrollTop.
|
||||
// https://github.com/flarum/core/issues/2683
|
||||
// https://github.com/flarum/framework/issues/2683
|
||||
const scrollElement = document.documentElement;
|
||||
const topOfViewport = Math.min(scrollElement.scrollTop, scrollElement.scrollHeight - scrollElement.clientHeight);
|
||||
this.$().css('top', $('.App').is('.mobile-safari') ? topOfViewport : 0);
|
||||
|
||||
@ -121,7 +121,7 @@
|
||||
|
||||
// We use `-0.02` here to fix an odd rendering glitch with specific operating system UI scaling, and combined
|
||||
// with specific viewport sizes. This can result in the browser actually being 'between' media queries, which
|
||||
// breaks our UI. See: https://github.com/flarum/core/issues/2915
|
||||
// breaks our UI. See: https://github.com/flarum/framework/issues/2915
|
||||
|
||||
@screen-phone-max: (@screen-tablet - 0.02);
|
||||
|
||||
|
||||
@ -126,7 +126,7 @@
|
||||
padding-top: var(--header-height-phone);
|
||||
|
||||
// Fixes a bug where fixed position doesn't properly work in Safari mobile
|
||||
// https://github.com/flarum/core/issues/2652
|
||||
// https://github.com/flarum/framework/issues/2652
|
||||
.mobile-safari & {
|
||||
position: absolute;
|
||||
}
|
||||
|
||||
@ -23,7 +23,7 @@ class JsonApiResponse extends JsonResponse
|
||||
|
||||
// The call to jsonSerialize prevents rare issues with json_encode() failing with a
|
||||
// syntax error even though Document implements the JsonSerializable interface.
|
||||
// See https://github.com/flarum/core/issues/685
|
||||
// See https://github.com/flarum/framework/issues/685
|
||||
parent::__construct($document->jsonSerialize(), $status, $headers, $encodingOptions);
|
||||
}
|
||||
}
|
||||
|
||||
@ -22,7 +22,7 @@ A baseline `tsconfig.json` is provided below that you can modify as needed. This
|
||||
// This will match all .ts, .tsx, .d.ts, .js, .jsx files in your `src` folder
|
||||
// and also tells your Typescript server to read core's global typings for
|
||||
// access to `dayjs` and `$` in the global namespace.
|
||||
"include": ["src/**/*", "../vendor/flarum/core/js/dist-typings/@types/**/*"],
|
||||
"include": ["src/**/*", "../vendor/flarum/framework/js/dist-typings/@types/**/*"],
|
||||
"compilerOptions": {
|
||||
// This will output typings to `dist-typings`
|
||||
"declarationDir": "./dist-typings",
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user