namekuji/chuckya
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
20342 commits 8 branches 15 tags 274 MiB
Commit graph

20342 commits

This branch
This branch
All branches
Author SHA1 Message Date
Claire
77caba3789 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-05 20:34:17 +02:00
Claire
ea7de25de0
Fix video player not being displayed in reports interface (#26801) 2023-09-05 20:05:58 +02:00
Michael Stanclift
b749de766f
Migrate Dockerfile to Bookworm (#26802) 2023-09-05 18:19:59 +02:00
Claire
cab4cbfa5c
Fix “Scoped order is ignored, it's forced to be batch order.” warnings (#26793) 2023-09-05 15:37:23 +02:00
Claire
e80b36d8d4
Merge pull request #2396 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-09-05 10:05:52 +02:00
Claire
87b5f84625 Merge commit 'f80f426c57d5a5e1d289372ef7c323741d27c768' into glitch-soc/merge-upstream 2023-09-05 08:14:52 +02:00
Essem
c57f803db7
Merge remote-tracking branch 'claire/glitch-soc/port-upstream-hashtags' 2023-09-04 19:10:42 -05:00
Essem
b871816f0e
Merge remote-tracking branch 'upstream/main' 2023-09-04 19:00:18 -05:00
Claire
f80f426c57
Bump version to v4.2.0-beta3 (#26753) 2023-09-04 21:20:20 +02:00
Stanislas Signoud
d6f5c27fa9 [Glitch] Fix light mode colors for advanced interface banner 
Port a106c46478 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-04 18:31:00 +02:00
Claire
e66f961e05 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-04 18:27:46 +02:00
renovate[bot]
ddeca3b37b
Update babel monorepo to v7.22.15 (#26790) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 17:56:47 +02:00
Claire
cddef4c485
Fix language settings for users having selected the kmr language (#26787) 2023-09-04 17:56:31 +02:00
Eugen Rochko
ece1ff77d6
Add in:library syntax to search (#26760) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-04 17:20:35 +02:00
gunchleoc
ac3f310f4b
Remove kmr from language selection (#26014) 2023-09-04 13:21:43 +02:00
renovate[bot]
3e6a6439b5
Update dependency stylelint-config-standard-scss to v11 (#26780) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 11:02:36 +02:00
renovate[bot]
59361dfde2
Update dependency rubocop to v1.56.2 (#26568) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 11:00:55 +02:00
Eugen Rochko
68b4e36c82
Fix #hashtag matching non-hashtagged posts in search (#26781) 2023-09-04 10:18:45 +02:00
Stanislas Signoud
a106c46478
Fix light mode colors for advanced interface banner (#26759) 2023-09-04 10:14:01 +02:00
Christian Schmidt
ea31929776
Fix invalid Content-Type header for WebP images (#26773) 2023-09-04 09:46:33 +02:00
renovate[bot]
1f92436745
Update DefinitelyTyped types (non-major) (#26785) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 09:26:33 +02:00
Eugen Rochko
e52d0494ee
Fix before:, after: and during: failing when time zone not set (#26782) 2023-09-04 09:09:25 +02:00
renovate[bot]
173041f02c
Update dependency typescript to v5.2.2 (#26786) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-09-04 09:08:53 +02:00
Plastikmensch
6b0702a3b5
Add recent to search props (#2394) 
The new search popout requires the `recent` prop to be set, otherwise onboarding crashes with "recent is undefined"

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-09-03 08:46:30 +02:00
Claire
ee02b10e06
Merge pull request #2392 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes into glitch-soc
 2023-09-03 08:46:08 +02:00
Plastikmensch
abdc6ae28b
Fix onboarding modal always opening page 2 
When opening the onboarding modal in the webUI, it always opens on page 2, as `handleSwipe` is called on load with 'focus', changing `currentIndex` from 0 to 1.

Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
 2023-09-03 02:47:50 +02:00
Eugen Rochko
04220ff7e8 [Glitch] Fix colors and typography on hashtag bar in web UI 
Port 10b06436d1 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 15:34:20 +02:00
Claire
5c7df20c13 [Glitch] Add admin notifications for new Mastodon versions 
Port front-end changes from 16681e0f20 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 15:20:06 +02:00
Claire
c107512fa6 Merge commit '05093266e6e3c54f9096da9cdcdafdc83703c578' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Claire
4371df7fbe [Glitch] Add authorized_fetch server setting in addition to env var 
Port SCSS changes from 9e26cd5503 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 15:01:37 +02:00
Eugen Rochko
728eb6a153
Fix wrong color on active icons with counters in web UI (#26767) 2023-09-02 14:46:26 +02:00
Claire
4ed629cd7e Merge commit 'be991f1d18006a4820c1e9ca6625bf2bd2bfedac' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
 2023-09-02 14:44:47 +02:00
Claire
4adb12ca91 Fix test failures due to different default settings in glitch-soc 2023-09-02 14:24:47 +02:00
Claire
807c0591e1 [Glitch] Fix search popout including full-text search instructions when full-text search is disabled 
Port 6c4c72497a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:56:20 +02:00
Santiago Kozak
64e661b930 [Glitch] Allow filter form in profiles directory to wrap 
Port f1d250135c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:55:53 +02:00
Stanislas Signoud
6c05ac4068 [Glitch] Add an explanation banner on switching to single column mode 
Port 40b69cc1cd to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:54:33 +02:00
Claire
ac2dae0d11 Merge commit '6c4c72497a5722870e4432ef41dd4c9ec36a8928' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-releases.yml`:
  Upstream changed comments close to a line we modified to account for
  different container image repositories.
  Updated the comments as upstream did.
 2023-09-02 13:50:16 +02:00
Claire
f5bd2014e2 [Glitch] Fix sign up steps progress layout in right-to-left locales 
Port 21ec596dab to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:42:50 +02:00
Tim Rogers
beb5fcd0dc [Glitch] Fix bug with reblogged view on Toots only showing latest reblogging accounts 
Port 74eb7dbf2d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:42:15 +02:00
Tim Rogers
871ab84854 [Glitch] Fix bug with favourited view on Toots only showing latest favouriting accounts 
Port ae6cf33321 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 13:39:02 +02:00
Claire
ffb486648c Merge commit 'cb9f96036cf78835e22aafb30b80717b5a8b7394' into glitch-soc/merge-upstream 2023-09-02 13:34:54 +02:00
Claire
afc3b12217 Merge commit '4ad1c5aa7174e5cef4ba9608a44429916a119bee' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README, we have a completely different one.
  Kept ours.
- `config/initializers/content_security_policy.rb`:
  Upstream has updated their development CSPs, while we disable CSPs in
  the development environment.
  Kept our version.
 2023-09-02 13:31:15 +02:00
Claire
6ee3e382df Merge commit '0719216368bf3a90fdb7ab27201a0607b63ea203' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Some of the removed dead code was split from this code in
  `app/javascript/core/public.js` and `app/javascript/core/settings.js`.
  Removed this dead code, and removed `app/javascript/core/public.js`
  altogether.
 2023-09-02 13:18:16 +02:00
Claire
fbbe9f1c12 Merge commit 'a7d96e6affd4a2da65f09f3f4ffa1b9350bb9a42' into glitch-soc/merge-upstream 2023-09-02 12:20:33 +02:00
Eugen Rochko
cb50d95c06 [Glitch] Add search options to search popout in web UI 
Port bceb893159 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 12:09:07 +02:00
Claire
c8aa3d6d06 Merge commit 'dd72a8d28b4479afdc19ac73cac83609d85b5f9e' into glitch-soc/merge-upstream 2023-09-02 12:02:23 +02:00
Claire
3c7dbf3a16 Merge commit '5694e24bbf9afccbbf1b44d3a405a4e2bc0ff08d' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `.github/workflows/build-push-pr.yml`:
  Upstream changed the environment variables used for defining the version
  number. This change occurs close to lines that were modified in glitch-soc
  to account for the different repositories to push to.
  Ported upstream changes.
- `lib/mastodon/version.rb`:
  Upstream changed how the version string is built from environment variables.
  Adapted the logic to account for the `+glitch` in glitch-soc.
 2023-09-02 11:56:09 +02:00
Claire
023673c0d9 [Glitch] Add data-nosnippet attribute to remote posts and local posts with noindex 
Port c3a42e1280 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-09-02 11:49:35 +02:00
Claire
670f55e83c Fix interaction between CWs and hashtag bars 2023-09-02 11:44:58 +02:00
Claire
d05e100f56 Fix hashtag bar styling 2023-09-02 11:44:58 +02:00