David Yip
|
ed572490c1
|
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
|
7 years ago |
Akihiko Odaki
|
616b6867a0
|
Show mastodon on modal (#6129)
|
7 years ago |
kibigo!
|
8aeda4f064
|
Finalized theme loading and stuff
|
7 years ago |
Clworld
|
39b3080d51
|
Make share intent modal to make "signed in as" shown. (#4611)
* Make share intent modal to make "signed in as" shown.
* fix glitch on mobile.
|
7 years ago |
Eugen Rochko
|
0e5c8372e7
|
Add protocol handler. Handle follow intents (#4511)
* Add protocol handler. Handle follow intents
* Add share intent
* Improve code in intents controller
* Adjust share form CSS
|
7 years ago |
