Claire
f624ef2778
Merge commit 'b06fd54c305915527e3a6edc575dc23b623143ef' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/formatting_helper.rb`:
Upstream wrapped some code glitch-soc had modified in an OTEL instrumentation span.
Wrapped the modified code.
2024-11-03 20:51:58 +01:00
Matt Jankowski
6f5eb22135
Mailer header partial access cleanup ( #32585 )
2024-10-28 13:41:56 +00:00
Claire
6281c4dedd
Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream
...
Conflicts:
- `.env.production.sample`:
Upstream added a block of three environment variables, while glitch-soc
has a different version of the file overall.
Added upstream's changes.
- `app/helpers/application_helper.rb`:
Upstream added a helper, while glitch-soc had extra helpers.
Added upstream's helper.
2024-10-19 19:13:32 +02:00
Matt Jankowski
bd6c96f737
Fix broken i18n in text welcome mailer tags area ( #32571 )
2024-10-18 07:19:37 +00:00
Claire
8b56509625
Add more explicit explanations about author attribution and fediverse:creator ( #32383 )
2024-10-17 09:03:08 +00:00
Matt Jankowski
c40cd79c4d
Convert admin/invites controller specs to system specs ( #32450 )
2024-10-15 14:27:46 +00:00
Claire
b28ce2424c
Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream added a helper where glitch-soc had its own, not really
a conflict.
Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
Upstream renamed a constant that was used slightly differently in glitch-soc.
Renamed it as upstream did.
2024-10-06 16:07:58 +02:00
Matt Jankowski
4fe7f213a6
Use async_count in more view locations ( #32086 )
2024-10-04 12:29:43 +00:00
gunchleoc
160917e718
Pluralize csv imports ( #27094 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-04 08:19:01 +00:00
Claire
4c0e44ebbe
Fix recently-broken admin interface buttons ( #32240 )
2024-10-03 16:12:15 +00:00
Matt Jankowski
d95f6f4410
Extract ExportSummary class for account object counts ( #32227 )
2024-10-03 13:09:58 +00:00
Matt Jankowski
cec8961372
Move admin action log type list generation to helper ( #32178 )
2024-10-02 14:47:00 +00:00
Matt Jankowski
7d6b9ccd34
Add copyable_input helper method to wrap shared options ( #32119 )
2024-10-02 14:45:54 +00:00
Matt Jankowski
36f9c96812
Clean up labels on development application form ( #32116 )
2024-10-02 14:45:12 +00:00
Matt Jankowski
d270d6dd4f
Provide use_path to qr generator for svg data size reduction ( #32127 )
2024-10-02 13:26:46 +00:00
Matt Jankowski
cf859d151b
More link/button conversion across views ( #32199 )
2024-10-02 13:08:40 +00:00
Matt Jankowski
f73787a4b8
Fix broken border on applications list ( #32147 )
2024-10-01 13:38:29 +00:00
Matt Jankowski
44071fdbae
Wrap datetime in time element with attrs ( #32177 )
2024-10-01 12:45:58 +00:00
Matt Jankowski
ec16ed37c3
Extract constants for header and avatar geometry ( #32151 )
2024-10-01 11:36:25 +00:00
Matt Jankowski
c009507912
Use button_to for method: :post links on account show page ( #32154 )
2024-10-01 11:14:12 +00:00
Matt Jankowski
651846c622
Only show email domain blocks MX table when some found ( #32155 )
2024-10-01 11:03:13 +00:00
Matt Jankowski
7e35bef97e
Remove explicit put action in settings forms ( #32176 )
2024-10-01 10:34:05 +00:00
Matt Jankowski
f251edfc1d
Add date_range view helper ( #32187 )
2024-10-01 09:30:21 +00:00
Matt Jankowski
675d3ea5c1
Extract dashboard partial for admin instance page ( #32189 )
2024-10-01 08:36:41 +00:00
Matt Jankowski
685067efd1
Avoid id duplication conflict with main navigation from settings profile link ( #32181 )
2024-10-01 08:23:05 +00:00
Matt Jankowski
0b6d217b9e
Use account display name for pretend blog example in attribution area ( #32188 )
2024-10-01 08:19:53 +00:00
Claire
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
Christian Schmidt
9d664f87a0
Mailer layout fixes ( #32132 )
2024-09-27 19:41:41 +00:00
Matt Jankowski
24d3ce7bab
Add no-toolbar state for "nothing here" batch table views ( #32128 )
2024-09-27 19:38:44 +00:00
Matt Jankowski
e02e88bff4
Use previously extracted model constants in form maxlength attributes ( #32113 )
2024-09-27 08:21:27 +00:00
Matt Jankowski
04dd3a9eb6
Wrap webhook event label with samp tag ( #32115 )
2024-09-27 08:20:21 +00:00
Claire
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
Matt Jankowski
5dfdec6453
Convert settings/applications controller spec to system/request specs ( #32006 )
2024-09-23 13:37:32 +00:00
Claire
221bba1897
Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream
2024-09-21 15:06:06 +02:00
Claire
ed8b0e4b1e
Fix links for reblogs in moderation interface ( #31979 )
2024-09-20 13:33:26 +00:00
Matt Jankowski
04a939d640
Add reviewed and unreviewed scopes to Reviewable model concern ( #31988 )
2024-09-20 08:51:37 +00:00
Claire
117ac13d12
Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream
2024-09-13 21:37:34 +02:00
Claire
ba81e4e019
Fix inability to locally suspend remotely-suspended accounts in moderation interface ( #31899 )
2024-09-13 09:11:10 +00:00
Claire
83b553c7d1
Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream
2024-09-12 21:32:39 +02:00
Claire
3465d39494
Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/accounts_helper.rb`:
Upstream removed a helper, textually adjacent to a glitch-soc-only one.
Not really a conflict.
Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
Conflicts due to theming system.
Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
Removed upstream, but we had local changes.
Removed as upstream did.
2024-09-12 20:05:08 +02:00
Claire
90d7a4bac4
Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream
2024-09-12 17:22:06 +02:00
Matt Jankowski
4aa600387e
Move redirect/base body class to view ( #31796 )
2024-09-12 13:31:50 +00:00
Eugen Rochko
24ef8255b3
Change design of embed modal in web UI ( #31801 )
2024-09-12 12:54:16 +00:00
Claire
10e2b87774
Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream
2024-09-12 12:09:21 +02:00
Eugen Rochko
3d46f47817
Change embedded posts to use web UI ( #31766 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
Matt Jankowski
cee71b9892
Remove fa_ prefix from status visibility icon method ( #31846 )
2024-09-11 07:47:16 +00:00
Matt Jankowski
0c3c06f7cc
Remove vendor prefix from mobile-web-app-capable meta tag ( #31845 )
2024-09-10 17:32:58 +00:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews ( #31819 )
2024-09-10 12:00:40 +00:00
Claire
5c97ccf939
Merge commit 'b716248fc5bde4dc47b8104d092d092d87c50f1a' into glitch-soc/merge-upstream
2024-09-06 20:10:53 +02:00
Claire
29124990a2
Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/application_helper.rb`:
Upstream reworked how CSS classes for the document's body are computed.
Slight conflict due to glitch-soc's different theming system.
Updated as upstream did.
2024-09-06 19:25:31 +02:00
