mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-12 05:53:14 -08:00
Code Issues Projects Releases Packages Wiki Activity
20,340 commits 2 branches 0 tags 263 MiB
Commit graph

1,731 commits

Author SHA1 Message Date
Essem
bbf2dbaf56
 		Merge remote-tracking branch 'upstream/main' 2023-12-17 19:48:56 -06:00
Claire
ddf3ad9541 Merge commit '3bf896c973' into glitch-soc/main 
Conflicts:
- `package.json`:
  Upstream removed a dependency textually close to a glitch-only dependency.
  Updated as upstream while keeping our dependency.
 2023-12-17 17:43:30 +01:00
Essem
dfe6628e4b
 		Add new emojis from jdecked/twemoji 15.0 2023-12-16 16:25:22 -06:00
Essem
00dae881c5
 		Merge remote-tracking branch 'upstream/main' 2023-12-12 20:30:34 -06:00
Claire
9f92b05bd2 Merge commit '2e6bf60f15' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated their README but we have a completely different one.
  Kept our version of `README.md`
 2023-12-10 18:05:02 +01:00
Jeong Arm
7ed31b511a
 		Fix open status on media modal (#27867) 2023-11-16 19:10:31 -06:00
Essem
1483b2b13d
 		More cleanup 2023-11-05 22:29:44 -06:00
Renaud Chaput
3bf2a7296e
 		Use Immutable Record for accounts in Redux state (#26559) 2023-11-03 15:00:03 +00:00
mogaminsk
ac8e4ed38d
 		Fix inserting emojis from emoji picker fails with TypeError (#27647) 2023-11-01 07:22:02 +00:00
Claire
9c8891b39a
 		Rewrite AutosuggestTextarea as Functional Component (#27618) 2023-10-31 10:17:37 +00:00
Essem
0868c11651
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-30 14:42:53 -05:00
SouthFox
08bdd5751e
 		Fix account click on detailed status (#27587) 2023-10-27 14:03:21 +00:00
Renaud Chaput
13d310e64d
 		Simplify column headers (#27557) 2023-10-27 13:21:07 +00:00
Eugen Rochko
fa7e64df1d
 		Fix various icon styles in web UI (#27579) 2023-10-26 23:37:58 +00:00
Simon Rapilly
2d8f759a34
 		Add HTML lang attribute to preview card descriptions (#27503) 2023-10-26 20:34:15 +00:00
Renaud Chaput
537442853f
 		Use a context to propagate column-related Props, and remove forceUpdate usage (#27548) 2023-10-26 11:00:10 +00:00
Claire
62620956d5 Merge commit '9a3d047f3e' into glitch-soc/merge-upstream 2023-10-25 19:59:17 +02:00
Renaud Chaput
a4e6fe36cb
 		Add missing ban icons (#27555) 2023-10-25 12:47:37 +00:00
Claire
6e9f89e5b6 Merge commit 'c85e0a6b04' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc
- `app/javascript/packs/public.jsx`:
  Upstream fixed `@rails/ujs` imports.
  Already taken care of in 8a131fb7bc
 2023-10-25 12:18:45 +02:00
Claire
ba527c071f Merge commit '134de736dc' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.jsx`:
  Upstream changed how icons are handled, including on a line modified by
  glitch-soc to bump the number of poll options.
  Applied upstream's change, while keeping the increased number of poll
  options.
 2023-10-25 12:14:24 +02:00
Renaud Chaput
f08ca3f042
 		Fix missing icon props (#27539) 2023-10-24 20:43:06 +00:00
Claire
4ef66d6538 Merge commit '15182d1e5e' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  glitch-soc had extra ignores.
  Removed them.
 2023-10-24 20:31:20 +02:00
Eugen Rochko
134de736dc
 		Change icons in web UI (#27385) 
Co-authored-by: Renaud Chaput <renchap@gmail.com>
 2023-10-24 17:45:08 +00:00
Claire
e6c3d3c744 Merge commit 'd9503a1965' into glitch-soc/merge-upstream 2023-10-24 19:21:01 +02:00
Claire
b0c76eaadd Merge commit '0ad66175bf' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/compose_form.jsx`:
  Upstream changed one import, close to a glitch-soc-only import to handle
  different max character counts.
  Ported upstream's change.
 2023-10-24 18:41:20 +02:00
Essem
27c641a848
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-24 10:16:17 -05:00
たいち ひ
9482810703
 		Rewrite emoji_unicode_mapping_light to TS (#25444) 
Co-authored-by: taichi.fukuda ひ <taichi.fukuda@systemi.co.jp>
 2023-10-24 08:06:14 +00:00
Eugen Rochko
d9503a1965
 		Fix explore page reloading when you navigate back to it in web UI (#27489) 2023-10-23 17:07:13 +02:00
Renaud Chaput
9d45a444f9
 		Convert <Button> to Typescript (#27492) 2023-10-23 09:43:00 +02:00
Claire
245513d630 Merge commit '1b70d7ed7c' into glitch-soc/merge-upstream 2023-10-21 14:33:33 +02:00
Essem
c10194fc82
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-20 11:48:03 -05:00
Eugen Rochko
33bd8eccd5
 		Fix missing background behind dismissable banner in web UI (#27479) 2023-10-20 04:08:13 +02:00
Claire
cc000c8859 Merge commit '126cd7705d' into glitch-soc/merge-upstream 2023-10-19 20:48:22 +02:00
Renaud Chaput
1b70d7ed7c
 		Upgrade to react-router v5 (#25047) 
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-10-19 19:44:55 +02:00
Renaud Chaput
126cd7705d
 		Do not display the navigation banner in the logo container (#27476) 2023-10-19 19:36:08 +02:00
Claire
74fd46d3ab Merge commit '9f218c9924' into glitch-soc/merge-upstream 2023-10-19 19:14:04 +02:00
Brian Campbell
f76e5111f0
 		Consider shown and pending status in explore prompt calculation (#27466) 
Co-authored-by: Brian Campbell <brcampbell@beta.team>
 2023-10-19 14:25:57 +02:00
Renaud Chaput
10df97c542
 		The class props should be className (#27462) 2023-10-19 13:22:44 +02:00
Claire
63179f0bf4 Merge commit '5ef26d8fd5' into glitch-soc/merge-upstream 2023-10-17 21:59:58 +02:00
Claire
c10a667ac2 Merge commit '935d54124e' into glitch-soc/merge-upstream 2023-10-17 21:42:49 +02:00
Jeong Arm
ad44d832b8
 		Support "in:public" search filter (#26976) 2023-10-17 16:12:03 +02:00
Stanislas Signoud
935d54124e
 		Fix missing redirections to make sure /home redirect to the advanced UI (#27378) 2023-10-17 14:59:07 +02:00
Essem
9990da927b
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-12 13:42:12 -05:00
Essem
84ea1a19fa
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-11 11:07:33 -05:00
Claire
3735e6f79d Merge commit '27e84c0691' into glitch-soc/merge-upstream 2023-10-10 19:53:41 +02:00
Essem
29f2a7d9f4
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-10 12:24:32 -05:00
Claire
9d1c3d0678
 		Fix scroll position in thread view reseting when closing a modal (#27350) 2023-10-10 11:35:32 +02:00
Claire
8ef1a95b1c Merge commit '4c2aca777f' into glitch-soc/merge-upstream 2023-10-09 21:14:57 +02:00
Claire
4a9cdfb928 Merge commit '774e1189d2' into glitch-soc/merge-upstream 2023-10-09 21:12:28 +02:00
Claire
3da7afdeed Merge commit 'c310374a2f' into glitch-soc/merge-upstream 2023-10-09 21:10:47 +02:00