Sami Mazouz caaaadd701 Merge branch 'refs/heads/2.x' into sm/json-api-server ... # Conflicts: # extensions/likes/tests/integration/api/ListPostsTest.php # extensions/mentions/tests/integration/api/ListPostsTest.php # framework/core/src/Api/routes.php # framework/core/src/Discussion/UserState.php # framework/core/src/Extend/Settings.php # framework/core/tests/integration/extenders/ApiControllerTest.php # framework/core/tests/integration/extenders/ModelTest.php # framework/core/tests/integration/policy/DiscussionPolicyTest.php		2024-05-09 13:19:14 +01:00
..
js	Bundled output for commit 3a34136e36	2024-01-09 21:54:15 +00:00
less	suspend anonymously (#39)	2021-07-18 22:47:34 +02:00
locale	feat: search UI/UX revamp (#3941)	2024-01-09 21:51:01 +00:00
migrations	feat: Display suspension to user (#41)	2021-12-13 00:48:10 +01:00
src	Apply fixes from StyleCI	2024-03-08 13:41:35 +00:00
tests	Merge branch 'refs/heads/2.x' into sm/json-api-server	2024-05-09 13:19:14 +01:00
views/emails	feat: notification unsubscribe & email overhaul with HTML multipart (#3872)	2023-09-29 16:34:54 +01:00
.gitattributes	chore: add .gitattributes to extensions to export-ignore files. (#3513)	2022-07-08 20:38:20 +01:00
.gitignore	chore: flarum-cli audit infra --fix	2022-01-20 03:57:25 -05:00
CHANGELOG.md	Release v1.2	2022-01-20 12:17:01 +01:00
composer.json	fix(regression): require flarum/testing:2.0	2023-05-31 09:53:59 +01:00
extend.php	Apply fixes from StyleCI	2024-03-08 13:41:35 +00:00
LICENSE	Update copyright year	2021-05-15 00:58:03 +01:00