queer-af/mastodon
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
mastodon/app/views
History
Thibaut Girka 249991c498 Merge branch 'master' into glitch-soc/merge-upstream 
Conflicts:
- Gemfile.lock
- app/controllers/accounts_controller.rb
- app/controllers/admin/dashboard_controller.rb
- app/controllers/follower_accounts_controller.rb
- app/controllers/following_accounts_controller.rb
- app/controllers/remote_follow_controller.rb
- app/controllers/stream_entries_controller.rb
- app/controllers/tags_controller.rb
- app/javascript/packs/public.js
- app/lib/sanitize_config.rb
- app/models/account.rb
- app/models/form/admin_settings.rb
- app/models/media_attachment.rb
- app/models/stream_entry.rb
- app/models/user.rb
- app/serializers/initial_state_serializer.rb
- app/services/batched_remove_status_service.rb
- app/services/post_status_service.rb
- app/services/process_mentions_service.rb
- app/services/reblog_service.rb
- app/services/remove_status_service.rb
- app/views/admin/settings/edit.html.haml
- config/locales/simple_form.pl.yml
- config/settings.yml
- docker-compose.yml
2019-07-19 18:26:49 +02:00
..
about Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
accounts Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
admin_mailer Add invite request to pending account notification e-mail (#10528) 2019-04-10 00:36:01 +02:00
application Remove Atom feeds and old URLs in the form of GET /:username/updates/:id (#11247) 2019-07-07 16:16:51 +02:00
auth Fix sign up button not saying sign up when invite is used (#10623) 2019-04-23 04:39:21 +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
errors
filters
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
invites
kaminari
layouts Merge branch 'master' into glitch-soc/merge-upstream 2019-06-10 18:59:53 +02:00
media
notification_mailer
oauth Add button to conveniently copy OAuth code (#11065) 2019-06-13 00:14:42 +02:00
public_timelines
relationships Merge branch 'master' into glitch-soc/merge-upstream 2019-03-28 13:01:33 +01:00
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 Add option to disable real-time updates in web UI (#9984) 2019-07-16 16:11:50 +02:00
shared
shares
statuses Merge branch 'master' into glitch-soc/merge-upstream 2019-07-19 18:26:49 +02:00
tags
user_mailer
well_known Add ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00