1
0
mirror of https://github.com/funamitech/mastodon synced 2024-12-12 13:48:35 +09:00
Commit Graph

8052 Commits

Author SHA1 Message Date
Claire
18209d2011
Merge pull request #2847 from ClearlyClaire/glitch-soc/fixes/click-detailed-status
Fix detailed statuses being clickable and linking to broken pages
2024-09-16 23:51:37 +02:00
Claire
43f6792e1b Fix detailed statuses being clickable and linking to broken pages 2024-09-16 22:51:19 +02:00
Claire
0740352ce6 [Glitch] Rename /api/v2_alpha/notifications* to /api/v2/notifications*
Port e0648a916a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-16 21:28:05 +02:00
Eugen Rochko
b6398cf2d3 [Glitch] Fix horizontal scrollbar on who to follow carousel in web UI
Port efb0e2c34b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-16 21:28:05 +02:00
Claire
e25634ccef [Glitch] Convert notification requests actions and reducers to Typescript
Port c0eda832f3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-16 21:28:05 +02:00
Claire
665e9129fe Merge commit 'e0648a916ab81925545504173bf4f43ec64d4f3c' into glitch-soc/merge-upstream
Conflicts:
- `app/models/custom_emoji.rb`:
  An upstream refactor touched lines adjacent to ones modified in glitch-soc.
  Ported upstream's changes.
2024-09-16 21:08:58 +02:00
Claire
e0648a916a
Rename /api/v2_alpha/notifications* to /api/v2/notifications* (#31840) 2024-09-16 12:10:02 +00:00
Eugen Rochko
efb0e2c34b
Fix horizontal scrollbar on who to follow carousel in web UI (#31912) 2024-09-16 12:08:37 +00:00
Claire
c0eda832f3
Convert notification requests actions and reducers to Typescript (#31866) 2024-09-16 09:54:03 +00:00
github-actions[bot]
474abf3c7f
New Crowdin Translations (automated) (#31911)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-16 08:48:20 +00:00
Claire
117ac13d12 Merge commit '5ba3405be4c1f708f198580b481f822698dab392' into glitch-soc/merge-upstream 2024-09-13 21:37:34 +02:00
github-actions[bot]
353ade767b
New Crowdin Translations (automated) (#31898)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-13 08:41:46 +00:00
Claire
427ed60274 Fix link handling within detailed status contents 2024-09-12 22:42:07 +02:00
Claire
4050beb6e2 Fix detailed status timestamp link target not being the original URL 2024-09-12 22:30:40 +02:00
Michael Stanclift
9b1ecf7aee [Glitch] Fix review history and action modal styling
Port a269ff9253 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 21:38:15 +02:00
Claire
afd3953cdd [Glitch] Autofocus primary button in modals
Port 5f782f9629 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 21:35:03 +02:00
Claire
83b553c7d1 Merge commit '0226bbe5165a53658b29e46ddbef6a10507fdc8c' into glitch-soc/merge-upstream 2024-09-12 21:32:39 +02:00
Eugen Rochko
bd68d2ab21 [Glitch] Change design of embed modal in web UI
Port 24ef8255b3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 20:58:23 +02:00
Eugen Rochko
e705ec13db [Glitch] Change embedded posts to use web UI
Port 3d46f47817 to glitch-soc

Co-authored-by: Claire <claire.github-309c@sitedethib.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 20:58:02 +02:00
Claire
3465d39494 Merge commit '24ef8255b3f9b44cb54f49bc78fe3382a7070b1a' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
  Upstream removed a helper, textually adjacent to a glitch-soc-only one.
  Not really a conflict.
  Removed the helper as upstream did.
- `app/views/layouts/embedded.html.haml`:
  Conflicts due to theming system.
  Adapted upstream's change to our theming system.
- `app/views/statuses/_simple_status.html.haml`:
  Removed upstream, but we had local changes.
  Removed as upstream did.
2024-09-12 20:05:08 +02:00
Eugen Rochko
2d31cdbc28 [Glitch] Fix notifications re-rendering spuriously in web UI
Port f2a92c2d22 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 17:35:05 +02:00
Claire
caaa412e6e Merge commit 'f2a92c2d22345568ca7f47ee1d1d70de53eb547d' into glitch-soc/merge-upstream 2024-09-12 17:34:16 +02:00
renovate[bot]
17e3a12d3d [Glitch] Update typescript-eslint monorepo to v8 (major)
Port a27f7f4e56 to glitch-soc

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 17:32:41 +02:00
Eugen Rochko
196b141af5 [Glitch] Change inner borders in media galleries in web UI
Port a3215c0f88 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 17:28:44 +02:00
Michael Stanclift
eb28472ded [Glitch] Fix alt text modal styling
Port e09f9f885e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 17:23:59 +02:00
Claire
90d7a4bac4 Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream 2024-09-12 17:22:06 +02:00
Michael Stanclift
a269ff9253
Fix review history and action modal styling (#31864) 2024-09-12 14:18:43 +00:00
Claire
5f782f9629
Autofocus primary button in modals (#31883) 2024-09-12 13:15:05 +00:00
Eugen Rochko
24ef8255b3
Change design of embed modal in web UI (#31801) 2024-09-12 12:54:16 +00:00
Eugen Rochko
77cbe2332a [Glitch] Add ability to manage which websites can credit you in link previews
Port CSS changes from e0c27a5047 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 12:30:31 +02:00
Eugen Rochko
abe1717215 [Glitch] Change design of hide media button in web UI
Port 3929e3c6d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 12:30:31 +02:00
Claire
10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02:00
Eugen Rochko
3d46f47817
Change embedded posts to use web UI (#31766)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-09-12 09:41:19 +00:00
Eugen Rochko
f2a92c2d22
Fix notifications re-rendering spuriously in web UI (#31879) 2024-09-12 08:16:07 +00:00
github-actions[bot]
7d53ca56d2
New Crowdin Translations (automated) (#31878)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-12 07:54:53 +00:00
Eugen Rochko
e2c101ec35 [Glitch] Change labels on thread indicators in web UI
Partial port of a021dee642 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-11 21:27:46 +02:00
Claire
b240bad61a Merge commit '5260233b81c301cf7b0c79b179858748b693460b' into glitch-soc/merge-upstream 2024-09-11 20:58:35 +02:00
renovate[bot]
a27f7f4e56
Update typescript-eslint monorepo to v8 (major) (#31231)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
2024-09-11 13:59:46 +00:00
github-actions[bot]
2babfafaff
New Crowdin Translations (automated) (#31855)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-11 08:18:10 +00:00
Eugen Rochko
a3215c0f88
Change inner borders in media galleries in web UI (#31852) 2024-09-11 07:29:18 +00:00
Michael Stanclift
e09f9f885e
Fix alt text modal styling (#31844) 2024-09-10 17:33:55 +00:00
Eugen Rochko
e0c27a5047
Add ability to manage which websites can credit you in link previews (#31819) 2024-09-10 12:00:40 +00:00
Eugen Rochko
3929e3c6d2
Change design of hide media button in web UI (#31807) 2024-09-10 09:29:17 +00:00
github-actions[bot]
5260233b81
New Crowdin Translations (automated) (#31835)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-10 09:22:49 +00:00
Claire
441af2632d Merge commit '2caa3f365ded73be17b623177967110e66f14061' into glitch-soc/merge-upstream 2024-09-09 18:22:41 +02:00
Eugen Rochko
a021dee642
Change labels on thread indicators in web UI (#31806) 2024-09-09 15:28:54 +00:00
github-actions[bot]
2caa3f365d
New Crowdin Translations (automated) (#31800)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-09 12:38:43 +00:00
Claire
29124990a2 Merge commit '7335a43b6dac0e82c305ce4dec9db4da114c769e' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream reworked how CSS classes for the document's body are computed.
  Slight conflict due to glitch-soc's different theming system.
  Updated as upstream did.
2024-09-06 19:25:31 +02:00
github-actions[bot]
cc4865193a
New Crowdin Translations (automated) (#31781)
Co-authored-by: GitHub Actions <noreply@github.com>
2024-09-06 07:38:08 +00:00
Michael Stanclift
db6b1fe8fb [Glitch] Fix radio checkbox visibility in Report dialogs
Port b4b639ee4a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
2024-09-05 20:40:31 +02:00