alex
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
mastodon/app/views
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
..
about Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
accounts Merge branch 'master' into glitch-soc/merge-upstream 2019-04-08 15:57:56 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
admin_mailer Add invite request to pending account notification e-mail (#10528) 2019-04-10 00:36:01 +02:00
application Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
auth Add "why do you want to join" field to invite requests (#10524) 2019-04-09 23:06:30 +09:00
authorize_interactions Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00
directories Merge branch 'master' into glitch-soc/merge-upstream 2019-01-19 18:28:37 +01:00
errors New error page graphic. Other error page improvements (#5099) 2017-09-25 23:05:54 +02:00
filters Redesign forms, verify link ownership with rel="me" (#8703) 2018-09-18 16:45:58 +02:00
follower_accounts Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
following_accounts Improve blocked view of profiles (#10491) 2019-04-07 04:59:13 +02:00
home Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
invites Fix maxed-out invites not showing up as expired in UI (#10274) 2019-03-15 05:35:17 +01:00
kaminari
…
layouts Merge branch 'master' into glitch-soc/merge-upstream 2019-03-16 14:14:20 +01:00
media Save video metadata and improve video OpenGraph tags (#6481) 2018-02-16 07:22:20 +01:00
notification_mailer Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
oauth Oauth code in input form and add description message (#4986) 2017-09-17 15:23:44 +02:00
public_timelines [Glitch] Redesign landing page 2019-03-13 15:53:00 +01:00
relationships Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
remote_follow Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
remote_interaction Admission-based registrations mode (#10250) 2019-03-14 05:28:30 +01:00
remote_unfollows Redesign public profiles and toots (#8068) 2018-07-28 19:25:33 +02:00
settings Merge branch 'master' into glitch-soc/merge-upstream 2019-04-10 09:16:08 +02:00
shared Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
shares Finalized theme loading and stuff 2017-11-20 22:13:37 -08:00
stream_entries Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
tags Merge branch 'master' into glitch-soc/merge-upstream 2019-03-13 15:16:02 +01:00
user_mailer Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
well_known Add remote interaction dialog for toots (#8202) 2018-08-18 03:03:12 +02:00