1,812 commits

Author	SHA1	Message	Date
Essem	14eede02f3	Merge remote-tracking branch 'upstream/main'	2024-07-27 18:24:05 -05:00
Claire	fb411b6d0f	Merge commit 'dd53792714' into glitch-soc/merge-upstream	2024-07-27 13:19:38 +02:00
Eugen Rochko	8818748b90	Change design of confirmation modals in web UI (#30884) ... Co-authored-by: Renaud Chaput <renchap@gmail.com>	2024-07-25 17:05:54 +00:00
Essem	2f50bcafc8	Merge remote-tracking branch 'upstream/main'	2024-07-24 23:04:49 -05:00
Claire	d999fc52ba	Merge commit '06f070d86d' into glitch-soc/merge-upstream	2024-07-24 20:07:37 +02:00
Claire	68000956f4	Merge commit 'cd0ca4b994' into glitch-soc/merge-upstream	2024-07-23 19:31:23 +02:00
Michael Stanclift	8b7f93cc7f	Recolor Preferences/Admin UI to better match main design (#31034)	2024-07-23 15:30:45 +00:00
Claire	a8330be93e	Widen the clickable area for statuses in grouped notifications (#31111)	2024-07-23 12:11:08 +00:00
Claire	f7598b267b	Merge commit '0397df9bef' into glitch-soc/merge-upstream	2024-07-19 17:45:19 +02:00
Michael Stanclift	784e088533	Fix double border on column filter on narrow screens (#31068)	2024-07-19 08:30:26 +00:00
Essem	63f5f98eb8	Merge remote-tracking branch 'upstream/main'	2024-07-18 16:21:00 -05:00
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
Essem	db66504d03	Update to mastomodern 2.0.1	2024-07-17 17:19:46 -05:00
Essem	dd4980342f	Merge remote-tracking branch 'upstream/main'	2024-07-17 14:46:24 -05: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
Essem	99b9fb96ac	Update to mastomodern 2.0.0	2024-07-14 16:39:49 -05:00
Essem	53cd9df580	Merge remote-tracking branch 'upstream/main'	2024-07-11 22:06:07 -05: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
Essem	4aa2f92bef	Merge remote-tracking branch 'upstream/main'	2024-07-10 09:41:37 -05: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
Essem	6450fb0cf5	Merge remote-tracking branch 'upstream/main'	2024-07-04 10:31:27 -05: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
Essem	8a01720cb2	Merge remote-tracking branch 'upstream/main'	2024-06-30 15:41:10 -05: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
Essem	167a30b2bf	Merge remote-tracking branch 'upstream/main'	2024-06-19 21:43:32 -05: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
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