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

1,613 commits

Author SHA1 Message Date
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
Essem
570a8c00a2
 		Vertical status buttons fix 2023-11-27 10:31:51 -06:00
Essem
7a638e3225
 		Update mastomodern 2023-11-25 20:27:38 -06:00
Essem
1483b2b13d
 		More cleanup 2023-11-05 22:29:44 -06:00
Essem
759ab62c7b
 		Quick hotfix for mastomodern buttons? 2023-11-05 19:37:47 -06:00
Essem
1b64242fa5
 		Update to mastomodern upstream 2023-11-01 22:42:03 -05:00
Essem
c2033b5a86
 		Fix large icons in vanilla mastomodern 2023-11-01 17:33:45 -05:00
Essem
0868c11651
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-30 14:42:53 -05: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
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
Essem
27c641a848
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-24 10:16:17 -05:00
Claire
cc000c8859 Merge commit '126cd7705d' into glitch-soc/merge-upstream 2023-10-19 20:48:22 +02:00
Renaud Chaput
126cd7705d
 		Do not display the navigation banner in the logo container (#27476) 2023-10-19 19:36:08 +02:00
Essem
7d7d8e0c82
 		Fix mastomodern bottom bar 2023-10-19 11:13:52 -05:00
Essem
9c0a4a6937
 		Update mastomodern to 1.8.1 2023-10-11 11:09:27 -05:00
Essem
9b73910346
 		Revert "Update mastomodern to 1.8.0" 
This reverts commit 0aea24cfb7.
 2023-10-10 12:25:47 -05:00
Essem
29f2a7d9f4
 		Merge branch 'main' of https://github.com/glitch-soc/mastodon 2023-10-10 12:24:32 -05:00
Claire
74c27e33e3 Merge commit '37bbd3c106' into glitch-soc/merge-upstream 2023-10-08 17:10:39 +02:00
Claire
a5dbb1ee5a Merge commit '5a437edc7f' into glitch-soc/merge-upstream 2023-10-08 17:05:40 +02:00
Claire
19ebf7797e Merge commit 'e6b903b21e' into glitch-soc/merge-upstream 2023-10-08 16:30:00 +02:00
Essem
0aea24cfb7
 		Update mastomodern to 1.8.0 2023-10-06 17:39:27 -05:00
Claire
37bbd3c106
 		Fix double scroll bars in some columns in advanced interface (#27187) 2023-10-03 13:12:39 +02:00
Michael Stanclift
5a437edc7f
 		Keep version string displayed without breakpoints in UI (#26986) 2023-10-03 11:52:21 +02:00
Christian Schmidt
6d0767558a
 		Make notification respect reduce-motion (#27178) 2023-09-28 10:39:38 +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
gunchleoc
88fa8e710a
 		Fix line wrapping of language selection button with long locale codes (#27100) 2023-09-25 12:59:37 +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
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