glitchier-soc

History

Claire 12b935fadf Merge branch 'main' into glitch-soc/merge-upstream Conflicts: - `.github/dependabot.yml`: Updated upstream, removed in glitch-soc to disable noise. Kept removed. - `CODE_OF_CONDUCT.md`: Upstream updated to a new version of the covenant, but I have not read it yet, so kept unchanged. - `Gemfile.lock`: Not a real conflict, one upstream dependency updated textually too close to the glitch-soc only `hcaptcha` dependency. Applied upstream changes. - `app/controllers/admin/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/application_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/disputes/base_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/relationships_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/controllers/statuses_cleanup_controller.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/helpers/application_helper.rb`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `app/javascript/mastodon/features/compose/components/compose_form.jsx`: Upstream added a highlight animation for onboarding, while we changed the max character limit. Applied our local changes on top of upstream's new version. - `app/views/layouts/application.html.haml`: Minor conflict due to glitch-soc's theming system. Applied upstream changes. - `stylelint.config.js`: Upstream added ignore paths, glitch-soc had extra ignore paths. Added the same paths as upstream.		2 years ago
..
actions	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
components	Change logo version in header based on screen size in web UI (#24707 )	2 years ago
containers	Add lines to threads in web UI (#24549 )	2 years ago
features	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
locales	Merge branch 'main' into glitch-soc/merge-upstream	2 years ago
middleware	Enable eslint:recommended ruleset (#22433 )	2 years ago
reducers	Add default post text to onboarding flow in web UI (#24705 )	2 years ago
selectors	Fix broken links in account gallery (#24218 )	2 years ago
service_worker	fix(web-push-notifications): fix favourite push notifications (#23286 )	2 years ago
store	Enable eslint:recommended ruleset (#22433 )	2 years ago
utils	Allow `==` when null checking (#24593 )	2 years ago
api.js	[Proposal] Make able to write React in Typescript (#16210 )	2 years ago
base_polyfills.js	Remove Array.prototype.includes polyfill (#24234 )	2 years ago
blurhash.js	Fix not being able to open audio modal in web UI (#15283 )	4 years ago
common.js	Enable eslint:recommended ruleset (#22433 )	2 years ago
compare_id.js	Enable eslint:recommended ruleset (#22433 )	2 years ago
extra_polyfills.js	chore: remove intersection-observer for old Safari support (#23284 )	2 years ago
initial_state.js	[Glitch] [Proposal] Make able to write React in Typescript (#2190 )	2 years ago
is_mobile.js	[Proposal] Make able to write React in Typescript (#16210 )	2 years ago
load_keyboard_extensions.js	fix: support KaiOS arrow navigation on public pages (#12251 )	5 years ago
load_polyfills.js	Remove Array.prototype.includes polyfill (#24234 )	2 years ago
main.jsx	Rename JSX files with proper `.jsx` extension (#23733 )	2 years ago
performance.js	Move ESLint configs to overrides (#24370 )	2 years ago
permissions.js	Add dropdown menu item to open admin interface for remote domains (#21895 )	2 years ago
ready.js	Disable push notification when not logged in (#19272 )	2 years ago
scroll.js	Use ScrollToOptions for smooth scrolling if supported (#11207 )	5 years ago
settings.js	Add dismissable hints to various timelines in web UI (#19315 )	2 years ago
stream.js	[Proposal] Make able to write React in Typescript (#16210 )	2 years ago
test_setup.js	Replace to testing-library from enzyme (#14152 )	4 years ago
uuid.ts	New Crowdin updates (#24276 )	2 years ago