1
0
mirror of https://framagit.org/tykayn/mastodon.git synced 2023-08-25 08:33:12 +02:00
mastodon/app/serializers
Thibaut Girka f5f6d23d55 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- config/locales/pl.yml
  Conflict caused by new upstream string too close to glitch-specific
  “flavour” string. Took both strings.
2019-04-08 15:57:56 +02:00
..
activitypub Add ActivityPub representation for identity proofs () 2019-03-30 02:12:06 +01:00
rest Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
rss Bump webpacker from 3.5.5 to 4.0.2 () 2019-03-15 15:05:31 +01:00
web Only display web push notifications after API call (fixes ) () 2018-08-23 21:44:27 +02:00
initial_state_serializer.rb Fix min/max duration poll limits being inverted 2019-03-08 20:43:18 +01:00
manifest_serializer.rb Improve config serializer for Keybase () 2019-03-21 23:33:28 +01:00
oembed_serializer.rb Add allowfullscreen attribute to oembed iframe () 2019-03-25 15:01:09 +01:00
webfinger_serializer.rb Add remote interaction dialog for toots () 2018-08-18 03:03:12 +02:00