mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-23 15:48:07 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
19541 commits 5 branches 147 tags 265 MiB
Commit graph

2194 commits

Author SHA1 Message Date
Claire
ba527c071f Merge commit '134de736dcbc6aa613fd5aec21d983d92d8b0be8' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.
 2023-10-25 12:14:24 +02:00
Claire
4b0fb764c3 Merge commit 'e93a75f1a11d6dfdcbd39dbdc22526c5508ad881' into glitch-soc/merge-upstream 
Conflicts and ported changes:
- updated `@rails/ujs` imports
 2023-10-24 19:59:19 +02:00
Eugen Rochko
134de736dc
Change icons in web UI (#27385) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-10-24 17:45:08 +00:00
Claire
79c154f602 Merge commit 'fc7734df8d8d53639bf244a2f2f3c39bc2fd12a7' into glitch-soc/merge-upstream 2023-10-24 19:20:14 +02:00
Claire
787d5ad386 Merge commit 'bcae7442757845191c0e82b61cd1d0cd3ca860d1' into glitch-soc/merge-upstream 
Conflicts:
- `yarn.lock`:
  Caused by a glitch-soc-only dependency (`exif-js`).
  Kept it.
 2023-10-24 19:05:18 +02:00
Matt Jankowski
e93a75f1a1
Rails 7.1 update (#25963) 2023-10-23 17:58:29 +00:00
renovate[bot]
d5408dbb54
Update dependency prom-client to v15 (#27330) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 14:33:17 +02:00
renovate[bot]
53fd28b889
Update dependency react-select to v5.7.7 (#27003) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:45:14 +02:00
renovate[bot]
f7b34707a8
Update babel monorepo to v7.23.2 (#27118) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:36:47 +02:00
renovate[bot]
25751c653e
Update DefinitelyTyped types (non-major) (#27414) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:35:54 +02:00
renovate[bot]
132204031f
Update dependency core-js to v3.33.1 (#27481) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:20:01 +02:00
renovate[bot]
bb5bae186f
Update dependency webpack-merge to v5.10.0 (#27420) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:18:16 +02:00
renovate[bot]
69d3318055
Update dependency rimraf to v5.0.5 (#27140) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:16:02 +02:00
renovate[bot]
cd08b436ab
Update dependency sass to v1.69.4 (#27004) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:15:31 +02:00
renovate[bot]
6f1eb89d21
Update dependency ws to v8.14.2 (#26980) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:14:16 +02:00
renovate[bot]
6f429d3f1b
Update formatjs monorepo (#27416) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:13:12 +02:00
renovate[bot]
773133befa
Update eslint (non-major) (#27415) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-23 12:12:17 +02:00
Claire
245513d630 Merge commit '1b70d7ed7c0fd3a9fcf028bf76b8c62ac8b3897f' into glitch-soc/merge-upstream 2023-10-21 14:33:33 +02:00
Renaud Chaput
1b70d7ed7c
Upgrade to react-router v5 (#25047) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 19:44:55 +02:00
Claire
b867d4581e Merge commit 'c91c0175db1cc8b954a977d29472886234ce9586' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.

Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`.
 2023-10-17 21:35:07 +02:00
renovate[bot]
a00fc83701
Update dependency bufferutil to v4.0.8 (#27412) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-16 11:09:20 +02:00
Claire
3da7afdeed Merge commit 'c310374a2f83a890520ace50e41c1e3d046e15e1' into glitch-soc/merge-upstream 2023-10-09 21:10:47 +02:00
renovate[bot]
5fc5a548b4
Update DefinitelyTyped types (non-major) (#27327) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-09 10:19:13 +02:00
renovate[bot]
eabe839744
Update eslint (non-major) (#27328) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-09 09:43:42 +02:00
Claire
53f5b27bd1 Merge commit '640421f661ee4d7e76a2aab607e7b15687940b6f' into glitch-soc/merge-upstream 2023-10-08 17:30:48 +02:00
Claire
e9a181c52c Merge commit 'e95d25e1013b6328457b81bd98e8d6a841d45ec2' into glitch-soc/merge-upstream 2023-10-08 16:53:05 +02:00
Claire
702d162998 Merge commit '5393be7a21331c8615ffb79c2271db92f6959458' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/auth/registrations_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
- `app/controllers/auth/sessions_controller.rb`:
  Not a real conflict. Upstream removed the `set_instance_presenter` private
  method from this class, and glitch-soc has an extra private method right
  besides it for the theming system.
  Removed `set_instance_presenter` as upstream did.
 2023-10-08 16:48:19 +02:00
Claire
19ebf7797e Merge commit 'e6b903b21e0682c1156ffec583ac2836fda7d657' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00
renovate[bot]
d22515861e
Update dependency @reduxjs/toolkit to v1.9.7 (#27275) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-05 10:28:47 +02:00
renovate[bot]
5f2d494f0d
Update dependency react-redux to v8.1.3 (#27229) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-02 13:18:29 +02:00
renovate[bot]
bad1629dcd
Update dependency core-js to v3.33.0 (#27237) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-02 13:18:06 +02:00
renovate[bot]
73a92f9e7a
Update DefinitelyTyped types (non-major) (#27239) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-10-02 13:17:55 +02:00
renovate[bot]
5393be7a21
Update eslint (non-major) to v6.7.3 (#27213) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-29 15:51:27 +02:00
renovate[bot]
9b785877d2
Update DefinitelyTyped types (non-major) (#27212) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-29 15:34:32 +02:00
renovate[bot]
665093a7b6
Update dependency postcss to v8.4.31 (#27199) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-29 09:50:33 +02:00
renovate[bot]
66a7bc215c
Update dependency glob to v10.3.10 (#27169) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-28 10:30:19 +02:00
renovate[bot]
0f588a4a86
Update dependency axios to v1.5.1 (#27159) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-28 10:17:08 +02:00
renovate[bot]
2979a5924b
Update dependency @material-design-icons/svg to v0.14.13 (#27181) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-28 10:14:43 +02:00
Claire
abdb58840a Merge commit '57f592fed50747f3c97718a2761e17bafe6c8698' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
renovate[bot]
2054ee7cd5
Update dependency glob to v10.3.9 (#27148) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-26 11:12:21 +02:00
renovate[bot]
33a066a952
Update dependency glob to v10.3.8 (#27145) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-26 10:47:04 +02:00
renovate[bot]
aeeddb9d46
Update DefinitelyTyped types (non-major) (#27109) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-25 11:56:21 +02:00
renovate[bot]
82c44f492d
Update dependency glob to v10.3.7 (#27078) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-25 11:03:19 +02:00
renovate[bot]
c56d7d702f
Update dependency @reduxjs/toolkit to v1.9.6 (#27110) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-25 10:36:46 +02:00
renovate[bot]
1fa40cff70
Update eslint (non-major) (#27113) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-25 10:09:51 +02:00
Claire
f05985f8ec Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream changed their README, we have a completely different one.
  Kept our version.
 2023-09-21 15:12:00 +02:00
renovate[bot]
c74670b4d3
Update dependency glob to v10.3.5 (#27002) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-21 11:06:16 +02:00
renovate[bot]
4ed9d9ca6f
Update dependency autoprefixer to v10.4.16 (#27000) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-21 11:00:15 +02:00
Claire
22ee4e057d Merge commit 'a83615edc9fc1ce3363ddcf1fc676806421a5f65' into glitch-soc/merge-upstream 
Conflicts:
- `streaming/index.js`:
  Upstream has added a parameter to `streamFrom`, while glitch-soc had an
  extra parameter.
  Ported upstream changes.
 2023-09-19 12:59:23 +02:00
Claire
1e87575b70 Merge commit '6eb6209d02514c5271238a23601be643c7b9f52d' into glitch-soc/merge-upstream 2023-09-19 12:53:32 +02:00