djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-23 16:44:04 -05:00
Code Issues Packages Projects Releases Wiki Activity
22,289 Commits 69 Branches 20 Tags 372 MiB
55cf5e0188
Commit Graph

2602 Commits

Author SHA1 Message Date
Claire
55cf5e0188 Merge commit 'c929b4cace3f95fe54fdafe449ea7e972c8d61e8' into glitch-soc/merge-upstream 2024-07-12 13:41:54 +02:00
renovate[bot]
fdad4dc918
fix(deps): update babel monorepo to v7.24.8 (#31002) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-12 08:23:04 +00:00
renovate[bot]
bb702e6b20
fix(deps): update dependency sass to v1.77.8 (#31005) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-12 08:18:35 +00:00
Claire
52fb4f16ef Merge commit '2ea9336b6855b44126a55106a81e96ea68eaf8ff' into glitch-soc/merge-upstream 2024-07-10 16:58:06 +02:00
renovate[bot]
c9f08f77ed
fix(deps): update dependency sass to v1.77.7 (#30981) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-10 06:55:26 +00:00
Claire
388672ff0d Merge commit '967505ee9bcacf0e5189aa06c654ff586c198a46' into glitch-soc/merge-upstream 2024-07-09 20:39:09 +02:00
renovate[bot]
ef2e48e6da
fix(deps): update dependency glob to v10.4.5 (#30972) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-09 12:53:31 +00:00
renovate[bot]
0dd4595704
fix(deps): update dependency glob to v10.4.4 (#30967) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-09 07:27:13 +00:00
Claire
6a55232988 Merge commit 'fa8e972722fb8fc056aa348dddaee4005b4a8ac4' into glitch-soc/merge-upstream 2024-07-08 19:41:14 +02:00
renovate[bot]
fd3bfc0710
fix(deps): update dependency postcss-preset-env to v9.6.0 (#30944) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-08 07:22:28 +00:00
renovate[bot]
bd285cdd02
fix(deps): update dependency glob to v10.4.3 (#30941) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-08 07:16:47 +00:00
renovate[bot]
5c3ec727ec
chore(deps): update dependency typescript to v5.5.3 (#30953) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-08 07:11:29 +00:00
renovate[bot]
c5883e0999
chore(deps): update dependency @testing-library/dom to v10.3.1 (#30954) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-08 07:11:15 +00:00
Claire
11dd51ef44 Merge commit '63ba69810eca80fc2d10114a79f2988c1b75892f' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream and glitch-soc had different comments, some comments got updated upstream.
  Updated them in glitch-soc accordingly.
 2024-07-06 21:02:42 +02:00
renovate[bot]
a16c2c99b5
fix(deps): update dependency cssnano to v7.0.4 (#30927) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-05 09:51:55 +00:00
Claire
e61a7794f8 Merge commit 'df9e26158d9787859b24bdc276af478abf05e1af' into glitch-soc/merge-upstream 
Conflicts:
- `lib/sanitize_ext/sanitize_config.rb`:
  Conflict because glitch-soc has a different list of allowed tags.
  Added upstream's new allowed tags while keeping ours.
- `spec/requests/api/v1/timelines/public_spec.rb`:
  Conflict because of glitch-soc's default settings.
  Updated accordingly.
 2024-07-04 17:12:14 +02:00
renovate[bot]
b730147618
fix(deps): update dependency ws to v8.18.0 (#30914) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-04 13:46:14 +00:00
renovate[bot]
528661a091
fix(deps): update dependency pino-http to v10.2.0 (#30913) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-04 13:46:08 +00:00
Claire
70ff7a7c69 Merge commit '9be77fc0dbb01c1a8a54cd3da97e16c7941df367' into glitch-soc/merge-upstream 2024-07-03 22:10:41 +02:00
renovate[bot]
f99159d1eb
fix(deps): update dependency webpack-merge to v6 (#30891) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-03 08:46:51 +00:00
Claire
d270165be3 Merge commit 'aeefe5b2bea6e0fb511f029c2aacdefa7bd41eb8' into glitch-soc/merge-upstream 2024-07-01 12:05:39 +02:00
renovate[bot]
aeefe5b2be
chore(deps): update eslint (non-major) (#30883) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 09:03:38 +00:00
renovate[bot]
ed15ae075c
fix(deps): update dependency @reduxjs/toolkit to v2.2.6 (#30875) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 08:27:03 +00:00
renovate[bot]
3c1e1685c7
fix(deps): update dependency postcss to v8.4.39 (#30877) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 08:21:55 +00:00
renovate[bot]
9c7d56db9a
fix(deps): update dependency postcss-preset-env to v9.5.15 (#30878) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 08:21:40 +00:00
renovate[bot]
8142c7aa3e
chore(deps): update definitelytyped types (non-major) (#30882) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-01 08:21:15 +00:00
Claire
d2aea85e6c Merge commit '5d4dbbcc67c98007d417cbe67b5a2261889304dc' into glitch-soc/merge-upstream 2024-06-30 11:25:40 +02:00
renovate[bot]
1bccba1408
chore(deps): update dependency @testing-library/react to v16 (#30533) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-06-28 11:39:32 +00:00
renovate[bot]
03bbb74b0c
fix(deps): update dependency prom-client to v15.1.3 (#30852) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-27 16:27:32 +00:00
renovate[bot]
07d222665b
chore(deps): update dependency typescript to v5.5.2 (#30815) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-25 17:25:11 +00:00
Claire
21ca03581a Merge commit '6527d5039141fe4a80645147b581d76952a64f39' into glitch-soc/merge-upstream 2024-06-24 19:39:42 +02:00
renovate[bot]
3f81e7dcc8
chore(deps): update dependency @types/http-link-header to v1.0.6 (#30814) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-24 10:16:24 +00:00
Claire
3b4607991d Merge commit '4743657ba24e83c376e9f477fbf49114e6f09a57' into glitch-soc/merge-upstream 2024-06-22 20:59:23 +02:00
renovate[bot]
93741f6a70
fix(deps): update dependency glob to v10.4.2 (#30761) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-21 16:15:33 +00:00
renovate[bot]
5b938e6e20
chore(deps): update dependency @types/uuid to v10 (#30787) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-21 11:37:15 +00:00
Claire
52e34a6bd6 Merge commit '5f4d231e980665c0946297909df508269fb25dc6' into glitch-soc/merge-upstream 2024-06-19 11:59:06 +02:00
renovate[bot]
49b323c13d
fix(deps): update dependency cssnano to v7.0.3 (#30764) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-19 09:31:56 +00:00
Claire
b0c979af49 Merge commit '58ace2e45e16a69977267d03874568c11043f04c' into glitch-soc/merge-upstream 2024-06-18 18:20:36 +02:00
renovate[bot]
81f95cf08e
fix(deps): update dependency sass to v1.77.6 (#30745) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-18 12:20:43 +00:00
Claire
395b9011ee Merge commit 'd5f02adad716520b6b9014553bc730dcef5b2f50' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Not a real conflict, just upstream adding a method textually adjacent to
  glitch-soc only code.
  Ported upstream's change.
 2024-06-17 18:30:28 +02:00
Claire
677f73f793 Merge commit '3a191b3797dde1daf79cd748a14b87240532d543' into glitch-soc/merge-upstream 2024-06-17 13:41:58 +02:00
renovate[bot]
c739b7f851
fix(deps): update dependency ws to v8.17.1 (#30733) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-17 09:13:07 +00:00
renovate[bot]
04d6cde393
chore(deps): update devdependencies (non-major) (#30735) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-17 09:13:07 +00:00
renovate[bot]
0a7249c7c6
fix(deps): update dependency pino to v9.2.0 (#30659) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-12 12:41:14 +00:00
renovate[bot]
dff48ff705
fix(deps): update dependency sass to v1.77.5 (#30665) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-12 11:04:54 +00:00
Claire
be68f8f4af Merge commit '9cc4040308a758d4b77961f4da79cf63a044fffe' into glitch-soc/merge-upstream 2024-06-10 18:20:08 +02:00
renovate[bot]
a6e0e167a7
fix(deps): update dependency uuid to v10 (#30624) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-10 14:29:11 +00:00
renovate[bot]
dd4a976122
chore(deps): update devdependencies (non-major) (#30628) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-10 14:08:02 +00:00
renovate[bot]
452872412d
chore(deps): update dependency @types/lodash to v4.17.5 (#30627) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-06-10 14:07:35 +00:00
Claire
30b00ca2b5 Merge commit '5652ca613582df03e5b838626078981414f3b897' into glitch-soc/merge-upstream 2024-06-06 12:27:26 +02:00