mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-11 21:43:15 -08:00
Code Issues Projects Releases Packages Wiki Activity
19,513 commits 2 branches 0 tags 263 MiB
Commit graph

3,386 commits

Author SHA1 Message Date
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
github-actions[bot]
c85e0a6b04
 		New Crowdin Translations (automated) (#27544) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-25 07:36:07 +00:00
Renaud Chaput
cb92cdf9af
 		Fix <ColumnBackButtonSlim> (#27540) 2023-10-24 20:43:55 +00: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
Claire
15182d1e5e
 		Fix history handling not properly handling states after update to react-router v5 (#27526) 2023-10-24 13:24:57 +00:00
github-actions[bot]
50b7ea810e
 		New Crowdin Translations (automated) (#27523) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-24 09:51:34 +00: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
Claire
0ad66175bf
 		Fix incorrect proptypes from react-router-v5 update (#27507) 2023-10-23 11:39:53 +02:00
github-actions[bot]
70fd819935
 		New Crowdin Translations (automated) (#27490) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-23 10:04:54 +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
github-actions[bot]
284c719f64
 		New Crowdin Translations (automated) (#27480) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-20 10:11:40 +02: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
github-actions[bot]
1ffd5a98a9
 		New Crowdin Translations (automated) (#27465) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-19 14:31:25 +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
github-actions[bot]
4612576c68
 		New Crowdin Translations (automated) (#27454) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-18 11:08:10 +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
Claire
b867d4581e Merge commit 'c91c0175db' into glitch-soc/merge-upstream 
Conflicts:
- `spec/controllers/api/v1/timelines/tag_controller_spec.rb`:
  Glitch-soc had a few extra lines in this file to account for a different
  default setting. This file got replaced by
  `spec/requests/api/v1/timelines/tag_spec.rb`, into which the glitch-soc
  additions were moved too.

Additional changes:
- `spec/requests/api/v1/statuses/sources_spec.rb`:
  Add glitch-soc-only attribute `content_type`.
 2023-10-17 21:35:07 +02:00
Claire
656a41db2a Merge commit '77098c6f1c' into glitch-soc/merge-upstream 
Conflicts:
- `README.md`:
  Upstream has updated its README, we have a completely different one.
  Kept ours.
- `app/views/auth/sessions/two_factor.html.haml`:
  Upstream refactored stuff and the conflict is because of glitch-soc's theming
  system.
  Ported upstream changes while accounting for the different theming system.
 2023-10-17 20:59:18 +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
github-actions[bot]
13456efd7b
 		New Crowdin Translations (automated) (#27410) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-16 11:31:52 +02:00
github-actions[bot]
773d25e8df
 		New Crowdin Translations (automated) (#27388) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-13 11:01:40 +02:00
github-actions[bot]
c348b904a5
 		New Crowdin Translations (automated) (#27376) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-12 10:07:40 +02:00
github-actions[bot]
f1ae72ba46
 		New Crowdin Translations (automated) (#27364) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-11 16:37:01 +02:00
Claire
3735e6f79d Merge commit '27e84c0691' into glitch-soc/merge-upstream 2023-10-10 19:53:41 +02:00
Claire
9d1c3d0678
 		Fix scroll position in thread view reseting when closing a modal (#27350) 2023-10-10 11:35:32 +02:00
github-actions[bot]
1a2a4c389f
 		New Crowdin Translations (automated) (#27347) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-10 10:06:37 +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
Claire
4c2aca777f
 		Fix clicking on already-loaded thread scrolling to the top of the thread (#27338) 2023-10-09 16:46:09 +02:00
Renaud Chaput
774e1189d2
 		Change eslint config to autofix missing comma and indentation in JS files (#26711) 2023-10-09 13:38:29 +02:00
Claire
c310374a2f
 		Fix clicking on already-opened thread post scrolling to the top of the thread (#27331) 2023-10-09 12:21:02 +02:00
github-actions[bot]
89b48681cf
 		New Crowdin Translations (automated) (#27321) 
Co-authored-by: GitHub Actions <noreply@github.com>
 2023-10-09 10:32:06 +02:00
Claire
53f5b27bd1 Merge commit '640421f661' into glitch-soc/merge-upstream 2023-10-08 17:30:48 +02:00