luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-30 10:33:46 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/javascript/core
History
Thibaut Girka a9eaa780f5 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/javascript/mastodon/features/compose/components/compose_form.js
  Upstream cleaned up a bit, including on lines in which
  we replaced the hardcoded 500 character limit with a maxChar
  constant. Applied the changes while keeping maxChar instead of 500.
- app/javascript/packs/public.js
  Moved upstream's new animated avatar hover handling in
  app/javascript/core/public.js
- app/javascript/styles/fonts/montserrat.scss
  Upstream fixed local font name, applied those changes.
- app/javascript/styles/fonts/roboto.scss
  Upstream fixed local font name, applied those changes.
- lib/mastodon/version.rb
  Upstream made repo URL configurable, did the same, but
  default to glitch-soc
2019-04-22 20:40:04 +02:00
..
admin.js Merge branch 'master' into glitch-soc/merge-upstream 2018-10-22 17:51:38 +02:00
common.js
embed.js
mailer.js
public.js Merge branch 'master' into glitch-soc/merge-upstream 2019-04-22 20:40:04 +02:00
settings.js Merge branch 'master' into glitch-soc/merge-upstream 2019-04-04 14:53:52 +02:00
theme.yml Fix CW fold/unfold in remote interaction dialog 2019-02-17 15:40:49 +01:00