djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-01-21 23:22:56 -05:00
Code Issues Packages Projects Releases Wiki Activity
23,029 Commits 69 Branches 22 Tags 416 MiB
Commit Graph

8036 Commits

Author SHA1 Message Date
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 24ef8255b3f9b44cb54f49bc78fe3382a7070b1a 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 3d46f478174403a64bd194e8c60e11b07bbd5d2d 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 f2a92c2d22345568ca7f47ee1d1d70de53eb547d 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 a27f7f4e561c9d2fe21d984059603d2f500c005b 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 a3215c0f88bb5f436bed665ad26175923544d9d4 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 e09f9f885e3d2859f495d5e5e6107bba9bde3b5a 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 e0c27a504788bdc6cd518072e557313e4ec5ee7a 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 3929e3c6d21226ad42f743a283576004d9c1c7eb 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 a021dee64214fcc662c0c36ad4e44dc1deaba65f 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 b4b639ee4a059385874f143027b75516c8db17d9 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-05 20:40:31 +02:00
Eugen Rochko
cb324b5d7c [Glitch] Change design of unread conversations in web UI 
Port ec4c49082edb5f4941bd4e129900628c6b30101e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-05 20:40:04 +02:00
Claire
1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02:00
Eugen Rochko
bc435c63bd
Change width of columns in advanced web UI (#31762) 2024-09-05 14:57:53 +00:00
Michael Stanclift
b4b639ee4a
Fix radio checkbox visibility in Report dialogs (#31752) 2024-09-05 12:34:13 +00:00
Eugen Rochko
b265a654d7
Fix wrong width on content warnings and filters in web UI (#31761) 2024-09-05 09:46:11 +00:00
github-actions[bot]
eb23d9f0f6
New Crowdin Translations (automated) (#31765) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-05 09:40:38 +00:00
Eugen Rochko
ec4c49082e
Change design of unread conversations in web UI (#31763) 2024-09-05 09:39:59 +00:00
Claire
1fb31ad9b1 [Glitch] Fix display name being displayed instead of domain in remote reports 
Port 585e369e0bb0e17ff5e025385dfefde1e9e81fa3 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-04 19:43:21 +02:00
Claire
1d86377ba9 [Glitch] Fix all notification types being stored without filtering when polling 
Port fab29ebbe864f0aec84857fc3d87f0d56f4f6b9b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-04 19:42:45 +02:00
Claire
5a55180b95 Merge commit 'fe04291af46d7cb9d3439fa73739b2ffb2b53d72' into glitch-soc/merge-upstream 
Conflicts:
- `spec/lib/sanitize/config_spec.rb`:
  Upstream rewrote top-level `describe` calls to `RSpec.describe`, and
  glitch-soc had differences in the first few tests because of the wider
  subset of HTML it accepts.
  Changed `describe` to `RSpec.describe` as upstream did, keeping
  glitch-soc's tests.
 2024-09-04 19:38:52 +02:00
Claire
585e369e0b
Fix display name being displayed instead of domain in remote reports (#31613) 2024-09-04 13:43:08 +00:00
Claire
fab29ebbe8
Fix all notification types being stored without filtering when polling (#31745) 2024-09-04 13:28:16 +00:00
github-actions[bot]
1c17dca6d9
New Crowdin Translations (automated) (#31741) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-04 08:42:36 +00:00
Christian Schmidt
8e3c47aff5 [Glitch] frequentlyUsedLanguages not updated correctly 
Port 8adf67f2dbde0ae249ccadd8cbd2156e14932f52 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-03 21:55:32 +02:00
Claire
663cebbe3b [Glitch] Fix radio buttons styling in web UI 
Port 0437dd9e770c293ec4f16d0513d1d5dd65209406 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2024-09-03 21:54:41 +02:00
Claire
fef055db96 Merge commit 'c9ea91f8683cd5c0cfac14071a17e3956ac6d3b0' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v1/timelines/tag_spec.rb`:
  Upstream refactored this file, while we had a change to switch a default setting.
  Updated as upstream did.
- `spec/views/statuses/show.html.haml_spec.rb`:
  Upstream refactored this file, while we stubbed different methods.
  Updated as upstream did, and updated the stubs accordingly.
 2024-09-03 21:51:53 +02:00