tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Mastodon/app/views
History
Thibaut Girka 291012ec0c Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- app/controllers/accounts_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/statuses_controller.rb

All conflicts caused by the additional `use_pack` used for glitch-soc's theming
system.
2019-03-18 18:03:27 +01:00
..
about
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-16 14:14:20 +01:00
accounts
Merge branch 'master' into glitch-soc/merge-upstream
2019-02-10 21:10:09 +01:00
admin
Merge branch 'master' into glitch-soc/merge-upstream
2019-03-16 14:14:20 +01:00
admin_mailer
Admission-based registrations mode (#10250)
2019-03-14 05:28:30 +01:00
application
Bump webpacker from 3.5.5 to 4.0.2 (#10277)
2019-03-15 15:05:31 +01:00
auth
Admission-based registrations mode (#10250)
2019-03-14 05:28:30 +01: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
…
filters
Redesign forms, verify link ownership with rel="me" (#8703)
2018-09-18 16:45:58 +02:00
follower_accounts
Redesign public profiles and toots (#8068)
2018-07-28 19:25:33 +02:00
following_accounts
Redesign public profiles and toots (#8068)
2018-07-28 19:25:33 +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
…
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-18 18:03:27 +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
Fix settings/flavours
2019-03-16 16:21:20 +01: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-08 00:57:13 +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