1503 Commits (d9451feef092941f14346ae47abadc7508c1b1a6)

Author	SHA1	Message	Date
Claire	6530f9709c	Merge commit '121443c0fca383268b8022c048dd137994785aff' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	1 year ago
Claire	44a5f1b64a	Merge commit '425d77f8124a50fc033e8fb3bdf7b89a6a25f4fa' into glitch-soc/merge-upstream ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore. - `README.md`: Upstream updated its README, but glitch-soc has a completely different one. Kept glitch-soc's README	1 year ago
Eugen Rochko	e325443b02	Change header of hashtag timelines in web UI (#26362)	1 year ago
Claire	79936c584f	Fix report modal secondary buttons style (#26341)	1 year ago
Trevor Wolf	93372fee1e	Fix light theme select option for hashtags (#26311)	1 year ago
Eugen Rochko	04e7efac3f	Change design of hidden media overlay (again) in web UI (#26330)	1 year ago
Trevor Wolf	6308dca76a	change column link to add a better keyboard focus indicator (#26278)	1 year ago
Eugen Rochko	2cbdff97ce	Change design of role badges in web UI (#26281) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	1 year ago
Eugen Rochko	01f0cffc2c	Fix line clamp for link previews in web UI (#26286)	1 year ago
Eugen Rochko	4c999a736c	Fix wrong border radius on link cards in web UI (#26287)	1 year ago
Claire	92fa9d34b0	Merge commit '3554c527954441fd924586a49c7d99a89101ac7e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/authorize_interactions_controller.rb`: Small conflict due to our theming system. - `streaming/index.js`: Upstream refactored part of the streaming server. We had some extra logic for handling local-only posts. Applied the refactor.	1 year ago
Claire	bd349cb850	Merge commit 'ce1f35d7e213327549b960bb64f63c67a141ea40' into glitch-soc/merge-upstream ... Conflicts: - `db/schema.rb`: Upstream regenerated the schema file using Rails 7, the conflicts are caused by our extra columns. Applied upstream's changes, but keeping our extra columns.	1 year ago
Claire	b2515feb29	Merge commit 'cfd50f30bb5dda4dd90e1ad01f3e62c99135c36f' into glitch-soc/merge-upstream	1 year ago
Claire	42f36aa55a	Merge commit '5b457961fc1189a71599dc6c06b3f159b195a455' into glitch-soc/merge-upstream ... Conflicts: - `config/initializers/content_security_policy.rb`: Upstream fixed an issue that was not present in glitch-soc. Kept our version.	1 year ago
Eugen Rochko	d4807a5e64	Change aspect ratios on link previews in web UI (#26250)	1 year ago
Claire	bbea052935	Fix emoji picker button scrolling with textarea content in single-column view (#25304)	1 year ago
Claire	b4e739ff0f	Change interaction modal in web UI (#26075) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	1 year ago
Claire	1e4ccc655a	Add role badges to the WebUI (#25649)	1 year ago
Claire	ce1f35d7e2	Revert poll colors to green outside of compose form (#26164)	1 year ago
Trevor Wolf	49d2e8979f	fix poll input active style (#26162)	1 year ago
Eugen Rochko	f826a95f6e	Add published date and author to news on the explore screen in web UI (#26155)	1 year ago
Eugen Rochko	714a20697f	Fix missing action label on sensitive videos and embeds in web UI (#26135)	1 year ago
Eugen Rochko	d1a9f601c7	Fix missing border on error screen in light theme in web UI (#26152)	1 year ago
gol-cha	9a567ec1d1	Fix UI Overlap with the loupe icon in the Explore Tab (#26113)	1 year ago
Trevor Wolf	80809ef33e	change poll form element colors to fit with the rest of the ui (#26139)	1 year ago
Eugen Rochko	6b2952d1dd	Change design of link previews in web UI (#26136)	1 year ago
Eugen Rochko	4d01d1a1ee	Remove 16:9 cropping from web UI (#26132)	1 year ago
Eugen Rochko	cfd50f30bb	Fix focus and hover styles in web UI (#26125)	1 year ago
Trevor Wolf	59478a1b46	change focus ui for keyboard only input (#25935)	1 year ago
Claire	c943f17b1b	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago
Michael Stanclift	97ce47e451	Fix for "follows you" indicator in light web UI not readable (#25993)	1 year ago
Terence Eden	b923a4c755	Prevent split line between icon and number on reposts & favourites (#26004)	1 year ago
Claire	25571b18ed	Merge commit '5a3f174d561cbdc79a597cd2b9502ed058d372da' into glitch-soc/merge-upstream	1 year ago
Claire	95a1fde6b6	Merge commit '73b64b89170cb72854a1709186c62ce31f476889' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/styles/fonts/roboto-mono.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file. - `app/javascript/styles/fonts/roboto.scss`: Upstream updated the linter, which changed a few linter rules. Some of those changed lines are different in glitch-soc because we use different paths for the assets. Applied the same style rules on our version of the file.	1 year ago
Claire	5a3f174d56	Fix follow link style in embeds (#25965)	1 year ago
Renaud Chaput	73b64b8917	Upgrade to Prettier 3 (#25902)	1 year ago
Claire	9ae60f8738	Merge commit '82e477b184b5666fff7fb55933dce22ca2925db8' into glitch-soc/merge-upstream ... Conflicts: - `db/migrate/20180831171112_create_bookmarks.rb`: Upstream ran a lint fix on this file, but this file is different in glitch-soc because the feature was added much earlier. Ran the lint fix on our own version of the file.	1 year ago
Claire	2aadebc769	Merge commit '8e0fd2d619dac93c193da6a762564244e5622498' into glitch-soc/merge-upstream ... Conflicts: - `.github/workflows/build-image.yml`: Upstream changed how releases are tagged, we don't have releases. Ignored the changes	1 year ago
Claire	075887e1d6	Merge commit 'ea10febd257b5b729a50aeb3218389763f5f4b97' into glitch-soc/merge-upstream	1 year ago
Claire	dd0002e1fe	Merge commit '610cf6c3713e414995ea1a57110db400ccb88dd2' into glitch-soc/merge-upstream ... Conflicts: - `app/models/trends.rb`: Conflict due to glitch-soc's code splitting trends mailing depending on type. Ported upstream's changes.	1 year ago
Claire	82eebd0482	Merge commit '41a505513fb36f7c28c8d8a4270d5ee192169462' into glitch-soc/merge-upstream ... Conflicts: - `app/serializers/initial_state_serializer.rb`: Upstream renamed an initial state parameter, where we had extra ones. Renamed as upstream did. - `app/workers/feed_insert_worker.rb`: Upstream wrapped database query in a block, we had extra database queries because of the DM timeline. Moved everything in the block.	1 year ago
Claire	7e54a30f06	Merge commit '4534498a8e43f59980ee56e9938efab8580c78c8' into glitch-soc/merge-upstream	1 year ago
Renaud Chaput	ecd8e0d612	Update Stylelint (#25819)	1 year ago
Stanislas Signoud	ca955ada0b	Use invariant colors on notification toasts (#25919)	1 year ago
Trevor Wolf	ea10febd25	fix buttons showing inconsistent styles (#25903)	1 year ago
Claire	c27b82a437	Add `forward_to_domains` parameter to `POST /api/v1/reports` (#25866)	1 year ago
Eugen Rochko	338a0e70cc	Change label and design of sensitive and unavailable media in web UI (#25712)	1 year ago
Eugen Rochko	a7ca33ad96	Add toast with option to open post after publishing in web UI (#25564)	1 year ago
Renaud Chaput	9f078e238d	Fix translate button position (#25807)	1 year ago
Claire	5de49e74d4	Merge branch 'main' into glitch-soc/merge-upstream	1 year ago