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 1aa7806244	2024-01-19 11:07:33 +00:00
less	feat: theming and extensibility improvements (#3876)	2023-10-10 21:36:08 +01:00
locale	feat: search UI/UX revamp (#3941)	2024-01-09 21:51:01 +00:00
migrations	Apply fixes from StyleCI	2019-11-29 23:02:31 +00:00
src	chore: review	2024-03-28 18:54:38 +01: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:55:30 -05:00
CHANGELOG.md	Release v1.2	2022-01-20 12:03:29 +01:00
composer.json	fix(regression): require flarum/testing:2.0	2023-05-31 09:53:59 +01:00
extend.php	feat: refactor subscriptions extension	2024-02-26 15:27:04 +01:00
LICENSE	Update copyright year	2021-05-15 00:57:53 +01:00