1,657 commits

Author	SHA1	Message	Date
Claire	15f6d2d038	Merge commit 'd27eb181f6' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Conflict due to glitch-soc having a different default site name. Updated the tests as upstream did, keeping glitch-soc's default name.	2024-05-01 17:22:02 +02:00
Claire	2c386d4cfe	Merge commit 'c70c39cad0' into glitch-soc/merge-upstream	2024-05-01 17:06:49 +02:00
Claire	7f404fd635	Merge commit '90eb4a5d01' into glitch-soc/merge-upstream	2024-05-01 16:47:25 +02:00
Claire	3f61981f5d	Merge commit '8a498f4e65' into glitch-soc/merge-upstream	2024-05-01 14:50:16 +02:00
Claire	7b46517c38	Merge commit 'd49343ed11' into glitch-soc/merge-upstream	2024-05-01 14:31:14 +02:00
Claire	0e76b919b5	Merge commit '0cea7a623b' into glitch-soc/merge-upstream	2024-04-06 21:48:35 +02:00
Claire	777984faeb	Merge commit '119c7aa0df' into glitch-soc/merge-upstream	2024-04-06 20:34:07 +02:00
Claire	0b9d4103cb	Fix contrast in notification request badge (#29826)	2024-04-02 14:05:46 +00:00
Michael Stanclift	fa9574086d	Fix search box color on light theme (#29808)	2024-04-02 09:15:31 +00:00
Michael Stanclift	90eb4a5d01	Fix light theme header on mobile (#29809)	2024-03-29 21:03:30 +00:00
Michael Stanclift	430da03160	Fix background tint in single column light theme (#29803)	2024-03-29 17:16:51 +00:00
Claire	4f068d4fcc	Fix logo pushing header buttons out of view on certain conditions in mobile layout (#29787)	2024-03-28 14:00:57 +00:00
Claire	c913e2f3e5	Fix language picker and privacy picker not having a backdrop filter (#29779)	2024-03-27 16:32:00 +00:00
Claire	b2d841ce9a	Fix column borders disappearing in advanced interface on low width viewports (#29763)	2024-03-26 23:14:11 +00:00
Eugen Rochko	0cea7a623b	Fix background and icon on notification requests in web UI (#29706)	2024-03-25 13:39:06 +00:00
Eugen Rochko	29f9dc742e	Change design of notification about lost connections in web UI (#29731)	2024-03-25 13:27:38 +00:00
Eugen Rochko	dd061291b1	Change out-of-band hashtags design in web UI (#29732)	2024-03-25 12:45:00 +00:00
Claire	de6c9e0fcd	Change new modals to allow vertical scrolling (#29644)	2024-03-22 16:21:50 +00:00
Claire	eb3aed9545	Merge commit '50fd94f481' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Upstream touched a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.	2024-03-20 12:27:52 +01:00
Claire	50fd94f481	Fix blockquote color in reply indicator (#29659)	2024-03-20 11:20:23 +00:00
Claire	e36e7ea243	Fix emoji picker dropdown background and borders (#29653)	2024-03-20 11:06:50 +00:00
Claire	a583317df6	Fix icon and styling in browser notifications banner (#29658)	2024-03-20 11:06:44 +00:00
Claire	d0dfcc9f3a	Fix build issue with glitch-soc's theming system	2024-03-19 19:58:04 +01:00
Claire	876aa35350	Merge commit 'ffc5be4820' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did. - `yarn.lock`: Upstream updated a dependency that is on an adjacent line to a glitch-soc-only dependency in that file. Updated as upstream did.	2024-03-19 19:21:12 +01:00
Claire	bd06963c16	Slightly increase font weight of favorite/boost numbers in detailed statuses (#29648)	2024-03-19 13:39:30 +00:00
Claire	cf08a438e7	Add badge on account card in report moderation interface when account is already suspended (#29592)	2024-03-19 08:20:53 +00:00
Claire	b8f476256e	Merge commit 'd702a03a0c' into glitch-soc/merge-upstream	2024-03-15 22:48:04 +01:00
Claire	d702a03a0c	Add “Learn more” on block modal to inform of federation caveats (#29614)	2024-03-15 19:09:21 +00:00
Claire	2c622497c2	Merge commit '407287573c' into glitch-soc/merge-upstream	2024-03-15 18:48:39 +01:00
Eugen Rochko	ec19d0a14b	Change mute, block and domain block confirmations in web UI (#29576)	2024-03-15 17:36:41 +00:00
Eugen Rochko	407287573c	Add domain information to profiles in web UI (#29602) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-03-15 13:08:38 +00:00
Claire	e91ede5be6	Merge commit 'df6086d402' into glitch-soc/merge-upstream	2024-03-14 17:27:16 +01:00
Eugen Rochko	4991198b70	Change design of metadata underneath posts in web UI (#29585)	2024-03-14 09:18:24 +00:00
Eugen Rochko	1e1d97a787	Fix wrong background color on search results in web UI (#29584)	2024-03-14 09:07:29 +00:00
Claire	48134bcd10	Merge commit 'acf3f410ae' into glitch-soc/merge-upstream	2024-03-13 20:13:29 +01:00
Claire	c6dbb33944	Merge commit 'd4ed7e466c' into glitch-soc/merge-upstream	2024-03-13 18:58:47 +01:00
Erik Uden	268856d5d9	Fix toggle button color for light (and dark/default) theme (#29553)	2024-03-13 11:45:20 +00:00
Eugen Rochko	5b60d4b696	Change background color in web UI (#29522)	2024-03-12 09:51:30 +00:00
Claire	a5127d0ef8	Merge commit '24319836de' into glitch-soc/merge-upstream ... Conflicts: - `config/routes/api.rb`: glitch-soc has an extra `:destroy` action on notifications for historical reasons. Kept it for now, while otherwise updating as upstream did.	2024-03-11 17:29:07 +01:00
Eugen Rochko	c10bbf5fe3	Add notification policies and notification requests in web UI (#29433)	2024-03-11 15:02:21 +00:00
Eugen Rochko	19efa1b9f1	Change action button to be last on profiles in web UI (#29533)	2024-03-11 14:33:48 +00:00
Eugen Rochko	5b3a8737d6	Add hints for rules (#29539)	2024-03-11 08:57:07 +00:00
Claire	159e500749	Merge commit '18945f62e0' into glitch-soc/merge-upstream	2024-03-01 18:34:48 +01:00
HTeuMeuLeu	934cab7508	New welcome email (#28883) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2024-03-01 12:16:53 +00:00
Claire	4d7e7cc562	Merge commit '6dfe318f34' into glitch-soc/merge-upstream	2024-02-29 18:24:47 +01:00
Claire	edd6aa70e1	Fix regression with search bar icon position (#29456)	2024-02-29 13:54:06 +00:00
Claire	ccdf56085d	Merge commit '7f84bbfd92' into glitch-soc/merge-upstream	2024-02-28 20:37:38 +01:00
Jeong Arm	deffb8ecb6	Show comments in the admin/instances page (#29240) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-02-28 12:07:06 +00:00
Roni Laukkarinen	edfc53856f	Fix the regression with the search icon position (#29417)	2024-02-28 12:01:18 +00:00
Claire	a482932649	Merge commit '6f7615ba86' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/application_controller.rb`: Not a real conflict, upstream fixed a bug in a line adjacent to code modified by glitch-soc. Ported upstream's change.	2024-02-27 19:20:57 +01:00