an 7126d53baf Merge branch 'master' of https://github.com/noiob/awoospace ... # Conflicts: # app/controllers/settings/preferences_controller.rb # app/helpers/settings_helper.rb # app/javascript/flavours/glitch/features/compose/components/compose_form.js # app/javascript/flavours/glitch/features/compose/components/publisher.js # app/javascript/flavours/glitch/styles/about.scss # app/javascript/flavours/glitch/styles/variables.scss # app/javascript/mastodon/features/ui/components/modal_root.js # app/javascript/styles/mastodon/variables.scss # app/lib/ostatus/activity/creation.rb # app/models/status.rb # app/services/pubsubhubbub/subscribe_service.rb # app/services/resolve_account_service.rb # app/services/send_interaction_service.rb # app/services/update_remote_profile_service.rb # app/validators/status_length_validator.rb # app/views/about/more.html.haml # app/views/about/show.html.haml # app/workers/pubsubhubbub/delivery_worker.rb # config/application.rb # config/locales/simple_form.en.yml		2019-12-21 22:29:34 -05:00
..
about	Merge branch 'master' of https://github.com/noiob/awoospace	2019-12-21 22:29:34 -05:00
accounts	Merge branch 'master' into glitch-soc/merge-upstream	2019-10-27 12:14:01 +01:00
admin	Reactivate public pages in allowlist mode	2019-12-10 20:02:47 +01: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	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +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	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-08-19 21:49:35 +02:00
invites	Fix maxed-out invites not showing up as expired in UI (#10274)	2019-03-15 05:35:17 +01:00
kaminari	Pagination improvements (#1445)	2017-04-11 01:11:41 +02:00
layouts	Merge branch 'master' of https://github.com/noiob/awoospace	2019-12-21 22:29:34 -05:00
media	Save video metadata and improve video OpenGraph tags (#6481)	2018-02-16 07:22:20 +01:00
notification_mailer	Fix NotificationMailer failing when receiving mention with media from remote instance (#11765)	2019-09-05 06:14:30 +02:00
oauth	Add noopener and/or noreferrer (#12202)	2019-10-24 22:44:42 +02:00
public_timelines	Merge branch 'master' into glitch-soc/merge-upstream	2019-11-06 14:38:28 +01:00
relationships	Merge branch 'master' into glitch-soc/merge-upstream	2019-12-01 12:12:42 +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	Merge branch 'master' of https://github.com/noiob/awoospace	2019-12-21 22:29:34 -05:00
shared	Remove fallback to long description on sidebar and meta description (#12119)	2019-10-08 22:08:55 +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-10-27 12:14:01 +01: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