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

2741 commits

Author SHA1 Message Date
Claire
8103e69b17 Merge commit '77cd16f4ee7ab807df6fffb1538a6659a8182a9e' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/styles/mastodon/components.scss`:
  Conflict caused by glitch-soc changing the path to images, and upstream
  removing styling using such an image.
  Removed the styling as upstream did.
- `app/models/account.rb`:
  Conflict due to upstream changing lines adjacent to a change made in glitch-soc
  to have configurable limits.
  Ported upstream's changes.
- `yarn.lock`:
  Dependencies adjacent to glitch-soc-only dependencies updated.
  Updated them as well.
 2024-10-26 13:38:07 +02:00
renovate[bot]
3aa38841bd
Update formatjs monorepo (#32651) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-25 09:36:14 +00:00
renovate[bot]
aa29e42cf8
Update babel monorepo to v7.25.9 (#32628) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-25 09:17:41 +00:00
renovate[bot]
60b0ad0771
Update dependency postcss-preset-env to v10.0.8 (#32647) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-25 09:17:22 +00:00
renovate[bot]
097942a291
Update dependency pg to v8.13.1 (#32650) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-25 09:15:22 +00:00
renovate[bot]
f8a66e9915
Update formatjs monorepo (#32612) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-22 08:36:32 +00:00
renovate[bot]
bb05325306
Update dependency eslint-plugin-formatjs to v5 (#32087) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 08:37:51 +00:00
renovate[bot]
699f75bb35
Update dependency eslint-plugin-react-hooks to v5 (#32425) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 08:23:46 +00:00
renovate[bot]
bd850d1ec0
Update dependency @reduxjs/toolkit to v2.3.0 (#32497) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 08:22:07 +00:00
renovate[bot]
e05f9fed33
Update dependency pino to v9.5.0 (#32511) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 08:04:30 +00:00
renovate[bot]
11a63b2db6
Update eslint (non-major) (#32279) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-10-21 08:03:44 +00:00
renovate[bot]
35da47c857
Update devDependencies (non-major) (#32603) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 07:28:35 +00:00
renovate[bot]
a19a120769
Update DefinitelyTyped types (non-major) (#32278) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-21 07:27:27 +00:00
Claire
6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
 2024-10-19 19:13:32 +02:00
Matt Jankowski
a0c7b317a7
Update rails to version 7.1.4.1 (#32542) 2024-10-16 12:52:06 +00:00
renovate[bot]
92c8860451
Update babel monorepo to v7.25.8 (#32391) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-15 13:58:33 +00:00
renovate[bot]
c772b41c36
Update dependency react-textarea-autosize to v8.5.4 (#32401) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-15 13:38:48 +00:00
renovate[bot]
c19397b94a
Update formatjs monorepo (#32304) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-15 13:38:02 +00:00
Claire
4d9b4ef72f Merge commit '7c10b0fb7a078661558fef86399d86831423260c' into glitch-soc/merge-upstream 2024-10-14 19:46:52 +02:00
renovate[bot]
555fb98cbb
Update dependency typescript to v5.6.3 (#32456) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-14 08:28:15 +00:00
renovate[bot]
05bc82e1ab
Update dependency use-debounce to v10.0.4 (#32452) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-14 08:24:10 +00:00
renovate[bot]
e9eac64896
Update devDependencies (non-major) (#32457) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-14 08:23:20 +00:00
renovate[bot]
de422a37e8
Update dependency fuzzysort to v3.1.0 (#32460) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-14 08:22:46 +00:00
renovate[bot]
9350cd31d7
Update dependency postcss-preset-env to v10.0.7 (#32389) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-10 13:21:48 +00:00
renovate[bot]
6d6565eee7
Update dependency express to v4.21.1 (#32336) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-09 14:24:24 +00:00
renovate[bot]
c60d4ecc82
Update dependency @reduxjs/toolkit to v2.2.8 (#32296) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-08 07:38:43 +00:00
Claire
7e06d724c9 Merge commit '4238da6ee3c93dfd5752e9133cbec958f8ebb18a' into glitch-soc/merge-upstream 2024-10-07 20:45:07 +02:00
renovate[bot]
0ce2db4f7d
Update dependency postcss-preset-env to v10.0.6 (#32260) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-07 07:07:07 +00:00
Claire
b28ce2424c Merge commit 'c40ab43dc703be988c277d4ba6b7987a3a80e16c' into glitch-soc/merge-upstream 
Conflicts:
- `app/helpers/application_helper.rb`:
  Upstream added a helper where glitch-soc had its own, not really
  a conflict.
  Added upstream's helper.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream renamed a constant that was used slightly differently in glitch-soc.
  Renamed it as upstream did.
 2024-10-06 16:07:58 +02:00
renovate[bot]
1db91ab8d9
Update dependency typescript to v5.6.2 (#32165) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-03 09:34:04 +00:00
renovate[bot]
d96351a87d
Update babel monorepo to v7.25.7 (#32225) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-03 09:05:11 +00:00
renovate[bot]
8ae381fd04
Update dependency postcss-preset-env to v10.0.5 (#32019) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-10-01 10:04:12 +00:00
Claire
9af9ef6fb3 Merge commit '03210085b7481568cc507f088144aaf1dae73c88' into glitch-soc/merge-upstream 2024-09-30 13:04:19 +02:00
renovate[bot]
431b382563
Update dependency sass to v1.79.4 (#32139) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-30 08:55:18 +00:00
renovate[bot]
bf7cfba48e
Update DefinitelyTyped types (non-major) (#32163) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-30 08:53:52 +00:00
Claire
7ef25ae53b Merge commit '9d664f87a04b6a5157ddbe60ee33b5b7a960198e' into glitch-soc/merge-upstream 2024-09-29 11:06:09 +02:00
Eugen Rochko
11a12e56b3
Change media reordering design in the compose form in web UI (#32093) 2024-09-27 15:09:39 +00:00
Claire
c2c3a66478 Merge commit '5dfdec645313e556413147597138a8008bc35996' into glitch-soc/merge-upstream 2024-09-23 20:24:18 +02:00
renovate[bot]
958f01e722
Update dependency sass to v1.79.3 (#32009) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:41:05 +00:00
renovate[bot]
c37f9c0d44
Update dependency jsdom to v25.0.1 (#32017) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:36:57 +00:00
renovate[bot]
84d04386dd
Update DefinitelyTyped types (non-major) (#32026) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:35:37 +00:00
renovate[bot]
efc0d4d526
Update dependency react-intl to v6.7.0 (#32028) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-23 08:35:11 +00:00
Claire
221bba1897 Merge commit '7ed9c590b98610f8d68deab9ef8df260eec6d8f0' into glitch-soc/merge-upstream 2024-09-21 15:06:06 +02:00
renovate[bot]
840fd69730
Update dependency sass to v1.79.2 (#31992) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-20 08:20:27 +00:00
renovate[bot]
09459ed000
Update dependency react-select to v5.8.1 (#31982) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-20 08:15:14 +00:00
renovate[bot]
42f9f507b6
Update dependency pg to v8.13.0 (#31949) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-18 13:29:21 +00:00
renovate[bot]
2d399f5d4a
Update dependency pg-connection-string to v2.7.0 (#31950) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-18 09:17:57 +00:00
renovate[bot]
a791274824
Update dependency sass to v1.79.1 (#31958) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-18 08:28:42 +00:00
renovate[bot]
f3f06dafe3
Update dependency babel-loader to v8.4.1 (#31931) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-09-18 08:05:06 +00: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