This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.
mastodon/app/views
Thibaut Girka 24968d20a0 Merge branch 'master' into glitch-soc/merge-upstream
Conflicts:
- app/controllers/directories_controller.rb
- package.json
- yarn.lock
2019-07-30 12:22:33 +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-28 16:28:05 +02:00
admin Merge branch 'master' into glitch-soc/merge-upstream 2019-07-30 12:22:33 +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 Add whitelist mode (#11291) 2019-07-30 11:10:46 +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-01-19 18:28:37 +01:00
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 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-07-30 12:22:33 +02:00
media
notification_mailer Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
oauth Change unconfirmed user login behaviour (#11375) 2019-07-22 10:48:50 +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 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 Bump webpacker from 3.5.5 to 4.0.2 (#10277) 2019-03-15 15:05:31 +01:00
shares
statuses Merge branch 'master' into glitch-soc/merge-upstream 2019-07-28 16:28:05 +02: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 ActivityPub actor representing the entire server (#11321) 2019-07-19 01:44:42 +02:00