1,674 commits

Author	SHA1	Message	Date
Claire	f09f5b35f2	Merge commit 'd97d31cce6' into glitch-soc/merge-upstream ... Conflicts: - `app/models/account.rb`: Upstream refactored this file a bit, moving validation limits to constants. We already had a similar change, although with different constant names. Updated to match upstream's code. The following files were also modified accordingly: - `app/views/settings/profiles/show.html.haml` - `spec/requests/api/v1/accounts/credentials_spec.rb`	2024-05-04 16:12:51 +02:00
Claire	d6f9c97ae4	Merge commit '7201f99cf8' into glitch-soc/merge-upstream	2024-05-04 15:24:22 +02:00
Claire	bac4026d80	Merge commit '85fdbd0ad5' into glitch-soc/merge-upstream	2024-05-04 15:10:54 +02:00
Claire	bceb45adda	Merge commit '3f6887557b' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/entrypoints/common.js`: Upstream moved everything from `app/javascript/packs` to `app/javascript/entrypoints` while this file was a glitch-soc addition. Moved it like the rest. - `tsconfig.json`: Conflict due to glitch-soc's flavor. Updated like upstream. Also moved and updated the following files accordingly: - `app/javascript/flavours/vanilla/theme.yml` - `app/javascript/flavours/glitch/theme.yml` - everything in `app/javascript/flavours/glitch/packs`	2024-05-04 14:59:00 +02:00
Claire	946bd2e7e1	Merge commit '0622107449' into glitch-soc/merge-upstream	2024-05-01 19:16:48 +02:00
Claire	0fb469e2f3	Merge commit '52ab8a59c6' into glitch-soc/merge-upstream	2024-05-01 17:30:52 +02:00
Claire	3503fe1865	Merge commit '4045c069f8' into glitch-soc/merge-upstream	2024-05-01 17:26:21 +02:00
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	26e10aa203	Change width breakpoint for mobile placement behavior (#30131)	2024-04-30 23:39:28 +00:00
Claire	4ef0b48b95	Add in-app notifications for moderation actions/warnings (#30065)	2024-04-25 17:26:05 +00:00
Eugen Rochko	0ec061aa8f	Change design of people tab on explore in web UI (#30059)	2024-04-25 16:25:33 +00:00
Eugen Rochko	74012831f6	Change mute options to be in dropdown on muted users list in web UI (#30049)	2024-04-24 08:45:12 +00:00
Matt Jankowski	32ead51e5a	Add material design icons to admin/settings views (#27780) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-04-23 16:43:49 +00:00
Claire	4117c8f6b8	Fix unfollow button being out of frame on small screens on old browsers (#29923)	2024-04-15 11:56:48 +00: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
Michael Stanclift	1c87cb8019	Add purple border to active compose field search inputs (#29839)	2024-04-04 11:51:06 +00:00
nicolas	c6da3ee828	Makes the star icon rotate around its actual centre axis (#29844)	2024-04-03 21:10:02 +00:00
Michael Stanclift	e284417349	Fix blue border on emoji/language search in Safari & Chrome (#29832)	2024-04-03 15:19:10 +00:00
Michael Stanclift	5d67247061	Fix language and emoji search field background colors on light theme (#29828)	2024-04-03 14:22:50 +00: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