luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-12-21 04:39:23 +00:00
Code Issues Projects Releases Wiki Activity
mastodon/app/helpers
History
Thibaut Girka 5085559b15 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/views/admin/pending_accounts/index.html.haml
  No real conflict, upstream changes too close to glitch-specific
  theming system changes.
- config/navigation.rb
  Upstream redesigned the settings navigation, took those changes
  and re-inserted the flavours menu.
2019-04-10 09:16:08 +02:00
..
admin Add order options to relationship manager UI (#10404) 2019-03-28 02:16:01 +01:00
settings
application_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
flashes_helper.rb
home_helper.rb Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
instance_helper.rb Do not default site_title with site_hostname in InstanceHelper (#6624) 2018-03-04 20:29:49 +01:00
jsonld_helper.rb Fix poll update handler calling method was that was not available (#10246) 2019-03-12 22:58:59 +01:00
routing_helper.rb Fallback default thumbnail in instance status API (#6177) 2018-01-04 15:36:55 +01:00
settings_helper.rb Add missing locales (bn, ga, hi) (#10295) 2019-03-18 21:55:21 +01:00
stream_entries_helper.rb Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00