tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
14f797873d86aed085dad2ff60c8dad2ab3d4b7b
Mastodon/app/views
History
Thibaut Girka 16ff7c5627 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile
- Gemfile.lock
- app/controllers/about_controller.rb
- app/controllers/auth/sessions_controller.rb
2019-09-30 12:23:57 +02:00
..
about
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
accounts
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
admin
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
admin_mailer
Fixed not being able to display review pending hashtags in the admin UI. (#11875)
2019-09-17 16:59:16 +02:00
application
Fix user preference to show trends not working on public pages (#11740)
2019-09-03 04:57:07 +02:00
auth
Add (back) option to set redirect notice on account without moving followers (#11994)
2019-09-29 05:03:19 +02:00
authorize_interactions
Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)
2019-07-07 16:16:51 +02:00
directories
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-05 11:36:41 +02:00
errors
Fix uncaught parameter missing exceptions and missing error templates (#11702)
2019-08-30 01:34:47 +02:00
filters
…
follower_accounts
…
following_accounts
…
home
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
invites
Add invite comments (#10465)
2019-08-19 11:40:42 +02:00
kaminari
…
layouts
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
media
…
notification_mailer
Fix NotificationMailer failing when receiving mention with media from remote instance (#11765)
2019-09-05 06:14:30 +02:00
oauth
Change unconfirmed user login behaviour (#11375)
2019-07-22 10:48:50 +02:00
public_timelines
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
relationships
…
remote_follow
…
remote_interaction
Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247)
2019-07-07 16:16:51 +02:00
settings
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
shared
Change OpenGraph description on sign-up page to reflect invite (#11744)
2019-09-03 04:56:54 +02:00
shares
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
statuses
Merge branch 'master' into glitch-soc/merge-upstream
2019-09-30 12:23:57 +02:00
tags
Merge branch 'master' into glitch-soc/merge-upstream
2019-08-19 21:49:35 +02:00
user_mailer
Add password challenge to 2FA settings, e-mail notifications (#11878)
2019-09-18 16:37:27 +02:00
well_known/host_meta
Remove XML version of Webfinger and remove links to Atom feeds (#11460)
2019-08-01 19:14:02 +02:00