me/glitchier-soc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
39663 commits 2 branches 0 tags 429 MiB
Commit graph

39663 commits

This branch
This branch
All branches
Author SHA1 Message Date
rcombs
e53fc34e9a
Set autocomplete attr for email field on signup page (#19833) 
The email address will be used as the "username" for sign-in purposes, so it's the value that should be stored in password managers. We can inform the password manager of this by setting `autocomplete="email"`. Without this hint, password managers may instead store the `username` field, which isn't valid for sign-in (this happens with iCloud Keychain in Safari, for instance).
 2022-11-07 03:16:10 +01:00
Ariadne Conill
5b92324e54 th: app: api: base_controller: allow API access to be configurable 2022-11-06 19:13:50 +00:00
Ariadne Conill
9ee65200fd th: locales: fix YAML quoting issue 
Psych::SyntaxError: (/opt/mastodon/config/locales/simple_form.en.yml): mapping values are not allowed in this context at line 102 column 103
 2022-11-06 18:43:54 +00:00
Ariadne Conill
dfa1d7b22e Merge branch 'rebase/4.0.0rc1' 2022-11-06 18:23:41 +00:00
Kouhai
ced3e4e27c th: update account request question prompt 2022-11-06 18:22:00 +00:00
Ariadne Conill
697b1f4a2d th: vanilla: emoji: use 63x63 grid for emoji 2022-11-06 18:21:57 +00:00
Ariadne Conill
5ab9afa33f th: glitch: emoji: set sprite sheet to 63x63 2022-11-06 18:21:52 +00:00
Ariadne Conill
b17c429263 th: dockerfile: implement emoji-mart patch 2022-11-06 18:20:15 +00:00
Ariadne Conill
5ac86a2097 th: update emoji-mart sprite sheet for emoji 13.1 2022-11-06 18:20:15 +00:00
Ariadne Conill
e79855991e th: add emoji 13.1 data for emoji-mart 2022-11-06 18:20:15 +00:00
Claire
c18d61eff4 Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-06 18:49:46 +01:00
Claire
54101563bb
Merge pull request #1892 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2022-11-06 18:49:46 +01:00
Claire
03aa732d5c Fix status cache hydration discrepancy 2022-11-06 17:29:04 +01:00
Claire
21d6bc1689 Fix status cache hydration discrepancy 2022-11-06 17:29:04 +01:00
Claire
ba394a191b Change glitch-soc composer classes to match upstream 2022-11-06 17:29:04 +01:00
Claire
0be6da42d3 Change glitch-soc composer classes to match upstream 2022-11-06 17:29:04 +01:00
Eugen Rochko
81e313a1be [Glitch] Fix colors in light theme 
Port f8def1f6b1 to glitch-soc
 2022-11-06 17:29:04 +01:00
Eugen Rochko
c199387558 [Glitch] Fix colors in light theme 
Port 20aa8881dc to glitch-soc
 2022-11-06 17:29:04 +01:00
Eugen Rochko
896f2a3b16 [Glitch] Fix wrong colors in the high-contrast theme 
Port 3cd8f07e90 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Eugen Rochko
cbfa5ad5dd [Glitch] Fix wrong colors in the high-contrast theme 
Port 1c3192df6b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Eugen Rochko
df921b23a9 [Glitch] Change design of link footer 
Port 0b91816814 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Eugen Rochko
c883799a1f [Glitch] Change design of link footer 
Port 2d9a85db6e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Eugen Rochko
7cc6e34cc4 [Glitch] Fix missing interpolation of domain in disabled account banner in web UI 
Port 8742e0000e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Eugen Rochko
d29172a682 [Glitch] Fix missing interpolation of domain in disabled account banner in web UI 
Port a442f481f8 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Claire
3eec8f7152 [Glitch] Change sign-in banner to reflect disabled or moved account status 
Port 3d24ef2967 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Claire
b6c0ef70a2 [Glitch] Change sign-in banner to reflect disabled or moved account status 
Port 312d616371 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Eugen Rochko
0082653909 [Glitch] Fix showing profile's featured tags on individual statuses 
Port 51e5229712 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Eugen Rochko
0437159056 [Glitch] Fix showing profile's featured tags on individual statuses 
Port bfafb114a2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Claire
5b9b797f64 [Glitch] Fix handling of duplicate and out-of-order notifications in WebUI 
Port 7e4afba7c6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Claire
fa293f03fa [Glitch] Fix handling of duplicate and out-of-order notifications in WebUI 
Port 7c8e2b9859 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 17:29:04 +01:00
Yamagishi Kazutoshi
597e4949eb Update SECURITY.md (#19869) 2022-11-06 16:13:53 +01:00
Yamagishi Kazutoshi
bd220c32f1
Update SECURITY.md (#19869) 2022-11-06 16:13:53 +01:00
Eugen Rochko
bf76aeb117 [Glitch] Add assets from Twemoji 14.0 
Port e75cab5d37 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:50:23 +01:00
Eugen Rochko
01e0cb1cd5 [Glitch] Add assets from Twemoji 14.0 
Port e02812d5b6 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:50:23 +01:00
Sunny Ripert
1f7d23bdd8 [Glitch] Fix JavaScript console warning when loading notifications 
Port c91962983f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:47:31 +01:00
Sunny Ripert
8368f4857c [Glitch] Fix JavaScript console warning when loading notifications 
Port 887976814a to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:47:31 +01:00
Sunny Ripert
1ad7f63551 [Glitch] Fix JavaScript console error on upload editing status 
Port 343099eafa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:46:03 +01:00
Sunny Ripert
93ccb4a29e [Glitch] Fix JavaScript console error on upload editing status 
Port c95d9aab56 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:46:03 +01:00
Eugen Rochko
8a2d0a928f [Glitch] Fix limited account hint referencing "your" server when logged out 
Port bd9c4ec16d to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:45:00 +01:00
Eugen Rochko
81334e2bfb [Glitch] Fix limited account hint referencing "your" server when logged out 
Port 139ea4c981 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:45:00 +01:00
Claire
850e8e5f3c [Glitch] Fix being unable to withdraw follow request when confirmation modal is disabled (#19687) 
Port b0d4b7d956 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:43:18 +01:00
Claire
6b498fae46 [Glitch] Fix being unable to withdraw follow request when confirmation modal is disabled (#19687) 
Port cbb440bbc2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:43:18 +01:00
Claire
3fc27d62fd [Glitch] Fix edits not being immediately reflected 
Port 2674759f9c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:42:15 +01:00
Claire
e42875d195 [Glitch] Fix edits not being immediately reflected 
Port 74d40c7d8f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2022-11-06 10:42:15 +01:00
Claire
20fb459dee Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
 2022-11-06 09:50:41 +01:00
Claire
0ad919b192 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/mastodon/features/compose/components/poll_form.js`:
  glitch-soc change because of having changed the default number of
  available poll options.
  Applied upstream's changes while keeping glitch-soc's default number of
  poll options.
- `public/oops.png`:
  We had a minor graphics change, probably not worth diverging from upstream.
  Took upstream version.
 2022-11-06 09:50:41 +01:00
Kouhai
eb1ef52ba9 th: update account request question prompt 2022-11-06 01:36:06 -07:00
Eugen Rochko
cdbd1a8bb3 Bump version to 4.0.0rc2 (#19831) 2022-11-06 06:59:56 +01:00
Eugen Rochko
5187e4e758
Bump version to 4.0.0rc2 (#19831) 2022-11-06 06:59:56 +01:00
Eugen Rochko
b2cf46ee21 Fix not using GIN index for account search queries (#19830) 2022-11-06 06:16:34 +01:00