sd/chuckya-fe-standalone
2
0
Fork 0
Code Pull requests Activity
19,766 commits 2 branches 0 tags 263 MiB
Commit graph

3,402 commits

Author SHA1 Message Date
Essem
4e8a66b240
 		Merge remote-tracking branch 'upstream/main' 2023-09-19 10:15:12 -05:00
Claire
f546b0c999 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-19 17:07:29 +02:00
Essem
1007c16320
 		Merge remote-tracking branch 'upstream/main' 2023-09-19 10:05:45 -05:00
github-actions[bot]
73ecc4de6e
 		New Crowdin Translations (automated) (#26978) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 16:26:51 +02:00
Claire
22ee4e057d Merge commit 'a83615edc9' 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
1e87575b70 Merge commit '6eb6209d02' into glitch-soc/merge-upstream 2023-09-19 12:53:32 +02:00
Claire
70cae19b6b
 		Fix hashtag bar being sometimes incorrectly hidden (#26960) 2023-09-19 12:25:39 +02:00
github-actions[bot]
67eaaa4b90
 		New Crowdin Translations (automated) (#26966) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-19 10:41:48 +02:00
github-actions[bot]
1b4902fabf
 		New Crowdin Translations (automated) (#26913) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-18 13:46:07 +02:00
Claire
9688c5fcc4 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-18 12:09:37 +02:00
Claire
4c1518a6f3
 		Fix Web UI making duplicate search queries when scrolling (#26959) 2023-09-18 11:20:09 +02:00
Claire
893755f4cb
 		Fix error in Web UI when server rules cannot be fetched (#26957) 2023-09-18 09:51:52 +02:00
Essem
81c06b286f
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-09-16 11:27:11 -05:00
Claire
dfc05ec8df Merge commit '6273416292' 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
5ed72f668f Merge commit 'b90383d073' into glitch-soc/merge-upstream 2023-09-15 21:39:21 +02:00
Claire
e193c848fe Merge commit '97e4011c3c' 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
08b495d95c Merge commit 'b1d8907138' into glitch-soc/merge-upstream 2023-09-15 21:06:45 +02:00
Claire
5d8c65f2a7 Merge commit '398635c0c4' into glitch-soc/merge-upstream 2023-09-15 20:57:40 +02:00
Claire
3ca94f6d4a Merge commit '93d051e47d' into glitch-soc/merge-upstream 2023-09-15 20:21:40 +02:00
Claire
e14372c2d1 Merge commit '548c032dbb' into glitch-soc/merge-upstream 2023-09-15 20:08:09 +02:00
Claire
2a4fcc51fd
 		Fix dismiss button overlapping with text in dismissable banners (#26935) 2023-09-15 19:53:28 +02:00
github-actions[bot]
921c6fe654
 		New Crowdin Translations (automated) (#26498) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-09-13 15:10:41 +02:00
Claire
520b570474
 		Fix notification permissions being requested immediately after login (#26472) 2023-09-12 18:27:01 +02:00
Claire
287520453c
 		Fix front-end bug when processing relationship-related account actions (#26902) 2023-09-12 16:30:03 +02:00
Renaud Chaput
0712cc2b99
 		Fix Redux types (#26899) 2023-09-12 12:18:19 +02:00
Renaud Chaput
bd06c13204
 		Convert actions/account_notes into Typescript (#26601) 2023-09-11 16:09:22 +02:00
Claire
91040da871
 		Fix confusing behavior of mute button and volume slider in web UI (#26860) 2023-09-08 20:39:29 +02:00
Eugen Rochko
9b2bc3d1de
 		Add recent searches in web UI (#26834) 2023-09-07 14:56:19 +02:00
Eugen Rochko
f3a2e15f8e
 		Fix mute button and volume slider feeling disconnected in web UI (#26827) 2023-09-07 04:24:24 +02:00
Claire
9c1ef8302a
 		Add some information about Full-text search being disabled in search popout (#26756) 2023-09-06 17:23:58 +02:00
Eugen Rochko
d8bdba2f9f
 		Add in: to search popout in web UI (#26807) 2023-09-06 06:46:26 +02:00
Eugen Rochko
9d290c23d2
 		Remove obfuscation of reply count in web UI (#26768) 2023-09-05 23:57:03 +02:00
Eugen Rochko
5d20733d8d
 		Add infinite scrolling for search results in web UI (#26784) 2023-09-05 23:54:24 +02:00
Claire
548c032dbb
 		Improve interaction modal error handling (#26795) 2023-09-05 23:49:48 +02:00
Essem
b871816f0e
 		Merge remote-tracking branch 'upstream/main' 2023-09-04 19:00:18 -05:00
Claire
c107512fa6 Merge commit '05093266e6' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Claire
ac2dae0d11 Merge commit '6c4c72497a' 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
ffb486648c Merge commit 'cb9f96036c' into glitch-soc/merge-upstream 2023-09-02 13:34:54 +02:00
Claire
fbbe9f1c12 Merge commit 'a7d96e6aff' into glitch-soc/merge-upstream 2023-09-02 12:20:33 +02:00
Claire
c8aa3d6d06 Merge commit 'dd72a8d28b' into glitch-soc/merge-upstream 2023-09-02 12:02:23 +02:00
Claire
3c7dbf3a16 Merge commit '5694e24bbf' 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
6b7c47311d Merge commit '072112867b' into glitch-soc/merge-upstream 2023-09-02 11:41:40 +02:00
Claire
16681e0f20
 		Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
Claire
6c4c72497a
 		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
40b69cc1cd
 		Add an explanation banner on switching to single column mode (#26019) 2023-08-31 12:18:46 +02:00
Tim Rogers
74eb7dbf2d
 		Fix bug with reblogged view on Toots only showing latest reblogging accounts (#26574) 2023-08-29 14:42:20 +02:00
Tim Rogers
ae6cf33321
 		Fix bug with favourited view on Toots only showing latest favouriting accounts (#26577) 2023-08-29 10:56:19 +02:00
Eugen Rochko
10b06436d1
 		Fix colors and typography on hashtag bar in web UI (#26666) 2023-08-28 19:49:38 +02:00
Eugen Rochko
bceb893159
 		Add search options to search popout in web UI (#26662) 2023-08-28 13:18:39 +02:00
renovate[bot]
9d9de8d219
 		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