Claire
c2f0ea415e
Merge commit '899eac1a92c802c334606a49d538ef37bd47c91a' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Changes split in `app/javascript/core/admin.js` and `app/javascript/flavours/glitch/packs/admin.jsx`.
2024-02-28 20:10:01 +01:00
Claire
c19787f3f4
Add doodle feature back ( #2652 )
2024-02-27 21:27:51 +01:00
Claire
e8155319c7
Take advantage of upstream's refactor and reduce code duplication
2024-02-27 19:28:13 +01:00
Claire
916d78373d
[Glitch] Change behavior of privacy dropdown to only change value on validation
...
Port 90573c3abb
2024-02-27 19:24:34 +01:00
Evan Paterakis
1b219e709b
[Glitch] Fix filters title and keywords overflow
...
Port 213c87ae59
2024-02-27 19:24:03 +01:00
Claire
a482932649
Merge commit '6f7615ba86afda56e1d661442286a1d68467a525' into glitch-soc/merge-upstream
...
Conflicts:
- `app/controllers/application_controller.rb`:
Not a real conflict, upstream fixed a bug in a line adjacent to code
modified by glitch-soc.
Ported upstream's change.
2024-02-27 19:20:57 +01:00
Renaud Chaput
899eac1a92
Use modern ES syntax rather than .call ( #29368 )
2024-02-27 15:42:05 +00:00
github-actions[bot]
bc4c5ed918
New Crowdin Translations (automated) ( #29423 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-27 14:53:53 +00:00
Claire
90573c3abb
Change behavior of privacy dropdown to only change value on validation ( #29406 )
2024-02-27 11:41:19 +00:00
Evan Paterakis
213c87ae59
Fix filters title and keywords overflow ( #29396 )
2024-02-27 10:46:58 +00:00
Matt Jankowski
8a80ad7fc4
[Glitch] Remove unused media-spoiler-* JS/CSS
...
Port c7555271a6
2024-02-26 17:54:58 +01:00
Roni Laukkarinen
20bc633b0c
[Glitch] Change new explore compass icon CSS class to explore
...
Port 10fdd88288
2024-02-26 17:54:58 +01:00
Roni Laukkarinen
3fc4859279
[Glitch] Fix search icon position on mobile
...
Port 1cb74eeec0
2024-02-26 17:54:58 +01:00
Roni Laukkarinen
658911c268
[Glitch] Improve alt text form accessibility with long texts
...
Port bbf6cb66f6
2024-02-26 17:54:58 +01:00
Eugen Rochko
f6903d9ab0
[Glitch] Change explore icon from hashtag to compass in web UI
...
Port b8b2f20b16
2024-02-26 17:54:58 +01:00
Claire
67ca8bb56a
Merge commit '8156113d58db851d00f8052e66459e6dafb71e82' into glitch-soc/merge-upstream
...
Conflicts:
- `app/javascript/packs/admin.jsx`:
Change applied to `app/javascript/core/admin.js` instead.
2024-02-26 17:43:16 +01:00
Matt Jankowski
c7555271a6
Remove unused media-spoiler-* JS/CSS ( #29407 )
2024-02-26 15:30:58 +00:00
Roni Laukkarinen
10fdd88288
Change new explore compass icon CSS class to explore ( #29395 )
2024-02-26 15:28:38 +00:00
github-actions[bot]
98e3dc2578
New Crowdin Translations (automated) ( #29382 )
...
Co-authored-by: GitHub Actions <noreply@github.com>
2024-02-26 13:03:06 +00:00
Roni Laukkarinen
1cb74eeec0
Fix search icon position on mobile ( #29384 )
2024-02-26 00:57:48 +00:00
Roni Laukkarinen
bbf6cb66f6
Improve alt text form accessibility with long texts ( #27095 )
2024-02-26 00:57:13 +00:00
Essem
fa2bbbfd9d
Fix "threaded more" typo
2024-02-25 17:10:25 -06:00
Claire
3ffb81e04f
[Glitch] Add end-to-end test for OCR in media uploads
...
Port ca8fbda5d0
2024-02-24 16:13:13 +01:00
Claire
ad0be125f5
[Glitch] Fix pixel alignment for some composer icons
...
Port 25ffe0af45
2024-02-24 15:53:42 +01:00
Claire
2dc244784c
Merge commit 'cfa71a4d16e71b04a42dda564ed8e188bd1badd9' into glitch-soc/merge-upstream
2024-02-24 15:43:15 +01:00
Claire
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
Claire
d2cfc6e5e2
Merge commit '08342ad40c1b92caf873282190efe8533a7d6e2e' into glitch-soc/merge-upstream
2024-02-24 15:02:28 +01:00
Hinaloe
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
Eugen Rochko
200e11ae88
[Glitch] Change follow suggestions design in web UI
...
Port 63f4ea055a
2024-02-24 14:53:09 +01:00
Claire
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
Nicolas Hoffmann
e45f40d203
[Glitch] Fix modal container bounds
...
Port 476a043fc5
2024-02-24 14:49:35 +01:00
Claire
9f0ff2bedf
[Glitch] Clean up some unused CSS definitions
...
Port 67ec192d7d
2024-02-24 14:49:03 +01:00
Claire
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
Claire
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
y.takahashi
3894674200
[Glitch] Fix 'focus the compose textarea' shortcut is not working
...
Port 3c315a68af
2024-02-24 14:35:52 +01:00
Eugen Rochko
cce3f3d6da
[Glitch] Change onboarding prompt to follow suggestions carousel in web UI
...
Port 9cdc60ecc6
2024-02-24 14:35:08 +01:00
Claire
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
Yamagishi Kazutoshi
b4cca47f5f
[Glitch] Remove unused l18n messages
...
Port b3075a9993
2024-02-24 14:19:26 +01:00
Claire
5b9ddfcfcc
Merge commit 'fa0ba677538588086d83c97c0ea56f9cd1556590' into glitch-soc/merge-upstream
2024-02-24 14:18:16 +01:00
J H
4d6844eb2f
[Glitch] Fixed the toggle emoji dropdown bug
...
Port 1467f1e1e1
2024-02-24 14:15:59 +01:00
Claire
dfd74f0dae
Merge commit '1467f1e1e1c18dc4b310862ff1f719165a24cfb6' into glitch-soc/merge-upstream
2024-02-24 14:15:49 +01:00
Claire
6da69967d0
[Glitch] Change compose form to use server-provided post character limit
...
Port 805dba7f8d
2024-02-24 13:56:12 +01:00
Claire
20615a516d
Merge commit '805dba7f8d2a2d5f910ec1396247b36417170345' into glitch-soc/merge-upstream
2024-02-24 13:53:59 +01:00
Claire
6901930c8d
Add back confirmation modal for missing media description
2024-02-23 23:04:32 +01:00
Claire
138286147f
Fix emoji being inserted in incorrect places
2024-02-23 21:45:48 +01:00
Claire
6eede9d84b
Add notification badge feature back
2024-02-23 21:05:34 +01:00
Claire
9ab030bb13
Add thread mode button
2024-02-23 21:05:34 +01:00
Claire
e333453343
Use Warning icon for CWs in app settings
2024-02-23 21:05:34 +01:00
Claire
e62cd93650
Fix composer offering to edit federation settings for an existing post
2024-02-23 21:05:34 +01:00
Claire
23dc650596
Restore preselect on reply option
2024-02-23 21:05:34 +01:00
