mirror/YuruToot
1
0
Fork 0
mirror of https://github.com/funamitech/mastodon synced 2024-12-18 00:29:13 +09:00
Code
23,009 Commits 1 Branch 1 Tag 337 MiB
caaa412e6e
Commit Graph

1537 Commits

Author SHA1 Message Date
Claire
caaa412e6e Merge commit 'f2a92c2d22345568ca7f47ee1d1d70de53eb547d' into glitch-soc/merge-upstream 2024-09-12 17:34:16 +02:00
Claire
90d7a4bac4 Merge commit 'a27f7f4e561c9d2fe21d984059603d2f500c005b' into glitch-soc/merge-upstream 2024-09-12 17:22:06 +02:00
Claire
10e2b87774 Merge commit '0c3c06f7cc50c9207a44f56e184ce6a41f953171' into glitch-soc/merge-upstream 2024-09-12 12:09:21 +02: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
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
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
Claire
1a0ef0c526 Merge commit '5acec087caed4a2fdf0fd8ed11f891222496f321' into glitch-soc/merge-upstream 2024-09-05 20:36:25 +02: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
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
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
Claire
ac4002fe08 Merge commit '611533cd12059d365ca0267342b750e615637bd4' into glitch-soc/merge-upstream 2024-09-03 12:12:23 +02:00
github-actions[bot]
e5155c50fd
New Crowdin Translations (automated) (#31716) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-03 08:02:08 +00:00
Claire
402c1e116d Merge commit '491033c86cc9c29302bfe68cc94dabad82ded4cc' into glitch-soc/merge-upstream 2024-09-02 17:43:10 +02:00
github-actions[bot]
2f2b98c8cb
New Crowdin Translations (automated) (#31671) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-09-02 08:35:09 +00:00
Claire
6f35e93f72 Merge commit '02633d6ebbe944a8769c8f2229fa9e0d6c7d1142' into glitch-soc/merge-upstream 2024-08-31 16:06:04 +02:00
github-actions[bot]
92eba9096b
New Crowdin Translations (automated) (#31656) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-30 07:12:56 +00:00
github-actions[bot]
5d725b2c12
New Crowdin Translations (automated) (#31647) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-29 08:30:39 +00:00
github-actions[bot]
26d6d291c3
New Crowdin Translations (automated) (#31627) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-28 08:59:15 +00:00
Claire
94d8cdc494 Merge commit '04f0468016b450ace8e0ce707b4c21aa18b51262' into glitch-soc/merge-upstream 2024-08-27 20:00:07 +02:00
github-actions[bot]
0e7c88aa6d
New Crowdin Translations (automated) (#31609) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-27 07:54:58 +00:00
Eugen Rochko
29b9642b31
Change design of boost modal in web UI (#31555) 2024-08-26 17:12:17 +00:00
Claire
11b8017b45 Merge commit 'e38ce3beb7b83f43ef6e6f144c19b186c393910c' into glitch-soc/merge-upstream 2024-08-26 18:52:33 +02:00
Emelia Smith
d820c0883d
Add quick links to Administration and Moderation Reports from Web UI (#24838) 2024-08-26 16:42:46 +00:00
github-actions[bot]
626d44b6c6
New Crowdin Translations (automated) (#31572) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-26 07:25:39 +00:00
Claire
d0529b810a Merge commit '97f6baf977212e84125ac325176ad305ad5b068a' into glitch-soc/merge-upstream 2024-08-24 12:06:31 +02:00
github-actions[bot]
62be0234d5
New Crowdin Translations (automated) (#31559) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-23 08:59:31 +00:00
Claire
dc70ef25b2 Merge commit 'e08d22724d9baf6c639466507c2b117788e5b8de' into glitch-soc/merge-upstream 2024-08-22 22:09:10 +02:00
Claire
18556d3e9b Merge commit '98237207e67697abffc6b141f2388e3d8c925260' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream refactored some helpers and moved them in another file.
  Not a real conflict, but glitch-soc had adjacent glitch-only definitions.
  Kept glitch-soc definitions where they are and moved upstream ones
  as upstream did.
 2024-08-22 19:54:20 +02:00
Eugen Rochko
500f4925a5
Change how content warnings and filters are displayed in web UI (#31365) 2024-08-22 17:12:35 +00:00
github-actions[bot]
f86d16adba
New Crowdin Translations (automated) (#31536) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-22 08:04:56 +00:00
Claire
0cec9077a4 Merge commit 'edeae945c0c9d6318d489ab720587621545063d0' into glitch-soc/merge-upstream 
Conflicts:
- `spec/requests/api/v2/instance_spec.rb`:
  Upstream added a test for a new attribute, next to a line we modified
  in glitch-soc because of a different default value.
  Updated as upstream's did, keeping glitch-soc's default value.
 2024-08-21 18:44:21 +02:00
mogaminsk
8c7642cd18
Change translation strings of grouped notification label to have full context (#31486) 2024-08-21 08:56:36 +00:00
github-actions[bot]
3994195fea
New Crowdin Translations (automated) (#31521) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-21 07:19:16 +00:00
Eugen Rochko
b06c7b6b5a
Change hints for missing remote content in web UI (#31516) 2024-08-21 07:08:58 +00:00
Claire
f5c0c32edd Merge commit '9ba7c90151463a6e4f7952317253fe8c113e9b0a' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/material-icons/400-24px/chat.svg`:
  Glitch-soc used this one but not upstream.
  Upstream pulled a presumably more up-to-date version of the file.
  Switched to upstream's version.
- `app/views/layouts/application.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/embedded.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
- `app/views/layouts/error.html.haml`:
  Upstream removed use of font-awesome.
  I hope we are ready.
 2024-08-20 18:31:50 +02:00
github-actions[bot]
c75f7262ed
New Crowdin Translations (automated) (#31504) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-20 07:59:21 +00:00
Renaud Chaput
98bf2fc27c
Improve the list selection UI for notification requests (#31457) 2024-08-19 22:11:58 +00:00
Claire
1760f84349 Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream 2024-08-19 18:25:31 +02:00
github-actions[bot]
c4e0a7dced
New Crowdin Translations (automated) (#31463) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-19 08:29:48 +00:00
Claire
3ea00508ac Merge commit '2d589a5ed445b474ab7cec27b0db2a331ed7bd49' into glitch-soc/merge-upstream 2024-08-16 20:06:59 +02:00
github-actions[bot]
9a24552732
New Crowdin Translations (automated) (#31440) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2024-08-16 09:11:33 +00:00
Claire
169b35869f Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream 2024-08-14 21:17:43 +02:00