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
renovate[bot]
41b7281b56
fix(deps): update dependency use-debounce to v10.0.1 ( #31060 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-18 15:23:43 +00:00
Renaud Chaput
f587ff643f
Grouped Notifications UI ( #30440 )
...
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
2024-07-18 14:36:09 +00:00
Claire
c546757cd1
Merge commit '66430cb25c824cfad0394216d8e7a523533bcf4b' into glitch-soc/merge-upstream
2024-07-16 17:54:36 +02:00
renovate[bot]
c27d194eb2
fix(deps): update dependency pino to v9.3.1 ( #31032 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-16 13:20:34 +00:00
Claire
64b2c712d4
Merge commit '9d0bce40724eb77b7cc3917091b62e4ab159e29e' into glitch-soc/merge-upstream
...
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because upstream refactored theme-related code, and glitch-soc has
a different theming system.
2024-07-15 18:51:38 +02:00
renovate[bot]
0b97ec3f7b
fix(deps): update dependency @babel/core to v7.24.9 ( #31029 )
...
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2024-07-15 13:03:57 +00:00
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