ad0be125f5
[Glitch] Fix pixel alignment for some composer icons
...
Port 25ffe0af45
2024-02-24 15:53:42 +01:00
2dc244784c
Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream
2024-02-24 15:43:15 +01:00
1ad91dece8
Merge commit '9d8dfeb5fbbc274482489a3ac9f22dd736da156c' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Changes applied to `app/javascript/core/admin.js` instead.
2024-02-24 15:35:56 +01:00
7901dc9e24
Merge commit '491dd9764244c8adf37861f00d916c96bdbfdaf8' into glitch-soc/merge-upstream
...
Conflicts:
- `app/workers/scheduler/auto_close_registrations_scheduler.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 15:33:36 +01:00
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
ba67ea3d12
[Glitch] Fix `sensitive` flag not being removed when removing CW in new compose form
...
Port c645490d55
2024-02-24 14:53:49 +01:00
200e11ae88
[Glitch] Change follow suggestions design in web UI
...
Port 63f4ea055a
2024-02-24 14:53:09 +01:00
26924a0c7d
[Glitch] Change `source` attribute of `Suggestion` entity in `/api/v2/suggestions` back to a string
...
Port 7ee93b7431
2024-02-24 14:52:44 +01:00
e45f40d203
[Glitch] Fix modal container bounds
...
Port 476a043fc5
2024-02-24 14:49:35 +01:00
9f0ff2bedf
[Glitch] Clean up some unused CSS definitions
...
Port 67ec192d7d
2024-02-24 14:49:03 +01:00
ef3d15554b
Merge commit 'c645490d553124d800d30488595f7d2d9d61584d' into glitch-soc/merge-upstream
...
Conflicts:
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `README.md`:
Upstream updated its README, we have a completely different one.
Kept glitch-soc's README.
- `app/models/account.rb`:
Not a real conflict, upstream updated some lines textually adjacent
to glitch-soc-specific lines.
Ported upstream's changes.
2024-02-24 14:46:14 +01:00
3c36e1be68
[Glitch] Fix report reason selector in moderation interface not unselecting rules when changing category
...
Port 9ce914cc89
2024-02-24 14:36:55 +01:00
3894674200
[Glitch] Fix 'focus the compose textarea' shortcut is not working
...
Port 3c315a68af
2024-02-24 14:35:52 +01:00
cce3f3d6da
[Glitch] Change onboarding prompt to follow suggestions carousel in web UI
...
Port 9cdc60ecc6
2024-02-24 14:35:08 +01:00
ab2f0daa10
Merge commit 'aaa58d4807377e04649499ebee91757b16b9a007' into glitch-soc/merge-upstream
...
Conflicts:
- `.github/workflows/build-security.yml`:
Changes were already cherry-picked and adapted in glitch-soc.
Kept glitch-soc's version.
- `Gemfile.lock`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
- `lib/mastodon/version.rb`:
Changes were already cherry-picked and updated further in glitch-soc.
Kept glitch-soc's version.
2024-02-24 14:27:43 +01:00
b4cca47f5f
[Glitch] Remove unused l18n messages
...
Port b3075a9993
2024-02-24 14:19:26 +01:00
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
4d6844eb2f
[Glitch] Fixed the toggle emoji dropdown bug
...
Port 1467f1e1e1
2024-02-24 14:15:59 +01:00
dfd74f0dae
Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream
2024-02-24 14:15:49 +01:00
73de36318e
Move `api/v1/timelines/direct` to request spec
2024-02-24 14:10:05 +01:00
9903e6beab
Merge commit '0b0ca6f3b85c9d08e4642e49d743f8d060632293' into glitch-soc/merge-upstream
...
Conflicts:
- `spec/controllers/api/v1/timelines/direct_controller_spec.rb`:
`spec/controllers/api/v1/timelines` has been renamed, but we had an extra
spec here for a glitch-soc-only endpoint.
Kept glitch-soc's file unchanged (will port to a request spec later).
2024-02-24 14:05:26 +01:00
c297d999ba
Merge commit '87ad398ddc78f2da5746774960690661e8e57335' into glitch-soc/merge-upstream
2024-02-24 14:02:01 +01:00
47b5105e5d
Remove `max_toot_chars` from initial-state
...
This is still in `/api/v1/instance` for compatibility with other clients
2024-02-24 13:58:00 +01:00
6da69967d0
[Glitch] Change compose form to use server-provided post character limit
...
Port 805dba7f8d
2024-02-24 13:56:12 +01:00
20615a516d
Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream
2024-02-24 13:53:59 +01:00
25ac55ecd8
Merge pull request #2644 from ClearlyClaire/glitch-soc/merge-dreaded-upstream-composer-change
...
Merge and port upstream's composer change
2024-02-24 13:46:26 +01:00
6901930c8d
Add back confirmation modal for missing media description
2024-02-23 23:04:32 +01:00
138286147f
Fix emoji being inserted in incorrect places
2024-02-23 21:45:48 +01:00
6eede9d84b
Add notification badge feature back
2024-02-23 21:05:34 +01:00
9ab030bb13
Add thread mode button
2024-02-23 21:05:34 +01:00
e333453343
Use Warning icon for CWs in app settings
2024-02-23 21:05:34 +01:00
e62cd93650
Fix composer offering to edit federation settings for an existing post
2024-02-23 21:05:34 +01:00
23dc650596
Restore preselect on reply option
2024-02-23 21:05:34 +01:00
84d05ca221
Reimplement glitchy elephant friend
2024-02-23 21:05:33 +01:00
3564a15553
Refactor composer dropdowns
2024-02-23 21:05:33 +01:00
0e77c45624
Add local-only option back as a federation setting dropdown
2024-02-23 21:05:33 +01:00
47deb680d5
Add Content-Type dropdown back
2024-02-23 21:05:33 +01:00
118bb5bc81
Add secondary post button back
2024-02-23 21:05:33 +01:00
61559a42a9
Restore glitch-soc's permalink behavior for reply indicator
2024-02-23 20:57:20 +01:00
179437ed0e
Restore access to glitch-soc app settings
2024-02-23 20:57:20 +01:00
056f9bf3c2
Add back “spoilers always on” feature
2024-02-23 20:57:18 +01:00
cfa71a4d16
Fix admin account created by `mastodon:setup` not being auto-approved ( #29379 )
2024-02-23 19:04:57 +00:00
25ffe0af45
Fix pixel alignment for some composer icons ( #29372 )
2024-02-23 15:32:13 +00:00
bba4118ddd
New Crowdin Translations (automated) ( #29369 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-23 15:21:02 +00:00
b0064ddda7
Add basic coverage for `MoveService` class ( #29301 )
2024-02-23 09:59:29 +00:00
baa23738a8
Update dependency webmock to v3.22.0 ( #29313 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-02-23 09:57:26 +00:00
380f4fc95c
Reimplement sensitive checkbox
2024-02-22 23:49:06 +01:00
5fd50756b4
Restore glitch-soc's support of custom poll limits
2024-02-22 23:06:12 +01:00
9c10aaa4d5
[Glitch] Change design of compose form in web UI
...
Port 6936e5aa69
2024-02-22 23:06:12 +01:00
45f71e3954
Update `@rails/ujs` to version 7.1.3-2 ( #29359 )
2024-02-22 21:35:14 +00:00
Claire
Hinaloe
Eugen Rochko
Nicolas Hoffmann
y.takahashi
Yamagishi Kazutoshi
J H
github-actions[bot]
Matt Jankowski
renovate[bot]