djsundog/tootlab-mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2024-11-27 18:40:12 -05:00
Code Issues Packages Projects Releases Wiki Activity
22,736 Commits 69 Branches 20 Tags 380 MiB
37f20514d3
Commit Graph

2658 Commits

Author SHA1 Message Date
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
renovate[bot]
61d9704f6d
Update babel monorepo to v7.25.4 (#31542) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-22 11:51:30 +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
Matt Jankowski
4c4bcad866
Remove font-awesome npm package (#31512) 2024-08-20 15:59:47 +00:00
renovate[bot]
6c26fb0ed6
Update dependency core-js to v3.38.1 (#31507) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-20 14:36:14 +00:00
Claire
1760f84349 Merge commit '53c183f899b5382f1eebd72e34a090c30f8eba6a' into glitch-soc/merge-upstream 2024-08-19 18:25:31 +02:00
renovate[bot]
3db3e3dae5
Update dependency postcss-preset-env to v10.0.2 (#31488) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-19 08:56:08 +00:00
renovate[bot]
9cda8c0197
Update dependency use-debounce to v10.0.3 (#31468) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-19 08:12:01 +00:00
renovate[bot]
d57ee31413
Update devDependencies (non-major) (#31489) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-19 08:10:15 +00:00
renovate[bot]
d6404714b6
Update eslint (non-major) (#31490) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-19 08:10:13 +00:00
Claire
169b35869f Merge commit 'a1ddaa9ee96ab1d05f4e37f3472b0418e0d5628e' into glitch-soc/merge-upstream 2024-08-14 21:17:43 +02:00
renovate[bot]
3cc2968344
Update dependency wicg-inert to v3.1.3 (#31423) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-14 14:55:01 +00:00
renovate[bot]
5c91610e53
Update dependency postcss-preset-env to v10.0.1 (#31422) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-14 14:23:17 +00:00
renovate[bot]
b5e799d165
Update dependency postcss to v8.4.41 (#31420) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-14 13:12:16 +00:00
renovate[bot]
8d96907933
Update dependency @types/webpack to v4.41.39 (#31379) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-14 07:35:33 +00:00
renovate[bot]
3e3450be36
Update dependency cssnano to v7.0.5 (#31413) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-14 07:33:32 +00:00
renovate[bot]
d767439205
Update dependency axios to v1.7.4 [SECURITY] (#31409) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-13 21:53:36 +00:00
Claire
31a00c0c1a Merge commit '658addcbf783f6baa922d11c9524ebb9ddbcbc59' into glitch-soc/merge-upstream 2024-08-09 17:15:32 +02:00
renovate[bot]
6e01a23e3b
Update dependency eslint-plugin-promise to v7 (#31120) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-08 19:31:00 +00:00
renovate[bot]
f045ef8e92
Update dependency eslint-plugin-jsdoc to v50 (#31330) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-08 19:30:42 +00:00
Renaud Chaput
a207a1f7dc
Disable stylelint rules that are conflicting with Prettier (#31339) 2024-08-08 19:22:16 +00:00
Claire
08adca0c63 Merge commit 'c8b9e60ec123c458efff83eedcfd07f067ef05ae' into glitch-soc/merge-upstream 2024-08-06 17:27:48 +02:00
renovate[bot]
103e544cfa
fix(deps): update dependency @reduxjs/toolkit to v2.2.7 - abandoned (#31173) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-08-06 07:54:00 +00:00
renovate[bot]
02c2222879
fix(deps): update dependency postcss-preset-env to v10 (#31279) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-05 07:13:47 +00:00
renovate[bot]
3a368933b4
fix(deps): update dependency core-js to v3.38.0 (#31290) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-05 07:11:57 +00:00
renovate[bot]
e99c0e61ea
chore(deps): update dependency @types/ws to v8.5.12 (#31293) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-05 06:29:03 +00:00
renovate[bot]
3fec1baefd
chore(deps): update devdependencies (non-major) (#31294) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-05 06:28:22 +00:00
Claire
e67e07211f Merge commit 'ad95c98054574080ac5d15584b3018d1db836531' into glitch-soc/merge-upstream 
Conflicts:
- `package.json`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
- `yarn.lock`:
  Upstream removed their direct dependency `autoprefixer`, which was textually adjacent
  to glitch-soc-only dependency `atrament`.
  Removed direct dependency on `autoprefixer`.
 2024-08-02 18:09:48 +02:00
Renaud Chaput
99c446b7cf
Change PostCSS config to allow logical properties (#31264) 2024-08-02 13:17:36 +00:00
renovate[bot]
6a27a8c3e7
fix(deps): update babel monorepo (#31167) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-02 10:01:41 +00:00
renovate[bot]
d19edc4c4a
fix(deps): update dependency axios to v1.7.3 (#31248) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-08-02 06:53:41 +00:00
Claire
654187a995 Merge commit '1229d2907a4a7ee09ee42cd24043d74561507e0a' into glitch-soc/merge-upstream 2024-07-29 19:16:58 +02:00
renovate[bot]
8edd77a755
chore(deps): update dependency typescript to v5.5.4 (#31186) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-29 09:07:22 +00:00
renovate[bot]
4cc634dc44
fix(deps): update dependency use-debounce to v10.0.2 (#31177) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-29 08:07:28 +00:00
renovate[bot]
cefd8b5484
chore(deps): update dependency husky to v9.1.3 (#31185) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-29 08:06:53 +00:00
renovate[bot]
90d6297191
chore(deps): update eslint (non-major) (#31188) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-29 08:06:12 +00:00
Claire
fb411b6d0f Merge commit 'dd5379271410219de0806bb33e7cdfa427ea6988' into glitch-soc/merge-upstream 2024-07-27 13:19:38 +02:00
renovate[bot]
c091fa7105
chore(deps): update devdependencies (non-major) (#31096) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-26 09:27:48 +00:00
renovate[bot]
ff6d2ec343
fix(deps): update dependency pino to v9.3.2 (#31148) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-25 15:38:05 +00:00
Claire
c94c5da7b4 Merge commit '4d374cf73096be1e5347e131c91c99842e3c6dbb' into glitch-soc/merge-upstream 2024-07-25 12:43:25 +02:00
renovate[bot]
8117977c88
fix(deps): update dependency postcss to v8.4.40 (#31137) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-25 07:20:55 +00:00
Claire
d999fc52ba Merge commit '06f070d86d448b97c082c038220becaec8a038ce' into glitch-soc/merge-upstream 2024-07-24 20:07:37 +02:00
renovate[bot]
06f070d86d
fix(deps): update dependency fuzzysort to v3 (#30315) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2024-07-24 08:13:09 +00:00
Claire
68000956f4 Merge commit 'cd0ca4b99473f54464e5134f91b7b1c8d5544011' into glitch-soc/merge-upstream 2024-07-23 19:31:23 +02:00
Nick Schonning
9a015a2a15
Update Prettier to 3.3.3 (#31106) 2024-07-23 06:46:09 +00:00
Claire
2aac73341a Merge commit '80d9bff6df137afc3376f47b62d10a2e3e9456e2' into glitch-soc/merge-upstream 
Conflicts:
- `app/services/backup_service.rb`:
  Conflict due to glitch-soc's local-only posts.
  Ported upstream's changes while keeping glitch-soc's feature.
 2024-07-22 17:38:30 +02:00
renovate[bot]
80d9bff6df
fix(deps): update dependency immutable to v4.3.7 (#31100) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-22 13:39:37 +00:00
renovate[bot]
6ee5d3b559
fix(deps): update dependency jsdom to v24.1.1 (#31088) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-22 07:39:56 +00:00
renovate[bot]
22d2fba279
chore(deps): update definitelytyped types (non-major) (#31095) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2024-07-22 07:39:38 +00:00
Claire
c75fe09e2b Merge commit '82344342c1c5adb3f6a4b376559db737a9e982b7' into glitch-soc/merge-upstream 2024-07-18 17:56:25 +02:00