7,403 commits

Author	SHA1	Message	Date
Essem	dd7d7cb80a	Fix embed GIF icons	2024-01-14 17:22:38 -06:00
Essem	16839a6398	Update to mastomodern 1.9.1	2024-01-14 16:40:51 -06:00
Essem	ac71680dcb	Merge remote-tracking branch 'upstream/main'	2024-01-14 15:41:16 -06:00
Essem	d84bafcdc0	Merge remote-tracking branch 'upstream/main'	2024-01-13 16:28:34 -06:00
Claire	5f8618443c	Merge pull request #2566 from ClearlyClaire/glitch-soc/ports/badge-design ... Port upstream's role badge design	2024-01-13 14:25:55 +01:00
Eugen Rochko	eae3275fff	[Glitch] Change design of role badges in web UI ... Port 2cbdff97ce to glitch-soc Co-authored-by: Claire <claire.github-309c@sitedethib.com> Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-01-13 13:09:04 +01:00
Claire	a40ce78f11	[Glitch] Add role badges to the WebUI ... Port 1e4ccc655a to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-01-13 12:50:27 +01:00
Claire	a25e03dbc3	Revert "Add role badges to WebUI (#2096)" ... This reverts commit d9a078e6d3.	2024-01-13 12:43:25 +01:00
Renaud Chaput	d6609635cb	[Glitch] Add a version comment to the emoji preval-ed file so it is regenerated ... Port 383be173af to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-01-13 12:39:09 +01:00
Essem	ca31b4de3a	[Glitch] Add new emojis from jdecked/twemoji 15.0 ... Port b6e353537b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-01-13 12:39:09 +01:00
Claire	a3b6a85521	Merge commit 'cd37048439' into glitch-soc/merge-upstream ... Conflicts: - `.prettierignore`: Conflict due to glitch-soc-only files. Kept those at the end of the file.	2024-01-13 12:11:29 +01:00
Essem	f436a11c4e	Merge remote-tracking branch 'upstream/main'	2024-01-12 11:21:43 -06:00
Renaud Chaput	383be173af	Add a version comment to the emoji preval-ed file so it is regenerated (#28700)	2024-01-12 03:39:11 +00:00
Essem	843725b25b	Merge remote-tracking branch 'upstream/main'	2024-01-11 20:51:45 -06:00
Claire	15bc13c65b	Merge commit '2954279e9c' into glitch-soc/merge-upstream	2024-01-11 20:15:19 +01:00
Essem	b6e353537b	Add new emojis from jdecked/twemoji 15.0 (#28404)	2024-01-11 16:15:08 +00:00
Claire	630b245bb4	Merge commit '9a73a7dcaf' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/settings/scoped_settings.rb`: Removed upstream, while glitch-soc had a change related to its theming system. Removed as well, as it's unused.	2024-01-11 12:59:27 +01:00
github-actions[bot]	e5b97eadd5	New Crowdin Translations (automated) (#2502) ... * New Crowdin translations * Update no.yml * Update simple_form.no.yml --------- Co-authored-by: GitHub Actions <noreply@github.com> Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-11 12:56:56 +01:00
github-actions[bot]	204bbf49d2	New Crowdin Translations (automated) (#28692) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-01-11 10:08:49 +00:00
Claire	47d213e701	Merge commit '5dc634796a' into glitch-soc/merge-upstream	2024-01-10 18:41:04 +01:00
Renaud Chaput	09376a8207	[Glitch] Upgrade Redux packages ... Port a0e237a96f to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-01-10 18:34:23 +01:00
Claire	51d2d98174	Merge commit 'a0e237a96f' into glitch-soc/merge-upstream	2024-01-10 18:26:47 +01:00
Claire	7cd88ae2f4	[Glitch] Fix scrolling to detailed status not always working ... Port d0fd14f851 to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-01-10 18:02:37 +01:00
Claire	0b2c7cdb02	Merge commit 'fe2667bb0d' into glitch-soc/merge-upstream ... Conflicts: - `app/lib/content_security_policy.rb`: Conflict caused by glitch-soc's support for the extra `EXTRA_DATA_HOSTS` environment variable. Ported upstream's changes while keeping support for `EXTRA_DATA_HOSTS`.	2024-01-10 17:51:12 +01:00
gunchleoc	173953c23e	Fix ISO code for Canadian French (#26015) ... Co-authored-by: Claire <claire.github-309c@sitedethib.com>	2024-01-09 10:56:13 +00:00
github-actions[bot]	8e7d5fe2ac	New Crowdin Translations (automated) (#28658) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-01-09 09:30:33 +00:00
github-actions[bot]	cc67943df2	New Crowdin Translations (automated) (#28627) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-01-08 12:46:25 +00:00
Renaud Chaput	a0e237a96f	Upgrade Redux packages (#28585)	2024-01-08 10:57:40 +00:00
github-actions[bot]	43d800ada6	New Crowdin Translations (automated) (#28604) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-01-05 11:29:19 +00:00
Claire	d0fd14f851	Fix scrolling to detailed status not always working (#28577)	2024-01-04 14:17:38 +00:00
github-actions[bot]	bdf4750633	New Crowdin Translations (automated) (#28590) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-01-04 09:24:13 +00:00
Essem	70cedf5c0e	Merge remote-tracking branch 'upstream/main'	2024-01-03 17:21:22 -06:00
Claire	9d9008666b	Merge commit '092bb8a27a' into glitch-soc/merge-upstream	2024-01-03 12:38:49 +01:00
github-actions[bot]	7cce2a41f2	New Crowdin Translations (automated) (#28573) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-01-03 09:19:46 +00:00
Essem	36e09fbd6d	Merge remote-tracking branch 'upstream/main'	2024-01-02 15:37:44 -06:00
Claire	48c9192b47	[Glitch] Fix loading local accounts with extraneous domain part in WebUI ... Port 65ea097f1d to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-01-02 18:16:57 +01:00
Claire	f685c953e5	Merge commit '3944b12b5e' into glitch-soc/merge-upstream	2024-01-02 18:12:28 +01:00
Claire	65ea097f1d	Fix loading local accounts with extraneous domain part in WebUI (#28559)	2024-01-02 15:02:25 +00:00
Michael Stanclift	0cd497ba7d	[Glitch] Fix OCR when using S3/CDN for assets ... Port fdec8d7ffb to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2024-01-02 13:37:04 +01:00
Claire	b3542ac57b	Merge commit '1184887b01' into glitch-soc/merge-upstream ... Conflicts: - `README.md`: Upstream updated its README, we have a completely different one. Kept our README.	2024-01-02 13:35:11 +01:00
github-actions[bot]	0374e11091	New Crowdin Translations (automated) (#28529) ... Co-authored-by: GitHub Actions <noreply@github.com>	2024-01-02 09:11:53 +00:00
Michael Stanclift	fdec8d7ffb	Fix OCR when using S3/CDN for assets (#28551)	2024-01-02 09:09:54 +00:00
Essem	174f1e7c2c	Merge remote-tracking branch 'upstream/main'	2023-12-30 13:56:14 -06:00
Essem	978cd69dd4	Merge remote-tracking branch 'upstream/main'	2023-12-29 12:50:42 -06:00
Claire	eb342a6082	Fix media attachments not being hidden in report modal in glitch flavor	2023-12-29 17:47:30 +01:00
Cal Moody	df43bb124c	[Glitch] Fix destructive actions in dropdowns not using error color in light theme ... Port 3599622b5b to glitch-soc Signed-off-by: Claire <claire.github-309c@sitedethib.com>	2023-12-29 17:43:53 +01:00
Claire	35b6583371	Merge commit '6374358357' into glitch-soc/merge-upstream	2023-12-29 17:40:57 +01:00
Claire	6374358357	Change media to be hidden/blurred by default in report modal (#28522)	2023-12-29 16:34:13 +00:00
Cal Moody	3599622b5b	Fix destructive actions in dropdowns not using error color in light theme (#28484)	2023-12-29 11:32:40 +00:00
github-actions[bot]	7df9c4f6f3	New Crowdin Translations (automated) (#28481) ... Co-authored-by: GitHub Actions <noreply@github.com>	2023-12-29 10:39:10 +00:00