Claire
155dc4bc4b
Merge commit '34cd7d6585992c03298c175ab5d22ad059b58cdb' into glitch-soc/merge-upstream
...
Conflicts:
- `CONTRIBUTING.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `README.md`:
Upstream changed the file, while we had a different one.
Updated the common parts.
- `app/helpers/application_helper.rb`:
Upstream added helpers where glitch-soc had extra ones.
Added upstream's new helpers.
- `app/models/form/admin_settings.rb`:
Upstream added some custom handling of one setting, while
glitch-soc had additional code.
Ported upstream's code.
- `lib/mastodon/version.rb`:
Upstream moved some things to `config/mastodon.yml`.
Did the same.
- `spec/requests/api/v1/accounts/credentials_spec.rb`:
I don't know honestly.
2025-01-10 20:41:36 +01:00
Matt Jankowski
4f6edc7596
Use in_order_of in trends/* classes ( #33531 )
2025-01-10 09:33:07 +00:00
Matt Jankowski
4fb3dc0363
Extract CSS_COLORS constant for UserRole regex validation ( #33532 )
2025-01-10 09:02:48 +00:00
github-actions[bot]
846c89b66e
New Crowdin Translations (automated) ( #33541 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-10 09:00:41 +00:00
Matt Jankowski
f98972e4eb
Use with_options for Account if: :local? validation group ( #33529 )
2025-01-10 09:00:31 +00:00
Matt Jankowski
54e2030146
Add AccountWarning#appeal_eligible? method ( #33526 )
2025-01-09 15:08:39 +00:00
Matt Jankowski
3a4aed9890
Rename app/helpers/jsonld_helper.rb to app/helpers/json_ld_helper.rb ( #33489 )
2025-01-09 14:39:49 +00:00
Matt Jankowski
9b8d1fb6d1
Add Account#actor_type_application? query method ( #33525 )
2025-01-09 14:32:48 +00:00
Claire
a8b2b474d7
Add timestamp to all announcements in Web UI ( #18329 )
2025-01-09 14:22:33 +00:00
Claire
c6c8e7e6ab
Fix last paginated notification group only including data on a single notification ( #33271 )
2025-01-09 13:47:12 +00:00
Claire
91c75a6361
Re-introduce application_id in ScheduledStatusSerializer ( #33505 )
2025-01-09 13:38:23 +00:00
Christian Schmidt
8e2c642d44
Do now swallow response body on persistent connection ( #32729 )
2025-01-09 08:35:35 +00:00
github-actions[bot]
4e2c15b45d
New Crowdin Translations (automated) ( #33522 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-09 08:21:47 +00:00
Claire
10e24113a8
Fix issue with “Translate” button being overlayed on text ( #2935 )
...
Fixes #2932
2025-01-08 18:25:09 +01:00
Claire
dc14695f8a
Fix extraneous margins below CW in absence of mentions ( #2936 )
2025-01-08 18:24:57 +01:00
Claire
6b1ea8dd2c
Require specific subtype of formatMessage in timeAgoString ( #33511 )
2025-01-08 16:26:54 +00:00
Claire
1bf6195763
Fix use of deprecated Iterable.isIndexed from immutable ( #33510 )
2025-01-08 16:25:41 +00:00
Matt Jankowski
f22a2aab40
Add Account#remote? query method ( #33508 )
2025-01-08 14:28:08 +00:00
Emelia Smith
15669fcf75
Include time portion in formatted datetimes when provided ( #33191 )
2025-01-08 14:26:08 +00:00
github-actions[bot]
35e57138f1
New Crowdin Translations (automated) ( #33500 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-08 09:01:28 +00:00
Matt Jankowski
c0264c8013
Extend custom CSS cache time with digest paths ( #33207 )
2025-01-08 08:48:45 +00:00
Matt Jankowski
b3243ef41c
Refer to constant values from api/v1/apps request spec ( #33488 )
2025-01-07 16:28:54 +00:00
Matt Jankowski
7ad44e22ed
Remove role color highlighting from custom css ( #33493 )
2025-01-07 16:28:35 +00:00
Claire
82e046ea06
Fix preview card sizing in “Author attribution” in profile settings ( #33482 )
2025-01-07 11:29:38 +00:00
Nick Schonning
c12b85e7a9
Fix Style/MultipleComparison ( #33313 )
...
Co-authored-by: Matt Jankowski <matt@jankowski.online>
2025-01-07 11:24:52 +00:00
github-actions[bot]
9715bd796f
New Crowdin Translations (automated) ( #33480 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-07 07:50:27 +00:00
Matt Jankowski
edf62d4fe3
Add self_editing? method to user role policy ( #33476 )
2025-01-07 07:50:19 +00:00
Matt Jankowski
dd937e115a
Use distributable? method in admin/status_policy method ( #33477 )
2025-01-07 07:47:58 +00:00
Matt Jankowski
b0634b2943
Add helpers for ios/android app store links in welcome mailer ( #33475 )
2025-01-06 19:59:11 +00:00
Claire
412a0dd661
[Glitch] Further remove old notifications code
...
Port e8672e27e8
2025-01-06 20:40:26 +01:00
Claire
32567a6d8d
[Glitch] Fix color contrast in report modal
...
Port c692f69dba
2025-01-06 20:40:06 +01:00
Claire
126ce9a232
Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream
2025-01-06 20:36:25 +01:00
Matt Jankowski
ef39398b82
Add urgent scope and by_version method to SoftwareUpdate ( #33470 )
2025-01-06 18:23:57 +00:00
Matt Jankowski
4cf031ee13
Extricate Invite constants for code generation ( #33472 )
2025-01-06 18:23:05 +00:00
Matt Jankowski
1eb752fb38
Extract constants for AnnualReport::* minimum thresholds ( #33469 )
2025-01-06 18:22:32 +00:00
Claire
e8672e27e8
Further remove old notifications code ( #33465 )
2025-01-06 18:22:07 +00:00
Claire
c692f69dba
Fix color contrast in report modal ( #33468 )
2025-01-06 16:24:32 +00:00
Jeremy Kescher
ae302d2f5a
[Glitch] Standalone share page: Dispatch fetchServer for maxChars ( #2929 )
2025-01-06 12:50:40 +01:00
Claire
ea9b10d112
Fix error 500 when passing an invalid lang parameter ( #33467 )
2025-01-06 10:16:42 +00:00
Claire
dbbf450ef5
Fix fediverse:creator metadata not showing up in REST API ( #33466 )
2025-01-06 10:04:25 +00:00
Matt Jankowski
08dd11f8d4
Use in_order_of with filter: false in AccountSummary.localized ( #33446 )
2025-01-06 08:18:05 +00:00
Jeremy Kescher
612d6182e4
Fix /share not using server-set characters limit ( #33459 )
2025-01-06 08:14:11 +00:00
github-actions[bot]
c93c1f38b7
New Crowdin Translations (automated) ( #33451 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2025-01-06 08:13:39 +00:00
github-actions[bot]
53f8ac09f3
New Crowdin Translations (automated) ( #2920 )
...
* 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>
2025-01-05 14:55:11 +01:00
Tim Rogers
3bdfa3eb4c
Added validator for extra profile field values with empty name ( #33421 )
2025-01-04 19:42:27 +00:00
Claire
0327db3db0
[Glitch] Refactor status handleClick and handleHotkeyOpen handlers
...
Port 9712518b2f
2025-01-04 15:30:32 +01:00
Claire
d878ca267c
[Glitch] Fix audio player modal having white-on-white buttons in light theme
...
Port 02fe176fd4
2025-01-04 15:29:56 +01:00
Claire
807bf8be24
Merge commit '9712518b2fb2585df3bcff95a687c291f04a4199' into glitch-soc/merge-upstream
2025-01-04 15:27:49 +01:00
Claire
9712518b2f
Refactor status handleClick and handleHotkeyOpen handlers ( #33435 )
2025-01-03 22:00:52 +00:00
Claire
02fe176fd4
Fix audio player modal having white-on-white buttons in light theme ( #33444 )
2025-01-03 21:51:51 +00:00
