1,770 commits

Author	SHA1	Message	Date
Essem	fad5adbfe6	Merge remote-tracking branch 'upstream/main'	2024-05-30 09:32:49 -05:00
Claire	c827a98f19	Merge commit 'd20a5c3ec9' into glitch-soc/merge-upstream ... Conflicts: - `yarn.lock`: Not a real conflict, just a line adjacent to a glitch-soc only dependency getting updated. Updated dependencies as upstream did.	2024-05-29 17:03:24 +02:00
Eugen Rochko	128987eded	Add support for fediverse:creator OpenGraph tag (#30398)	2024-05-29 01:34:33 +02:00
Essem	7a615f1971	Merge remote-tracking branch 'upstream/main'	2024-05-23 21:33:42 -05:00
Claire	5ab111554e	Merge commit 'cd0c547936' into glitch-soc/merge-upstream	2024-05-21 17:45:21 +02:00
David Lapshin	cd0c547936	Fix announcements icon rotating like settings one (#30388)	2024-05-21 15:24:51 +00:00
Essem	9b0c46ebf2	Merge remote-tracking branch 'upstream/main'	2024-05-20 21:35:02 -05:00
Claire	2810231180	Merge commit 'b2388be71e' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/activitypub/collections_controller.rb`: Upstream renamed a helper method everywhere. There was one glitch-soc line involving changes because of the local-only post feature. Ported upstream's change.	2024-05-16 19:30:10 +02:00
David Lapshin	94493cff92	Fix incorrect element selector from #30221 (#30307)	2024-05-16 07:33:29 +00:00
Claire	666760f450	Merge commit '1bf661cddb' into glitch-soc/merge-upstream ... Conflicts: - `package.json`: Upstream fixed a command we have modified in glitch-soc. Updated as upstream did.	2024-05-14 20:47:14 +02:00
David Lapshin	cb93c1edf0	Add active animation to header settings button (#30221)	2024-05-13 09:19:42 +00:00
Essem	b636ca2099	Merge remote-tracking branch 'upstream/main'	2024-05-06 22:12:42 -05:00
Claire	3789d9f825	Merge commit 'b7902225d6' into glitch-soc/merge-upstream ... Conflicts: - `spec/validators/status_length_validator_spec.rb`: Upstream refactored tests to stub `StatusLengthValidator::MAX_CHARS` while glitch-soc had custom code to read from `MAX_TOOT_CHARS`. Switched to using upstream's implementation of the tests.	2024-05-04 16:28:30 +02:00
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
Essem	a7b905d573	Merge remote-tracking branch 'upstream/main'	2024-05-02 23:31:54 -05:00
mogaminsk	616e2f2666	Fix word breaking in filtered notifications badge (#30114)	2024-05-02 09:40:18 +00: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
Essem	ce98ee9b00	Merge remote-tracking branch 'upstream/main'	2024-04-10 17:36:38 -05: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
Essem	a2ffb4fbac	Hack to make the sidebar background visible	2024-03-26 20:07:54 -05:00
Claire	b2d841ce9a	Fix column borders disappearing in advanced interface on low width viewports (#29763)	2024-03-26 23:14:11 +00:00
Essem	1a1ff228b3	Update to mastomodern 1.10.5	2024-03-25 23:35:10 -05:00
Eugen Rochko	0cea7a623b	Fix background and icon on notification requests in web UI (#29706)	2024-03-25 13:39:06 +00:00