1,503 commits

Author	SHA1	Message	Date
Claire	6530f9709c	Merge commit '121443c0fc' into glitch-soc/main ... Conflicts: - `.rubocop_todo.yml`: Upstream regenerated this file, glitch-soc had a specific ignore.	2023-08-13 18:47:15 +02:00
Claire	44a5f1b64a	Merge commit '425d77f812' 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	2023-08-11 22:15:41 +02:00
Eugen Rochko	e325443b02	Change header of hashtag timelines in web UI (#26362)	2023-08-07 09:46:11 +02:00
Claire	79936c584f	Fix report modal secondary buttons style (#26341)	2023-08-04 16:25:44 +02:00
Trevor Wolf	93372fee1e	Fix light theme select option for hashtags (#26311)	2023-08-04 09:41:17 +02:00
Eugen Rochko	04e7efac3f	Change design of hidden media overlay (again) in web UI (#26330)	2023-08-03 20:39:45 +02:00
Trevor Wolf	6308dca76a	change column link to add a better keyboard focus indicator (#26278)	2023-08-02 19:33:41 +02:00
Eugen Rochko	2cbdff97ce	Change design of role badges in web UI (#26281) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2023-08-02 17:24:32 +02:00
Eugen Rochko	01f0cffc2c	Fix line clamp for link previews in web UI (#26286)	2023-08-02 04:17:23 +02:00
Eugen Rochko	4c999a736c	Fix wrong border radius on link cards in web UI (#26287)	2023-08-02 01:57:31 +02:00
Claire	92fa9d34b0	Merge commit '3554c52795' 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.	2023-07-30 16:11:55 +02:00
Claire	bd349cb850	Merge commit 'ce1f35d7e2' 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.	2023-07-30 14:58:56 +02:00
Claire	b2515feb29	Merge commit 'cfd50f30bb' into glitch-soc/merge-upstream	2023-07-30 14:33:28 +02:00
Claire	42f36aa55a	Merge commit '5b457961fc' 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.	2023-07-30 13:49:35 +02:00
Eugen Rochko	d4807a5e64	Change aspect ratios on link previews in web UI (#26250)	2023-07-30 03:35:17 +02:00
Claire	bbea052935	Fix emoji picker button scrolling with textarea content in single-column view (#25304)	2023-07-27 16:20:33 +02:00
Claire	b4e739ff0f	Change interaction modal in web UI (#26075) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2023-07-27 16:11:17 +02:00
Claire	1e4ccc655a	Add role badges to the WebUI (#25649)	2023-07-27 16:05:24 +02:00
Claire	ce1f35d7e2	Revert poll colors to green outside of compose form (#26164)	2023-07-25 15:32:59 +02:00
Trevor Wolf	49d2e8979f	fix poll input active style (#26162)	2023-07-25 13:39:15 +02:00
Eugen Rochko	f826a95f6e	Add published date and author to news on the explore screen in web UI (#26155)	2023-07-25 00:57:15 +02:00
Eugen Rochko	714a20697f	Fix missing action label on sensitive videos and embeds in web UI (#26135)	2023-07-24 22:04:38 +02:00
Eugen Rochko	d1a9f601c7	Fix missing border on error screen in light theme in web UI (#26152)	2023-07-24 19:53:33 +02:00
gol-cha	9a567ec1d1	Fix UI Overlap with the loupe icon in the Explore Tab (#26113)	2023-07-24 17:56:20 +02:00
Trevor Wolf	80809ef33e	change poll form element colors to fit with the rest of the ui (#26139)	2023-07-24 13:48:09 +02:00
Eugen Rochko	6b2952d1dd	Change design of link previews in web UI (#26136)	2023-07-24 13:47:28 +02:00
Eugen Rochko	4d01d1a1ee	Remove 16:9 cropping from web UI (#26132)	2023-07-24 13:46:55 +02:00
Eugen Rochko	cfd50f30bb	Fix focus and hover styles in web UI (#26125)	2023-07-23 17:55:13 +02:00
Trevor Wolf	59478a1b46	change focus ui for keyboard only input (#25935)	2023-07-21 13:20:14 +02:00
Claire	c943f17b1b	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-17 12:52:15 +02:00
Michael Stanclift	97ce47e451	Fix for "follows you" indicator in light web UI not readable (#25993)	2023-07-17 11:51:00 +02:00
Terence Eden	b923a4c755	Prevent split line between icon and number on reposts & favourites (#26004)	2023-07-16 10:06:33 +02:00
Claire	25571b18ed	Merge commit '5a3f174d56' into glitch-soc/merge-upstream	2023-07-13 14:22:20 +02:00
Claire	95a1fde6b6	Merge commit '73b64b8917' 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.	2023-07-13 13:49:58 +02:00
Claire	5a3f174d56	Fix follow link style in embeds (#25965)	2023-07-13 12:58:56 +02:00
Renaud Chaput	73b64b8917	Upgrade to Prettier 3 (#25902)	2023-07-13 11:26:45 +02:00
Claire	9ae60f8738	Merge commit '82e477b184' 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.	2023-07-12 16:03:05 +02:00
Claire	2aadebc769	Merge commit '8e0fd2d619' 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	2023-07-12 15:54:58 +02:00
Claire	075887e1d6	Merge commit 'ea10febd25' into glitch-soc/merge-upstream	2023-07-12 15:44:33 +02:00
Claire	dd0002e1fe	Merge commit '610cf6c371' 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.	2023-07-12 15:38:35 +02:00
Claire	82eebd0482	Merge commit '41a505513f' 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.	2023-07-12 15:27:32 +02:00
Claire	7e54a30f06	Merge commit '4534498a8e' into glitch-soc/merge-upstream	2023-07-12 15:00:41 +02:00
Renaud Chaput	ecd8e0d612	Update Stylelint (#25819)	2023-07-12 12:31:23 +02:00
Stanislas Signoud	ca955ada0b	Use invariant colors on notification toasts (#25919)	2023-07-11 23:30:21 +02:00
Trevor Wolf	ea10febd25	fix buttons showing inconsistent styles (#25903)	2023-07-11 12:26:09 +02:00
Claire	c27b82a437	Add forward_to_domains parameter to POST /api/v1/reports (#25866)	2023-07-10 18:26:56 +02:00
Eugen Rochko	338a0e70cc	Change label and design of sensitive and unavailable media in web UI (#25712)	2023-07-08 20:05:33 +02:00
Eugen Rochko	a7ca33ad96	Add toast with option to open post after publishing in web UI (#25564)	2023-07-08 20:01:08 +02:00
Renaud Chaput	9f078e238d	Fix translate button position (#25807)	2023-07-08 00:12:31 +02:00
Claire	5de49e74d4	Merge branch 'main' into glitch-soc/merge-upstream	2023-07-05 12:01:26 +02:00