1,707 commits

Author	SHA1	Message	Date
Claire	c75fe09e2b	Merge commit '82344342c1' into glitch-soc/merge-upstream	2024-07-18 17:56:25 +02:00
Renaud Chaput	f587ff643f	Grouped Notifications UI (#30440) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-07-18 14:36:09 +00:00
Claire	64b2c712d4	Merge commit '9d0bce4072' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/theme_helper.rb`: Conflict because upstream refactored theme-related code, and glitch-soc has a different theming system.	2024-07-15 18:51:38 +02:00
David Roetzel	9d0bce4072	Move filtered notifications bar in scrollable area (#30996) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-07-15 13:42:47 +00:00
Claire	db0b12e5dc	Merge commit '8c8bee5a36' into glitch-soc/merge-upstream	2024-07-11 21:07:03 +02:00
Renaud Chaput	8c8bee5a36	Change disabled buttons color in light mode to make it more visible (#30998)	2024-07-11 13:43:42 +00:00
Claire	959ad1d6be	Fix deprecation warning in win95 theme	2024-07-10 17:46:33 +02:00
Claire	52fb4f16ef	Merge commit '2ea9336b68' into glitch-soc/merge-upstream	2024-07-10 16:58:06 +02:00
Renaud Chaput	182b9248c0	Fix SCSS mixed declarations deprecation (#30986)	2024-07-10 12:23:24 +00:00
Claire	11dd51ef44	Merge commit '63ba69810e' into glitch-soc/merge-upstream ... Conflicts: - `.env.production.sample`: Upstream and glitch-soc had different comments, some comments got updated upstream. Updated them in glitch-soc accordingly.	2024-07-06 21:02:42 +02:00
Claire	63ba69810e	Fix overflow behavior on profile fields in hover cards (#30928)	2024-07-06 07:22:24 +00:00
Claire	92dcc50278	Merge commit 'd3f504245c' into glitch-soc/merge-upstream	2024-07-01 20:45:13 +02:00
Eugen Rochko	b728c0e8ce	Change hover cards to not appear until the mouse stops in web UI (#30850)	2024-07-01 15:52:01 +00:00
Claire	d2aea85e6c	Merge commit '5d4dbbcc67' into glitch-soc/merge-upstream	2024-06-30 11:25:40 +02:00
Eugen Rochko	e89317d4c1	Add hover cards in web UI (#30754) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2024-06-26 19:33:38 +00:00
Renaud Chaput	8c0ff6498e	Change light mode to apply CSS variables to the body (#30839)	2024-06-25 21:57:22 +00:00
Claire	395b9011ee	Merge commit 'd5f02adad7' into glitch-soc/merge-upstream ... Conflicts: - `app/helpers/application_helper.rb`: Not a real conflict, just upstream adding a method textually adjacent to glitch-soc only code. Ported upstream's change.	2024-06-17 18:30:28 +02:00
Claire	677f73f793	Merge commit '3a191b3797' into glitch-soc/merge-upstream	2024-06-17 13:41:58 +02:00
Eugen Rochko	b9fd7571ae	Change sidebar text in web UI (#30696)	2024-06-14 13:04:20 +00:00
Eugen Rochko	ed6d24330b	Add author links on the explore page in web UI (#30521)	2024-06-13 13:04:16 +00:00
Eugen Rochko	9984243467	Fix a few visual glitches with link previews in web UI (#30670)	2024-06-12 13:10:51 +00:00
Claire	4daed855e5	Merge commit 'd818ddd687' into glitch-soc/merge-upstream	2024-06-11 19:46:11 +02:00
David Roetzel	f48f39a767	Fix cutoff of instance name (#30598)	2024-06-11 12:54:37 +00: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
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
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
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
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