David Yip
|
54148b9a4a
|
Merge remote-tracking branch 'origin/master' into merge-upstream
Conflicts:
app/controllers/authorize_follows_controller.rb
app/javascript/styles/mastodon/components.scss
|
2018-01-02 00:11:41 -06:00 |
|
Akihiko Odaki
|
2c1ed5f872
|
Show mastodon on modal (#6129)
|
2018-01-02 05:07:56 +01:00 |
|
kibigo!
|
bdbbd06dad
|
Finalized theme loading and stuff
|
2017-11-20 22:13:37 -08:00 |
|
Clworld
|
f814661fca
|
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.
|
2017-08-16 16:48:44 +02:00 |
|
Eugen Rochko
|
3c6503038e
|
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
|
2017-08-14 04:53:31 +02:00 |