djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-02-03 21:43:40 -05:00
Code Issues Packages Projects Releases Wiki Activity
24,213 Commits 69 Branches 22 Tags 360 MiB
Commit Graph

4200 Commits

Author SHA1 Message Date
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
github-actions[bot]
dd56292d1f
New Crowdin Translations (automated) (#33370) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-20 08:06:18 +00:00
github-actions[bot]
7a08fe91b5
New Crowdin Translations (automated) (#33358) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-19 08:47:20 +00:00
github-actions[bot]
1992c2a4fa
New Crowdin Translations (automated) (#33345) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-18 07:51:31 +00:00
Eugen Rochko
f19fd0b889
Change design of interaction modal in web UI (#33278) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2024-12-17 12:36:32 +00:00
github-actions[bot]
02748f172d
New Crowdin Translations (automated) (#33332) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-17 09:33:42 +00:00
Claire
a837f7d693
Fix clicking on a profile mention while logged out potentially leading to incorrect account (#33324) 2024-12-16 19:29:51 +00:00
github-actions[bot]
504ea31bd3
New Crowdin Translations (automated) (#33310) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-16 07:54:12 +00:00
Eugen Rochko
3cf6681736
Change animation on feed generation screen in web UI (#33311) 2024-12-16 07:38:56 +00:00
github-actions[bot]
7200f9d25c
New Crowdin Translations (automated) (#33300) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-13 10:38:09 +00:00
Eugen Rochko
0636bcdbe1
Change search to use query params in web UI (#32949) 2024-12-12 17:12:33 +00:00
github-actions[bot]
e0a49af47d
New Crowdin Translations (automated) (#33280) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-12 09:10:00 +00:00
Renaud Chaput
da279df8ae
Fix voting on polls (#33266) 2024-12-11 10:32:03 +00:00
Claire
a4560d9278
Change label of grouped favourite notification on private mentions (#31659) 2024-12-11 10:25:51 +00:00
github-actions[bot]
f12b3a9cef
New Crowdin Translations (automated) (#33262) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-11 08:20:44 +00:00
Renaud Chaput
ded799f913
Convert polls to Typescript / Immutable Records (#29789) 2024-12-10 22:54:07 +00:00
github-actions[bot]
801cd731be
New Crowdin Translations (automated) (#33235) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-12-10 09:10:28 +00:00
Eugen Rochko
425311e1d9
Change referrer policy to be controlled by header in web UI (#33214) 2024-12-09 22:42:45 +00:00