This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka e5a603206d Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: app/controllers/accounts_controller.rb app/javascript/mastodon/locales/pl.json app/views/about/more.html.haml Conflicts in `accounts_controller.rb` resolved by taking upstream's version + our `use_pack`. Conflicts in `pl.json` resolved by taking upstream's changes. Conflicts in `aboute/more.html.haml` resolved by taking upstream's changes.		2018-08-10 16:22:31 +02:00
..
v2	Add GET /api/v2/search which returns rich tag objects, adjust web UI (#7661)	2018-05-29 02:01:24 +02:00
account_serializer.rb	Do not pre-emojify note HTML in accounts REST API (#7821)	2018-06-16 18:47:19 +02:00
application_serializer.rb	…
context_serializer.rb	…
credential_account_serializer.rb	Allow selecting default posting language instead of auto-detect (#7828)	2018-06-17 18:57:31 +02:00
custom_emoji_serializer.rb	…
filter_serializer.rb	Add option to not consider word boundaries when processing keyword filtering (#7975)	2018-07-09 02:22:09 +02:00
instance_serializer.rb	Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master	2018-03-09 00:17:17 +00:00
list_serializer.rb	…
media_attachment_serializer.rb	…
mute_serializer.rb	…
notification_serializer.rb	…
preview_card_serializer.rb	…
relationship_serializer.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	2018-08-09 09:56:53 +02:00
report_serializer.rb	…
search_serializer.rb	…
status_serializer.rb	Add backend support for bookmarks	2018-04-11 20:40:29 +02:00
tag_serializer.rb	Track trending tags (#7638)	2018-05-27 21:45:30 +02:00
web_push_subscription_serializer.rb	Add REST API for Web Push Notifications subscriptions (#7445)	2018-05-11 11:49:12 +02:00