10a24d67d4
Merge commit '75ecc6df068ec2c21b26f05692eb5dfdc35671fa' into glitch-soc/merge-upstream
2024-12-01 18:57:49 +01:00
7d52d5df0f
Merge commit 'c58967c3bd7b7eee0b284ee2b77a48ed9ce6863e' into glitch-soc/merge-upstream
...
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
Conflict due to upstream adding fallback support for MathML Core while
glitch-soc supported slightly more tags than upstream.
Added the MathML Core fallback code to glitch-soc.
- `spec/lib/sanitize/config_spec.rb`:
Ditto.
2024-12-01 18:22:00 +01:00
48827e1210
Merge commit 'a27bafa59653328a0f06bedb1dfb2b6ee92af43d' into glitch-soc/merge-upstream
...
- `app/controllers/application_controller.rb`:
Minor conflict due to glitch-soc's theming system.
- `spec/helpers/application_helper_spec.rb`:
Minor conflict due to glitch-soc's theming system.
2024-12-01 17:36:49 +01:00
986a3676d3
Change server rules to be collapsible ( #33039 )
2024-11-29 16:33:06 +00:00
46c43d263c
Change avatar and header size limits from 2MB to 8MB when using libvips ( #33002 )
2024-11-26 21:01:52 +00:00
6374937147
Merge commit 'e68b26c8df2056182564abcee230927ed53200c8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/models/trends/statuses.rb`:
Upstream added a date restriction to trendable posts, while glitch-soc had
slightly different conditions.
Added the date restriction to glitch-soc's conditions.
2024-11-24 16:46:28 +01:00
2e66dd09e2
Show default time zone ( #31803 )
2024-11-22 14:48:41 +00:00
30e9c7137b
Fix error when viewing statuses to deleted replies in moderation view ( #32986 )
2024-11-19 20:21:12 +00:00
16addf47c7
Reduce long lines in `relationships/show` view ( #32922 )
2024-11-18 09:23:07 +00:00
a1ac2a73ff
Remove remnants of embed views ( #32419 )
2024-11-16 20:48:10 +00:00
4f1242964b
Merge commit '44d92fa4f6aac5c45ad358287af48cd879f5665e' into glitch-soc/merge-upstream
2024-11-15 18:44:32 +01:00
297ce9ef44
Move body class to shared partial for web app controller concern views ( #31797 )
2024-11-15 15:49:26 +00:00
0838cf1e05
Fix domain attribution field having autocorrect and autocapitalize enabled ( #32903 )
2024-11-15 13:37:45 +00:00
ddfb3d123b
Improve display of statuses in admin panel ( #30813 )
2024-11-15 09:38:01 +00:00
62d65504f6
Add `DomainResource` class to wrap MX lookup/normalize ( #32864 )
2024-11-14 13:47:29 +00:00
e8b6607ece
Fix titles being escaped twice ( #32889 )
2024-11-14 13:28:00 +00:00
bf609090b1
Fix: prevent linking to pages which require extra permissions ( #32843 )
2024-11-12 08:55:17 +00:00
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
6f5eb22135
Mailer header partial access cleanup ( #32585 )
2024-10-28 13:41:56 +00:00
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
bd6c96f737
Fix broken i18n in text welcome mailer tags area ( #32571 )
2024-10-18 07:19:37 +00:00
8b56509625
Add more explicit explanations about author attribution and `fediverse:creator` ( #32383 )
2024-10-17 09:03:08 +00:00
c40cd79c4d
Convert `admin/invites` controller specs to system specs ( #32450 )
2024-10-15 14:27:46 +00:00
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
4fe7f213a6
Use `async_count` in more view locations ( #32086 )
2024-10-04 12:29:43 +00:00
160917e718
Pluralize csv imports ( #27094 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-10-04 08:19:01 +00:00
4c0e44ebbe
Fix recently-broken admin interface buttons ( #32240 )
2024-10-03 16:12:15 +00:00
d95f6f4410
Extract `ExportSummary` class for account object counts ( #32227 )
2024-10-03 13:09:58 +00:00
cec8961372
Move admin action log type list generation to helper ( #32178 )
2024-10-02 14:47:00 +00:00
7d6b9ccd34
Add `copyable_input` helper method to wrap shared options ( #32119 )
2024-10-02 14:45:54 +00:00
36f9c96812
Clean up labels on development application form ( #32116 )
2024-10-02 14:45:12 +00:00
d270d6dd4f
Provide `use_path` to qr generator for svg data size reduction ( #32127 )
2024-10-02 13:26:46 +00:00
cf859d151b
More link/button conversion across views ( #32199 )
2024-10-02 13:08:40 +00:00
f73787a4b8
Fix broken border on applications list ( #32147 )
2024-10-01 13:38:29 +00:00
44071fdbae
Wrap datetime in `time` element with attrs ( #32177 )
2024-10-01 12:45:58 +00:00
ec16ed37c3
Extract constants for header and avatar geometry ( #32151 )
2024-10-01 11:36:25 +00:00
c009507912
Use `button_to` for `method: :post` links on account show page ( #32154 )
2024-10-01 11:14:12 +00:00
651846c622
Only show email domain blocks MX table when some found ( #32155 )
2024-10-01 11:03:13 +00:00
7e35bef97e
Remove explicit `put` action in settings forms ( #32176 )
2024-10-01 10:34:05 +00:00
f251edfc1d
Add `date_range` view helper ( #32187 )
2024-10-01 09:30:21 +00:00
675d3ea5c1
Extract dashboard partial for admin instance page ( #32189 )
2024-10-01 08:36:41 +00:00
685067efd1
Avoid `id` duplication conflict with main navigation from settings profile link ( #32181 )
2024-10-01 08:23:05 +00:00
0b6d217b9e
Use account display name for pretend blog example in attribution area ( #32188 )
2024-10-01 08:19:53 +00:00
7ef25ae53b
Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream
2024-09-29 11:06:09 +02:00
9d664f87a0
Mailer layout fixes ( #32132 )
2024-09-27 19:41:41 +00:00
24d3ce7bab
Add `no-toolbar` state for "nothing here" batch table views ( #32128 )
2024-09-27 19:38:44 +00:00
e02e88bff4
Use previously extracted model constants in form `maxlength` attributes ( #32113 )
2024-09-27 08:21:27 +00:00
04dd3a9eb6
Wrap webhook event label with `samp` tag ( #32115 )
2024-09-27 08:20:21 +00:00
c2c3a66478
Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream
2024-09-23 20:24:18 +02:00
5dfdec6453
Convert `settings/applications` controller spec to system/request specs ( #32006 )
2024-09-23 13:37:32 +00:00
Claire