Thibaut Girka 5e6cec4a40 Import upstream's emojify function in settings.js ...

This fixes updating the profile preview when changing display name.

2018-08-05 12:57:20 +02:00

..

chewy

…

controllers

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 22:20:25 +02:00

helpers

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +02:00

javascript

Import upstream's emojify function in settings.js

2018-08-05 12:57:20 +02:00

lib

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +02:00

mailers

…

models

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 22:20:25 +02:00

policies

Disallow remote users from viewing local-only toots

2018-07-31 15:41:04 +02:00

presenters

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 22:20:25 +02:00

serializers

Merge branch 'master' into glitch-soc/merge-upstream

2018-07-16 14:50:42 +02:00

services

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 00:18:13 +02:00

validators

Merge branch 'master' into glitch-soc/merge-upstream

2018-07-26 21:22:43 +02:00

views

Merge branch 'master' into glitch-soc/merge-upstream

2018-08-01 22:20:25 +02:00

workers

Fix ActivityPub::UpdateDistributionWorker regression (#8039)

2018-07-16 18:43:22 +02:00