2070 Commits

Author	SHA1	Message	Date
Claire	0cec9077a4	Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream ... Conflicts: - `spec/requests/api/v2/instance_spec.rb`: Upstream added a test for a new attribute, next to a line we modified in glitch-soc because of a different default value. Updated as upstream's did, keeping glitch-soc's default value.	2024-08-21 18:44:21 +02:00
Claire	edeae945c0	Remove fontawesome leftovers (#31525)	2024-08-21 15:55:35 +00:00
Claire	f5c0c32edd	Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/material-icons/400-24px/chat.svg`: Glitch-soc used this one but not upstream. Upstream pulled a presumably more up-to-date version of the file. Switched to upstream's version. - `app/views/layouts/application.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/embedded.html.haml`: Upstream removed use of font-awesome. I hope we are ready. - `app/views/layouts/error.html.haml`: Upstream removed use of font-awesome. I hope we are ready.	2024-08-20 18:31:50 +02:00
Matt Jankowski	4c4bcad866	Remove font-awesome npm package (#31512)	2024-08-20 15:59:47 +00:00
Matt Jankowski	fa2e7b1708	Migrate fontawesome->material in more views (#31360)	2024-08-20 11:52:45 +00:00
Matt Jankowski	3be1b1eaae	Use material symbol for filters/statuses views (#31371)	2024-08-20 11:52:27 +00:00
Matt Jankowski	71405eabfc	Use material symbols in table link helper (#31359)	2024-08-20 11:48:15 +00:00
Claire	f441b280dc	Merge commit '85152af95f51642bcef0ba781a1e7213d79e8f03' into glitch-soc/merge-upstream	2024-08-11 21:05:09 +02:00
Emelia Smith	d3089018d5	Move Follow Recommendations to Trends menu, rename to Recommendations & Trends (#31292)	2024-08-10 09:17:10 +00:00
Matt Jankowski	885e67b2ed	Use material symbol for modal layout sign out link (#31363)	2024-08-10 09:13:08 +00:00
Matt Jankowski	7519ef2fa1	Use material symbol for responsive menu toggle (#31362)	2024-08-10 09:12:47 +00:00
Claire	31a00c0c1a	Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream	2024-08-09 17:15:32 +02:00
Christian Schmidt	e29c401f77	Add lang attribute on preview card title (#31303)	2024-08-09 13:05:34 +00:00
Jeong Arm	9bae237792	Change confirmation prompt on trending management (#19626)	2024-08-09 12:47:02 +00:00
Claire	dd2a991e24	Merge commit '079d681ac6f279f3a7a6be5c3734549f3be8f912' into glitch-soc/merge-upstream ... Conflicts: - `app/javascript/material-icons/400-24px/code.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/javascript/material-icons/400-24px/mail.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/javascript/material-icons/400-24px/manufacturing.svg`: Icon newly-introduced upstream. Used upstream's more recent version. - `app/views/admin/settings/shared/_links.html.haml`: Glitch-soc had extra menu items, ported the changes for them too. - `config/navigation.rb`: Glitch-soc had extra menu items, ported the changes for them too.	2024-08-08 19:30:16 +02:00
Matt Jankowski	84c3cc4e5b	Replace more font-awesome icons in views/admin area (#30961)	2024-08-07 23:08:36 +00:00
Matt Jankowski	e4092cc73a	Replace more font-awesome icons in views/settings (#30963)	2024-08-07 22:52:35 +00:00
Claire	08adca0c63	Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream	2024-08-06 17:27:48 +02:00
Christian Schmidt	3d6e8d6834	Disable irrelevant fields unless cleanup is enabled (#26562)	2024-08-04 08:57:46 +00:00
Claire	654187a995	Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream	2024-07-29 19:16:58 +02:00
Emelia Smith	c40e481169	Implement UI for Admin Search of Hashtags (#30880)	2024-07-29 15:49:44 +00:00
Claire	fb411b6d0f	Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream	2024-07-27 13:19:38 +02:00
Emelia Smith	693d9b03ed	Enable OAuth PKCE Extension (#31129)	2024-07-26 08:53:10 +00:00
Claire	d999fc52ba	Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream	2024-07-24 20:07:37 +02:00
Claire	68000956f4	Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' 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
Emelia Smith	bb2e5a4b58	Add audit logs to Admin::InstancesController (#27386)	2024-07-23 08:12:30 +00:00
Claire	c546757cd1	Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream	2024-07-16 17:54:36 +02:00
Emelia Smith	aa88aca0ad	Add optional OAuth application to reports (#30539)	2024-07-16 13:23:08 +00:00
Claire	55cf5e0188	Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream	2024-07-12 13:41:54 +02:00
Claire	ad52b04a1c	Add setting to disable hover cards (#30931) ... Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>	2024-07-11 19:42:58 +00:00
Claire	d2aea85e6c	Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream	2024-06-30 11:25:40 +02:00
Claire	7a84b76bb1	Drop favicon.ico generation (#30375)	2024-06-26 13:44:08 +00:00
Claire	6f2771cb32	Merge commit '845fe1c6936a7b386fd74ae567c19600a88e795a' into glitch-soc/merge-upstream	2024-06-25 17:57:39 +02:00
Emelia Smith	30ae5952d2	Fix: Ensure "With Media" is highlighted from Admin Accounts page (#30812)	2024-06-25 07:46:53 +00:00
Claire	395b9011ee	Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' 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	8089fa6935	Merge commit 'a7264a2b42631bd876d114b96f689492e2908a8d' into glitch-soc/merge-upstream ... Conflicts: - `app/views/layouts/application.html.haml`: Conflict because of glitch-soc's different theming system. Ported upstream's change.	2024-06-17 18:14:14 +02:00
Renaud Chaput	43bbdea421	Fix invalid mask-icon when a custom instance icon is configured (#30734)	2024-06-17 09:00:26 +00:00
Matt Jankowski	b5d1d48266	Convert form_for -> form_with in views (#30700)	2024-06-14 09:54:22 +00:00
Matt Jankowski	8d5ed19c6d	Migrate form_tag to form_with in admin and auth views (#30692)	2024-06-14 09:49:10 +00:00
Louis Brauer	f0ca874b09	Include crossorigin in inert css (#30687)	2024-06-13 14:37:43 +00:00
Claire	4daed855e5	Merge commit 'd818ddd6870094e89e58ef61f37da4cb73935856' into glitch-soc/merge-upstream	2024-06-11 19:46:11 +02:00
Claire	921b0db544	Add noindex meta tag and rel=canonical link to redirect interstitials (#30651)	2024-06-11 15:29:45 +00:00
Claire	30b00ca2b5	Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream	2024-06-06 12:27:26 +02:00
Matt Jankowski	2fdd782f21	Fix empty aria-hidden attribute value in logo resources area (#30570)	2024-06-06 07:50:15 +00:00
Matt Jankowski	249cbc449c	Use existing config access to local_domain value (#30509)	2024-06-03 09:15:58 +00:00
Claire	d3136e6d58	Merge commit '89f89d738f5840c80ff938f8bf6734cdafe0fa83' into glitch-soc/merge-upstream	2024-05-21 12:06:38 +02:00
Claire	89f89d738f	Revert "Allow unblocking email addresses from any matching account (#29305)" (#30385)	2024-05-21 08:56:08 +00:00
Claire	2810231180	Merge commit 'b2388be71eb0031ef9e47c492b1c038231cd8bc0' 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
Emelia Smith	f0d6dc4519	Fix: Mark redirect uris field in Development > Application form as required (#30311)	2024-05-16 07:59:46 +00:00