You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire fe89554a54 Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/activitypub/activity/create.rb`: Upstream refactored how `Create` activities are handled and how values are extracted from `Create`d objects. This conflicted with how glitch-soc supported the `directMessage` flag to explicitly distinguish between limited and direct messages. Ported glitch-soc's changes to latest upstream changes. - `app/services/fan_out_on_write_service.rb`: Upstream largely refactored that file and changed some of the logic. This conflicted with glitch-soc's handling of the direct timeline and the options to allow replies and boosts in public feeds. Ported those glitch-soc changes on top of latest upstream changes. - `app/services/process_mentions_service.rb`: Upstream refactored to move mention-related ActivityPub deliveries to `ActivityPub::DeliveryWorker`, while glitch-soc contained an extra check to not send local-only toots to remote mentioned users. Took upstream's version, as the check is not needed anymore, since it is performed at the `ActivityPub::DeliveryWorker` call site already. - `app/workers/feed_insert_worker.rb`: Upstream added support for `update` toot events, while glitch-soc had support for an extra timeline support, `direct`. Ported upstream changes and extended them to the `direct` timeline. Additional changes: - `app/lib/activitypub/parser/status_parser.rb`: Added code to handle the `directMessage` flag and take it into account to compute visibility. - `app/lib/feed_manager.rb`: Extended upstream's support of `update` toot events to glitch-soc's `direct` timeline.		3 years ago
..
_mixins.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
about.scss	Remove duplicate CSS properties (#16278)	4 years ago
accessibility.scss	Improve rendering of emoji which do not contrast with background (#13772)	5 years ago
accounts.scss	Add batch suspend for accounts in admin UI (#17009)	3 years ago
admin.scss	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
basics.scss	Fix various issues around OpenGraph representation of media (#14133)	4 years ago
boost.scss	Fix styling of boost button in media modal not reflecting ability to boost (#16387)	3 years ago
compact_header.scss	Separate high contrast theme (#7213)	7 years ago
components.scss	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
containers.scss	Fix logo button style more (#15458)	4 years ago
dashboard.scss	Add trending links (#16917)	3 years ago
emoji_picker.scss	Fix background-color of emoji-mart selector (#17011)	3 years ago
footer.scss	Revert "Avoid using uppercase text-transform (#12684)" (#12987)	5 years ago
forms.scss	Remove Keybase integration (#17045)	3 years ago
introduction.scss	Fix performance of home feed regeneration (#12084)	5 years ago
lists.scss	Restore vanilla components	7 years ago
modal.scss	Use custom mascot on static share page (#15687)	4 years ago
polls.scss	Add notifications for statuses deleted by moderators (#17204)	3 years ago
reset.scss	Fix Firefox scrollbar color regression in #9210 (#9908)	6 years ago
rtl.scss	Improve hover and focus style in columns settings (#16222)	3 years ago
statuses.scss	Fix logo button style more (#15458)	4 years ago
tables.scss	Add batch suspend for accounts in admin UI (#17009)	3 years ago
variables.scss	Add interrelationship icon (#15149)	4 years ago
widgets.scss	Add batch suspend for accounts in admin UI (#17009)	3 years ago