tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
24,291 Commits 5 Branches 0 Tags
Commit Graph

4217 Commits

Author SHA1 Message Date
Claire
19fa4cfcf2 Merge commit '3178acc5cb8415a72b646dbe77be05255d3966f3' into glitch-soc/merge-upstream 2025-01-23 13:38:23 +01:00
Claire
3178acc5cb
Fix language detection taking mentions and URLs into account (#33700) 2025-01-23 10:25:14 +00:00
Claire
8dcfd3f246
Fix WebUI crash when language detection code returns undefined (#33683) 2025-01-22 15:30:59 +00:00
Eugen Rochko
8b24085f8e
Refactor <DomainPill> into TypeScript (#33680) 2025-01-22 08:39:13 +00:00
github-actions[bot]
38c27a7708
New Crowdin Translations (automated) (#33679) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-22 08:35:41 +00:00
Claire
05e5db91c7 Merge commit '3dcf5e12b1ffb8e57a7c1e1f3f1145c9bae477e8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict because one of the removed lines was modified to accomodate for
  glitch-soc's slightly different build system.
  Removed the lines as upstream did.
 2025-01-21 19:23:25 +01:00
Eugen Rochko
11786f1114
Change design of edit media modal in web UI (#33516) 2025-01-21 11:34:22 +00:00
Claire
ce7fb94306 Merge commit '4ebdfed8ea7d16d203da73051ef26bbcdeb63681' into glitch-soc/merge-upstream 2025-01-21 12:06:49 +01:00
Claire
4ebdfed8ea
Fix opening modals losing some location parameters (#33670) 2025-01-21 09:53:52 +00:00
github-actions[bot]
9e90248abc
New Crowdin Translations (automated) (#33668) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-21 08:37:53 +00:00
Claire
08e7c4f3a7 Merge commit '7f866daf637e9303c7b503e0ed29ef8802fcb4c0' into glitch-soc/merge-upstream 2025-01-20 18:06:13 +01:00
Eugen Rochko
8962f11578
Add warning when selected and detected language is different in web UI (#33042) 2025-01-20 09:17:13 +00:00
github-actions[bot]
329a9e1ac1
New Crowdin Translations (automated) (#33643) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-20 08:59:23 +00:00
Claire
297eb7c956 Merge commit '4bd969e4bb54297981d385903bf8a4348b394f09' into glitch-soc/merge-upstream 
Conflicts:
- `CONTRIBUTING.md`:
  Upstream modified it while we quote upstream's within an otherwise different file.
  Applied upstream's changes.
 2025-01-18 12:42:17 +01:00
github-actions[bot]
1c23ebd62f
New Crowdin Translations (automated) (#33626) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-17 10:05:41 +00:00
Claire
f6a0cd9d1a Merge commit 'da4e55eb17e459fbc6d1a19fac3303508324324c' into glitch-soc/merge-upstream 2025-01-16 11:16:53 +01:00
github-actions[bot]
4a44c47982
New Crowdin Translations (automated) (#33609) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-16 09:13:39 +00:00
Claire
ab152ebed4 Merge commit 'e1d7efadc04dd0826c6bcfe43325688566e13881' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/status.rb`:
  Upstream refactored `visibility` handling to a concern, while glitch-soc had
  custom code adjacent to some of the changed lines.
  Applied upstream's changes.
- `lib/mastodon/version.rb`:
  Upstream moved some definitions to `config/mastodon.yml`, while glitch-soc's
  default github repository had been modified.
  Applied upstream's changes and updated `config/mastodon.yml` accordingly.
 2025-01-14 20:38:32 +01:00
Claire
e9462960a7
Redirect new users to onboarding (#33471) 2025-01-14 13:10:48 +00:00
Claire
e2f085e2b2
Use final specification for new WebPush subscriptions in web interface (#33587) 2025-01-14 10:42:06 +00:00
github-actions[bot]
ee4edbb94f
New Crowdin Translations (automated) (#33582) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-14 08:44:58 +00:00
github-actions[bot]
53885b0fdb
New Crowdin Translations (automated) (#33559) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-13 09:13:47 +00:00
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
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
Claire
a8b2b474d7
Add timestamp to all announcements in Web UI (#18329) 2025-01-09 14:22:33 +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
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
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
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
Claire
126ce9a232 Merge commit '82d2ce293d98a2b9e024bc5396c3586904d46ae5' into glitch-soc/merge-upstream 2025-01-06 20:36:25 +01:00
Claire
e8672e27e8
Further remove old notifications code (#33465) 2025-01-06 18:22:07 +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
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
Claire
7e1f8babbd Merge commit '7d6da219c0fccb8693282a99765135050173d7c4' into glitch-soc/merge-upstream 2025-01-03 20:26:28 +01:00
Claire
7d6da219c0
Remove old notifications actions and reducers (#31843) 2025-01-03 16:12:08 +00:00
Christian Schmidt
f9582bcfc3
Localize language names (#33402) 2025-01-03 15:29:25 +00:00
Claire
68106f250c Merge commit '6ffa251d6ad239d1ad2b95e784c3a7a21cbf50e8' into glitch-soc/merge-upstream 2025-01-03 12:34:47 +01:00
Claire
79a9069deb
Add t hotkey for post translations (#33441) 2025-01-03 09:24:50 +00:00
github-actions[bot]
a8a16695f1
New Crowdin Translations (automated) (#33439) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-03 07:53:00 +00:00
Claire
cef665788a Merge commit '8e3fd1b8236448f01221b1d7745736e50de51e11' into glitch-soc/merge-upstream 2025-01-02 21:14:14 +01:00
Jeong Arm
a557f9bbaa
Fix keyboard shortcut for open status (#33419) 2025-01-02 15:48:59 +00:00
gunchleoc
3201485df2
Fix favorite & bookmark text toggle in timeline, status and image view (#27209) 2025-01-02 13:52:07 +00:00
Claire
655c4a5ebb
Fix processing of incoming notifications for unfilterable types (#33429) 2025-01-02 13:22:25 +00:00
Claire
68bfa7ae3f
Fix WebUI erroneously stopping to offer expanding search results after second page (#33428) 2025-01-02 10:58:00 +00:00
github-actions[bot]
ba18289477
New Crowdin Translations (automated) (#33378) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2025-01-02 09:02:47 +00:00
Claire
0aa69487a2 Merge commit '877090518682b6c77ba9bdfa0231afd56daec44d' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/concerns/user/has_settings.rb`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `app/views/settings/preferences/appearance/show.html.haml`:
  Not a real conflict, upstream added a setting textually close to a glitch-soc one.
  Added upstream's new setting.
- `config/routes.rb`:
  Upstream moved web app routes to `config/routes/web_app.rb`, while glitch-soc had
  an extra route.
  Moved the extra route to `config/routes/web_app.rb`.
- `spec/controllers/settings/preferences/appearance_controller_spec.rb`:
  This spec got converted to a system spec upstream.
  However, the theme setting works differently in glitch-soc, so the spec had been
  changed.
  Changed the corresponding system spec as well.
 2024-12-25 18:01:37 +01:00