tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
4d01d9c46f9628a2c1e350f34587472dd9e7ffee
Mastodon/app/controllers
History
Thibaut Girka 1d6152f440 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- config/locales/en.yml
  Conflict caused by the glitch-soc-specific “flavour” string being too close
  to the newly introduced “identity_proofs” string. Just included both.
2019-03-20 13:54:00 +01:00
..
activitypub
Add specs for activitypub collections controller (#9484)
2018-12-10 21:39:25 +01:00
admin
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-20 13:54:00 +01:00
api
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-20 13:54:00 +01:00
auth
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-14 17:17:20 +01:00
concerns
Admission-based registrations mode (#10250)
2019-03-14 05:28:30 +01:00
oauth
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-10 21:10:09 +01:00
settings
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-20 13:54:00 +01:00
well_known
Add Keybase integration (#10297)
2019-03-18 21:00:55 +01:00
about_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-13 15:16:02 +01:00
account_follow_controller.rb
…
account_unfollow_controller.rb
…
accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01:00
application_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01:00
authorize_interactions_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-18 18:04:49 +02:00
custom_css_controller.rb
Add admin custom CSS setting (#8399)
2018-08-24 04:33:27 +02:00
directories_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-20 16:49:23 +01:00
emojis_controller.rb
Unuse ActiveRecord::Base#cache_key (#8185)
2018-08-19 15:52:38 +02:00
filters_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-26 20:41:43 +02:00
follower_accounts_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01:00
following_accounts_controller.rb
…
home_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-11 15:45:42 +02:00
intents_controller.rb
Add remote interaction dialog for toots (#8202)
2018-08-18 03:03:12 +02:00
invites_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-10-26 20:41:43 +02:00
manifests_controller.rb
…
media_controller.rb
fix CSP / X-Frame-Options for media embeds (#9558)
2018-12-18 16:40:30 +01:00
media_proxy_controller.rb
…
public_timelines_controller.rb
[Glitch] Redesign landing page
2019-03-13 15:53:00 +01:00
relationships_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01:00
remote_follow_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2018-08-18 18:04:49 +02:00
remote_interaction_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-01-10 21:00:30 +01:00
remote_unfollows_controller.rb
…
shares_controller.rb
…
statuses_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-18 18:03:27 +01:00
stream_entries_controller.rb
…
tags_controller.rb
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-13 15:16:02 +01:00