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
20,340 commits 2 branches 0 tags 263 MiB
Commit graph

479 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
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
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
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
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
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
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
Claire
63179f0bf4 Merge commit '5ef26d8fd5' into glitch-soc/merge-upstream 2023-10-17 21:59:58 +02:00
Jeong Arm
ad44d832b8
 		Support "in:public" search filter (#26976) 2023-10-17 16:12:03 +02:00
Essem
84ea1a19fa
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-11 11:07:33 -05:00
Claire
4a9cdfb928 Merge commit '774e1189d2' into glitch-soc/merge-upstream 2023-10-09 21:12:28 +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
Essem
8d776b9aa5
 		Merge remote-tracking branch 'upstream/main' 2023-09-26 20:03:35 -05:00
Claire
abdb58840a Merge commit '57f592fed5' into glitch-soc/merge-upstream 2023-09-26 13:13:27 +02:00
Claire
38753acaa5
 		Fix width of large text icon buttons (#27127) 2023-09-25 15:06:57 +02:00
Essem
81c06b286f
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-09-16 11:27:11 -05: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
Eugen Rochko
9b2bc3d1de
 		Add recent searches in web UI (#26834) 2023-09-07 14:56:19 +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
5d20733d8d
 		Add infinite scrolling for search results in web UI (#26784) 2023-09-05 23:54:24 +02:00
Essem
b871816f0e
 		Merge remote-tracking branch 'upstream/main' 2023-09-04 19:00:18 -05: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
c8aa3d6d06 Merge commit 'dd72a8d28b' into glitch-soc/merge-upstream 2023-09-02 12:02:23 +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
Eugen Rochko
bceb893159
 		Add search options to search popout in web UI (#26662) 2023-08-28 13:18:39 +02:00
Essem
d9ea6abec0
 		Merge remote-tracking branch 'upstream/main' 2023-07-31 12:24:48 -05:00
Claire
92fa9d34b0 Merge commit '3554c52795' into glitch-soc/merge-upstream 
Conflicts:
- `app/controllers/authorize_interactions_controller.rb`:
  Small conflict due to our theming system.
- `streaming/index.js`:
  Upstream refactored part of the streaming server.
  We had some extra logic for handling local-only posts.
  Applied the refactor.
 2023-07-30 16:11:55 +02:00
Claire
b2515feb29 Merge commit 'cfd50f30bb' into glitch-soc/merge-upstream 2023-07-30 14:33:28 +02:00
Claire
42f36aa55a Merge commit '5b457961fc' into glitch-soc/merge-upstream 
Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream fixed an issue that was not present in glitch-soc.
  Kept our version.
 2023-07-30 13:49:35 +02:00
Claire
bbea052935
 		Fix emoji picker button scrolling with textarea content in single-column view (#25304) 2023-07-27 16:20:33 +02:00
Claire
b4e739ff0f
 		Change interaction modal in web UI (#26075) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-07-27 16:11:17 +02:00
gunchleoc
217ef7f2af
 		Replace 'favourite' by 'favorite' for American English (#26009) 2023-07-21 19:09:13 +02:00
Trevor Wolf
59478a1b46
 		change focus ui for keyboard only input (#25935) 2023-07-21 13:20:14 +02:00
Essem
9a33572bef
 		Merge remote-tracking branch 'upstream/main' 2023-07-05 12:48:40 -05:00
Claire
44e98a2740 Merge branch 'main' into glitch-soc/merge-upstream 2023-07-02 11:49:08 +02:00
Eugen Rochko
0512537eb6
 		Change dropdown icon above compose form from ellipsis to bars in web UI (#25661) 2023-07-02 10:39:55 +02:00
Essem
f426885fa2
 		Merge remote-tracking branch 'upstream/main' 2023-07-01 19:45:24 -05:00
Claire
178e151019 Merge commit '55e7c08a83' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/user_settings.rb`:
  Upstream added a constraint on a setting textually close
  to glitch-soc-only settings.
  Applied upstream's change.
- `lib/sanitize_ext/sanitize_config.rb`:
  Upstream added support for the `translate` attribute on a few elements,
  where glitch-soc had a different set of allowed elements and attributes.
  Extended glitch-soc's allowed attributes with `translate` as upstream did.
- `spec/validators/status_length_validator_spec.rb`:
  Upstream refactored to use RSpec's `instance_double` instead of `double`,
  but glitch-soc had changes to tests due to configurable max toot chars.
  Applied upstream's changes while keeping tests against configurable max
  toot chars.
 2023-06-25 14:27:38 +02:00
Ian
69db507924
 		Change emoji picker icon (#25479) 2023-06-21 17:58:00 +02:00
Claire
6c99479ef4 Merge commit '9e245d147b' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/profiles/show.html.haml`:
  Upstream redesigned the settings page, where glitch-soc had changes because of
  the ability to set some custom limits.
  Went with upstream's design while keeping our custom limits.
- `yarn.lock`:
  Upstream updated dependencies textually close to a glitch-soc-only dependency.
  Updated the dependnencies as well.
 2023-06-18 13:41:33 +02:00
Claire
c9d06d10d4
 		Fix non-interactive upload container being given a button role and tabIndex (#25462) 2023-06-16 12:03:06 +02:00