FreakU
/
mastodon
Archived
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
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.
mastodon/app/javascript
History
Thibaut Girka 034ffc079e Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/admin/base_controller.rb
  Some refactoring made upstream, no real conflict.
- app/javascript/mastodon/features/compose/components/compose_form.js
  Updated using upstream's code but using maxChars instead of the
  hardcoded length of 500 characters per toot.
- app/javascript/styles/mastodon/components.scss
  Upstream redesigned the onboarding modal. Not sure why we had a
  conflict there.
 		2018-12-18 16:55:15 +01:00
..
core Merge branch 'master' into glitch-soc/merge-upstream 2018-12-09 16:08:04 +01:00
flavours Sandbox toot embeds in the embed modal 2018-12-17 22:22:29 +01:00
fonts
…
images Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
locales Merge branch 'master' into glitch-soc/merge-upstream 2018-12-01 21:00:16 +01:00
mastodon Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00
packs Escape HTML in profile name preview in profile settings (#9446) 2018-12-07 16:42:22 +01:00
skins
…
styles Merge branch 'master' into glitch-soc/merge-upstream 2018-12-18 16:55:15 +01:00