mirrors
/
mastodon-glitch
mirror of https://github.com/glitch-soc/mastodon
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
18,878 Commits
69 Branches
21 Tags
341 MiB
Commit Graph

18878 Commits (7b09f585fac0648d3173ca452644b749a92e979c)

Author SHA1 Message Date
Claire 7b09f585fa Merge commit 'bb51c0676d0cf27babc2c01ee337ca5fd24ae37c' into glitch-soc/merge-upstream 
Conflicts:
- `app/javascript/packs/public.jsx`:
  Upstream refactored slightly (but touching almost all the lines in the code),
  glitch-soc had moved a few of the code to another file.
  Refactored as upstream did.
 2023-08-24 20:34:14 +02:00
Claire 8eb09466aa
Merge pull request #2380 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 1cb978bcc3
 2023-08-23 16:56:19 +02:00
Claire 452f15be78 Move glitch-soc's “Hide followers count” setting to “Show followers count” under “Privacy and reach” tab 2023-08-22 19:50:37 +02:00
Claire c053bfc45a [Glitch] Fix “legal” report category not showing up in moderation interface 
Port 0446394465 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-22 18:54:22 +02:00
Claire 10404aece8 Merge commit '1cb978bcc3d291a045f367e072ca0af1a1c4dbbc' into glitch-soc/merge-upstream 2023-08-22 18:50:14 +02:00
Claire 245fe855be [Glitch] Fix unfollow icon styling in advanced column 
Port d9c21293aa to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-22 18:48:23 +02:00
Claire 2126812f65 Merge commit 'd9c21293aa6e105cedeff6b5e469af40a20909d9' 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 128daefc7a
Remove leftover `.orig` files that were mistakenly included (#2379) 2023-08-22 18:24:03 +02:00
Claire 4f1d22628d
Merge pull request #2378 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 3a8370e1f4
 2023-08-22 12:55:19 +02:00
mogaminsk 724d773844 [Glitch] Fix "Create Account" button in interaction modal 
Port a664e15702 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-21 21:08:56 +02:00
Claire 7e25e311d5 Merge commit '3a8370e1f459f5cf9695a610102ae6e53df36714' into glitch-soc/merge-upstream 2023-08-21 21:07:39 +02:00
Christian Schmidt bb51c0676d
Remove redundant ready() wrapper (#26533) 2023-08-18 12:06:08 +02:00
renovate[bot] 1cb978bcc3
Update dependency @material-design-icons/svg to v0.14.11 (#26536) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-18 11:10:05 +02:00
renovate[bot] 581ebf2bb5
Update dependency puma to v6.3.1 (#26537) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-18 08:33:33 +02:00
Nicolai Søborg 13ffe91c81
Fix `frame_rate` for videos where `ffprobe` reports 0/0 (#26500) 2023-08-18 08:32:47 +02:00
Renaud Chaput b95867ad1f
Allow setting a custom HTTP method in CacheBuster (#26528) 
Co-authored-by: Jorijn Schrijvershof <jorijn@jorijn.com>
 2023-08-18 08:18:40 +02:00
renovate[bot] b5acf13886
Update dependency pg to v8.11.3 (#26519) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-17 16:43:37 +02:00
Claire 60b9fa641d
Fix cached posts including stale stats (#26409) 2023-08-17 16:11:48 +02:00
Claire 3ed2bf92d0
Fix case-insensitive comparison of hashtags to do case-folding (#26525) 2023-08-17 12:49:52 +02:00
Claire cc4560d95b
Change “privacy and reach” settings so that unchecking boxes always increase privacy and checking them always increase reach (#26508) 2023-08-17 09:13:26 +02:00
Claire 0446394465
Fix “legal” report category not showing up in moderation interface (#26509) 2023-08-16 16:38:33 +02:00
Claire f0862bcf98
Fix hashtag bar sometimes including tags that appear in the post's body (#26506) 2023-08-16 11:47:59 +02:00
renovate[bot] 26eaf058e2
Update dependency postcss to v8.4.28 (#26502) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-16 09:08:57 +02:00
Santiago Kozak 85ecadb630
Fix hashtag bar display when status is in a thread (#26497) 2023-08-16 09:06:04 +02: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
Claire dd049fc37a
Fix ES_PRESET not being applied to Chewy's internal index (#26489) 2023-08-14 19:00:56 +02:00
Claire 90ec88d58b
Add support for `indexable` attribute on remote actors (#26485) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 18:54:51 +02:00
Claire fc5ab2dc83
Add privacy tab in profile settings (#26484) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 18:52:45 +02:00
Claire 3a8370e1f4
Fix `repo:changelog` task matching strings that are not Pull Request identifiers (#26280) 2023-08-14 18:47:43 +02:00
Claire f5778caa3a
Add `ES_PRESET` option to customize numbers of shards and replicas (#26483) 
Co-authored-by: Eugen Rochko <eugen@zeonfederated.com>
 2023-08-14 17:46:16 +02:00
github-actions[bot] c452ccd913
New Crowdin Translations (automated) (#26444) 
Co-authored-by: GitHub Actions <noreply@github.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-14 14:54:31 +02:00
Renaud Chaput 9262cfc57f
Fix `lint:json` not processing `json5` extension (#26481) 2023-08-14 14:53:13 +02:00
renovate[bot] 07f43daadc
Update dependency nokogiri to v1.15.4 (#26476) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-14 14:10:46 +02:00
renovate[bot] c65032fb11
Update dependency autoprefixer to v10.4.15 (#26473) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-14 13:39:28 +02:00
renovate[bot] 273730c4e8
Update dependency faker to v3.2.1 (#26474) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-08-14 13:38:41 +02:00
HonkingGoose c48506d8d4
Improve Renovate configuration (#26306) 2023-08-14 12:08:43 +02:00
mogaminsk a664e15702
Fix "Create Account" button in interaction modal (#26459) 2023-08-14 12:04:04 +02:00
Renaud Chaput 1eac3a60de
Upgrade `@types/react` (#26457) 2023-08-14 09:40:07 +02:00
Claire 8c7f3c5332
Remove old non-unique index on preview_cards statuses join table (#26447) 2023-08-14 09:38:08 +02:00
Claire 86ba8d3e14
Merge pull request #2368 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes up to 496eb6f7a4
 2023-08-14 08:39:25 +02:00
Claire 987f190839 [Glitch] Fix reply not preserving the language from the replied-to post 
Port 34f3001278 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:24:50 +02:00
Claire 92df185be7 Merge commit '496eb6f7a4fa7de54f26da9642a76e6884648102' into glitch-soc/merge-upstream 2023-08-13 19:23:22 +02:00
Claire e28727aab3 [Glitch] Change the hashtag column to not display the hashtag header on pinned columns 
Port 4caa9f0e69 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:13:11 +02:00
Claire 7c4b115e7d [Glitch] Fix interaction modal layout 
Port cd6f2b3cbc to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:12:42 +02:00
Eugen Rochko 0f8ddf367c [Glitch] Change header of hashtag timelines in web UI 
Port e325443b02 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:11:52 +02:00
Claire d9451feef0 [Glitch] Fix report modal secondary buttons style 
Port 79936c584f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:08:08 +02:00
Claire 2f50b77ae8 [Glitch] Fix confirmation when closing media edition modal with unsaved changes 
Port b59053ff8c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:06:02 +02:00
Trevor Wolf f0ad745506 [Glitch] Fix light theme select option for hashtags 
Port 93372fee1e to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:05:24 +02:00
Eugen Rochko 03ae73bdc5 [Glitch] Change design of hidden media overlay (again) in web UI 
Port 04e7efac3f to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-08-13 19:04:07 +02:00