d0b753db6b
Merge branch 'master' into glitch-soc/merge
...
Conflicts:
app/controllers/invites_controller.rb
app/serializers/initial_state_serializer.rb
config/locales/ko.yml
2018-05-11 18:12:42 +02:00
e86a4fe36b
Add REST API for Web Push Notifications subscriptions ( #7445 )
...
- POST /api/v1/push/subscription
- PUT /api/v1/push/subscription
- DELETE /api/v1/push/subscription
- New OAuth scope: "push" (required for the above methods)
2018-05-11 11:49:12 +02:00
8c41fb4acc
Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master
2018-01-17 16:17:10 +00:00
1827d142ee
implement web share target ( #6278 )
...
* web share target
* fix
* fix
2018-01-17 17:08:10 +01:00
ed572490c1
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
616b6867a0
Show mastodon on modal ( #6129 )
2018-01-02 05:07:56 +01:00
8aeda4f064
Finalized theme loading and stuff
2017-11-20 22:13:37 -08:00
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.
2017-08-16 16:48:44 +02:00
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
2017-08-14 04:53:31 +02:00
Thibaut Girka