mirror/blueb-Chuckya-fe-standalone
1
0
Fork 0
mirror of https://iceshrimp.dev/blueb/Chuckya-fe-standalone.git synced 2026-01-20 09:49:03 -08:00
Code Issues Projects Releases Packages Wiki Activity
19,766 commits 2 branches 0 tags 263 MiB
Commit graph

1,583 commits

Author SHA1 Message Date
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
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
2a4fcc51fd
 		Fix dismiss button overlapping with text in dismissable banners (#26935) 2023-09-15 19:53:28 +02:00
Santiago Kozak
d2cfcdd09e
 		Fix recent search items not handling overflows correctly (#26893) 2023-09-12 04:20:57 +02:00
Essem
4d9832b211
 		Merge remote-tracking branch 'upstream/main' 2023-09-07 08:52:29 -05:00
Eugen Rochko
1f141f656d
 		Change onboarding prompt to use full width of banner in web UI (#26829) 2023-09-07 04:24:11 +02:00
Eugen Rochko
398635c0c4
 		Fix paragraph margins resulting in irregular read-more cut-off in web UI (#26828) 2023-09-07 04:24:01 +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
e66f961e05 Merge branch 'main' into glitch-soc/merge-upstream 2023-09-04 18:27:46 +02:00
Stanislas Signoud
a106c46478
 		Fix light mode colors for advanced interface banner (#26759) 2023-09-04 10:14:01 +02:00
Claire
c107512fa6 Merge commit '05093266e6' into glitch-soc/merge-upstream 2023-09-02 15:02:29 +02:00
Eugen Rochko
728eb6a153
 		Fix wrong color on active icons with counters in web UI (#26767) 2023-09-02 14:46:26 +02:00
Claire
4ed629cd7e Merge commit 'be991f1d18' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/form/admin_settings.rb`:
  Upstream added the notion of overriden settings, while we had extra code for
  pseudo-settings (only used to combine flavour and skin in a single select
  field).
  Ported upstream changes.
- `config/i18n-tasks.yml`:
  Upstream added `simple_form.overridden` to `ignore_unused`,
  we had `simple_form.glitch_only`.
  Added `simple_form.glitch_only` as well.
 2023-09-02 14:44:47 +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
16681e0f20
 		Add admin notifications for new Mastodon versions (#26582) 2023-09-01 17:47:07 +02:00
Claire
9e26cd5503
 		Add authorized_fetch server setting in addition to env var (#25798) 2023-09-01 15:41:10 +02:00
Santiago Kozak
f1d250135c
 		Allow filter form in profiles directory to wrap (#26682) 2023-08-31 14:15:58 +02:00
Stanislas Signoud
40b69cc1cd
 		Add an explanation banner on switching to single column mode (#26019) 2023-08-31 12:18:46 +02:00
Claire
21ec596dab
 		Fix sign up steps progress layout in right-to-left locales (#26728) 2023-08-30 16:29:52 +02:00
Essem
9da802a271
 		Fix mastomodern hashtag bar 2023-08-28 19:54:04 -05: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
Essem
7f94e0a8a7
 		Merge remote-tracking branch 'upstream/main' 2023-08-27 00:23:51 -05:00
Claire
32e67e78a3 Merge commit 'e3fd071973' into glitch-soc/merge-upstream 2023-08-24 21:50:14 +02:00
Claire
b6b68b44a1 Merge commit 'b91724fb9d' into glitch-soc/merge-upstream 
Conflicts:
- `Vagrantfile`:
  Upstream bumped a bunch of values, including one that was already bumped by
  glitch-soc.
  Took upstream's version.
- `lib/paperclip/transcoder.rb`:
  glitch-soc already had a partial fix for this.
  Took upstream's version.
 2023-08-24 21:46:17 +02:00
Claire
296b3d1560 Merge commit 'dc09c10fa8' into glitch-soc/merge-upstream 
Conflicts:
- `.rubocop_todo.yml`:
  Upstream re-generated the file, while glitch-soc has a specific ignore
  for some file.
  Updated the file as upstream did and kept our extra ignore.
- `config/webpack/shared.js`:
  Upstream added a plugin, but our files are pretty different.
  Added the plugin as well.
- `spec/helpers/application_helper_spec.rb`:
  Upstream refactored tests, but part of them were different because
  of glitch-soc's theming system.
  Applied the refactoring to glitch-soc's change.
 2023-08-24 21:26:27 +02:00
Claire
fbfc4145fd Merge commit '1cdcd9dc08' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream updated code that we actually moved to `app/javascript/core/settings.js`.
  Applied the changes there.
 2023-08-24 21:01:19 +02:00
Essem
b153bf8eda
 		yeah 2023-08-24 13:54:16 -05:00
Essem
0451c28535
 		Merge remote-tracking branch 'upstream/main' 2023-08-24 13:51:53 -05:00
Antonin Del Fabbro
9a8190da4a
 		Change opacity of the delete icon in the search field to be more visible (#26449) 2023-08-23 15:51:07 +02:00
Claire
613cfd625c
 		Change hashtag bar tags to be de-emphasized (#26606) 2023-08-23 15:44:52 +02:00
Essem
f43bd5ca21
 		Bump mastomodern 2023-08-22 17:10:56 -05:00
Claire
10404aece8 Merge commit '1cb978bcc3' into glitch-soc/merge-upstream 2023-08-22 18:50:14 +02:00
Claire
2126812f65 Merge commit 'd9c21293aa' into glitch-soc/merge-upstream 
Conflicts:
- `app/views/settings/preferences/other/show.html.haml`:
  Upstream moved some settings, where glitch-soc has an extra setting.
  Ported upstream changes, moving the same settings as them.
 2023-08-22 18:31:28 +02:00
Claire
fe31571965
 		Fix layout of the closed registrations modal (#26593) 2023-08-22 09:11:59 +02:00
Christian Schmidt
bb23116e8d
 		Fix profile picture preview (#26538) 2023-08-18 18:24:32 +02:00
Santiago Kozak
85ecadb630
 		Fix hashtag bar display when status is in a thread (#26497) 2023-08-16 09:06:04 +02:00
Essem
f75dfa5b7c
 		what 2023-08-15 17:28:40 -05:00
Essem
64bd79c862
 		Update mastomodern 2023-08-15 17:24:45 -05:00
Essem
e8ba9a39d7
 		Merge remote-tracking branch 'upstream/main' 2023-08-15 17:18:04 -05:00
Claire
df6e719898
 		Add display of out-of-band hashtags in the web interface (#26492) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 23:42:30 +02:00
Claire
d9c21293aa
 		Fix unfollow icon styling in advanced column (#26482) 2023-08-14 19:02:47 +02:00