me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
19364 commits 2 branches 0 tags 429 MiB
Commit graph

3324 commits

Author SHA1 Message Date
Kouhai
150feaf9b7 th: Merge remote-tracking branch 'glitch/main' 2023-09-20 00:26:14 -07:00
Claire
65646a3e89 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:07:29 +02:00
github-actions[bot]
a68f361a5f New Crowdin Translations (automated) (#26978) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 16:26:51 +02:00
Claire
6b89ab368c Merge commit '4ae247954387b530b532eaa89ca017a17cbe63bd' 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
97740f900c Merge commit 'fd4f319fd20631f171b1f862b8c1f32f605b3166' into glitch-soc/merge-upstream 2023-09-19 12:53:32 +02:00
Claire
416e215991 Fix hashtag bar being sometimes incorrectly hidden (#26960) 2023-09-19 12:25:39 +02:00
github-actions[bot]
e39dfc701f New Crowdin Translations (automated) (#26966) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 10:41:48 +02:00
github-actions[bot]
654bc9974d New Crowdin Translations (automated) (#26913) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-18 13:46:07 +02:00
Claire
f0850150f9 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-18 12:09:37 +02:00
Claire
c7d113e2d2 Fix Web UI making duplicate search queries when scrolling (#26959) 2023-09-18 11:20:09 +02:00
Claire
11e4c747fc Fix error in Web UI when server rules cannot be fetched (#26957) 2023-09-18 09:51:52 +02:00
Kouhai
9d32bdbcde th: Merge remote-tracking branch 'glitch/main' 2023-09-16 20:35:31 -07:00
Claire
c31020044b Merge commit '38fe6ecd05e9349717b60452eff6e5ff4809b82b' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.
 2023-09-15 21:43:49 +02:00
Claire
8c51fac1b6 Merge commit 'e7698cb4ab17ac9eebbaef64b29f8cb9772a5478' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +02:00
Claire
3947d7a153 Merge commit 'aeae2ebc0159bc2caadfc52313545f8e69c035e7' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.
 2023-09-15 21:25:05 +02:00
Claire
296e8f791e Merge commit '1efbb6202400d84024e68975c5cedd65efe71a80' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
Claire
4127a9d9fe Merge commit 'a8d18668b2dd066e316c8bb0a712dd19911cdd59' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
Claire
5cc06f5edc Merge commit '37e5129118019dae515a876c40b25b14ac976be2' into glitch-soc/merge-upstream 2023-09-15 20:21:40 +02:00
Claire
9bb5ff5a62 Merge commit 'a8a25dcbdb63efb3191dbb3720c385209ffe4f34' into glitch-soc/merge-upstream 2023-09-15 20:08:09 +02:00
Claire
e5e9e18c96 Fix dismiss button overlapping with text in dismissable banners (#26935) 2023-09-15 19:53:28 +02:00
github-actions[bot]
f933127c7f New Crowdin Translations (automated) (#26498) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-13 15:10:41 +02:00
Claire
f5f4f40955 Fix notification permissions being requested immediately after login (#26472) 2023-09-12 18:27:01 +02:00
Claire
fdeac75e50 Fix front-end bug when processing relationship-related account actions (#26902) 2023-09-12 16:30:03 +02:00
Renaud Chaput
808c6f621b Fix Redux types (#26899) 2023-09-12 12:18:19 +02:00
Renaud Chaput
84e91ee142 Convert actions/account_notes into Typescript (#26601) 2023-09-11 16:09:22 +02:00
Claire
850eca8ab0 Fix confusing behavior of mute button and volume slider in web UI (#26860) 2023-09-08 20:39:29 +02:00
Eugen Rochko
0f8203badd Add recent searches in web UI (#26834) 2023-09-07 14:56:19 +02:00
Eugen Rochko
bb0966bf85 Fix mute button and volume slider feeling disconnected in web UI (#26827) 2023-09-07 04:24:24 +02:00
Claire
1e8b335d70 Add some information about Full-text search being disabled in search popout (#26756) 2023-09-06 17:23:58 +02:00
Eugen Rochko
3433972ed3 Add in: to search popout in web UI (#26807) 2023-09-06 06:46:26 +02:00
Eugen Rochko
2c5ba586ff Remove obfuscation of reply count in web UI (#26768) 2023-09-05 23:57:03 +02:00
Eugen Rochko
01e3a1f941 Add infinite scrolling for search results in web UI (#26784) 2023-09-05 23:54:24 +02:00
Claire
a8a25dcbdb Improve interaction modal error handling (#26795) 2023-09-05 23:49:48 +02:00
Claire
78a851ae0a Merge commit '1b7b338d0a8fd34824aed80327d62526da9c5eac' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Claire
432bd89f72 Merge commit '20913b52bb192a9525b3da53a1d25c816a4a177d' 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
d38116d584 Merge commit 'e26e4702acadc05fca8bb550f98b4186b04d335d' into glitch-soc/merge-upstream 2023-09-02 13:34:54 +02:00
Claire
1ef0758cf0 Merge commit 'f8b5f05d440796970b761dafb4bfea1784884ecf' into glitch-soc/merge-upstream 2023-09-02 12:20:33 +02:00
Claire
a9fb03b6c0 Merge commit 'e1b0d6bbe590b1d4f7bc90a528eeb20d89c499b7' into glitch-soc/merge-upstream 2023-09-02 12:02:23 +02:00
Claire
ed5d57dac3 Merge commit '4456f65da4da07b37132130d9049c6684d379085' 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
52ce0a1c1d Merge commit 'c833282412b5dec6999fa76ac74cd8ba8a0394c5' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02:00
Claire
97238e3496 Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
Claire
20913b52bb Fix search popout including full-text search instructions when full-text search is disabled (#26755) 2023-09-01 15:13:27 +02:00
Stanislas Signoud
2c0eaf50f6 Add an explanation banner on switching to single column mode (#26019) 2023-08-31 12:18:46 +02:00
Tim Rogers
378b3dcddf Fix bug with reblogged view on Toots only showing latest reblogging accounts (#26574) 2023-08-29 14:42:20 +02:00
Tim Rogers
1b52b02c1c Fix bug with favourited view on Toots only showing latest favouriting accounts (#26577) 2023-08-29 10:56:19 +02:00
Eugen Rochko
a4130c4139 Fix colors and typography on hashtag bar in web UI (#26666) 2023-08-28 19:49:38 +02:00
Eugen Rochko
9ab2c6b479 Add search options to search popout in web UI (#26662) 2023-08-28 13:18:39 +02:00
renovate[bot]
85c3155d14 Update dependency @testing-library/jest-dom to v6 (#26479) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-08-28 12:19:42 +02:00
Kouhai
7c7355a964 th: Merge remote-tracking branch 'glitch/main' (d033fab0ed) 2023-08-26 22:00:56 -07:00
Eugen Rochko
8784abbc4c Fix toast saying "published" instead of "saved" after editing post in web UI (#26664) 2023-08-25 22:03:04 +02:00