Commit graph

Select branches

Hide pull requests

main

th-downstream

Mono Color

• 166d412414
  
  Merge remote-tracking branch 'treehouse/main' into th-downstream th-downstream Skye 2024-02-17 00:59:36 +0900
• 3644101a79 th: Merge remote-tracking branch 'glitch/main' Kouhai 2024-02-16 03:59:40 -0800
• d6a8c69b5c th: Merge remote-tracking branch 'glitch/main' Kouhai 2024-02-16 03:58:50 -0800
• 26e086cd0b th: DIVERGENCES.md Kouhai 2023-04-26 21:50:12 -0700
• ecc917008e th: maybe deal with spam Kouhai 2023-04-25 23:53:02 -0700
• d7d477047e Bump version to v4.3.0-alpha.3 (#29241) Claire 2024-02-16 12:06:47 +0100
• 6c1b6194f7 Merge pull request from GHSA-jhrq-qvrm-qr36 Claire 2024-02-16 11:56:12 +0100
• 63080e10a9 Update dependency pg to v1.5.5 (#29230) renovate[bot] 2024-02-16 09:12:10 +0100
• 76b36ba10d
  
  Revert "Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream"" Skye 2024-02-15 12:30:05 +0900
• 52aeef3834
  
  Merge remote-tracking branch 'treehouse/main' into th-downstream Skye 2024-02-15 12:19:13 +0900
• 8aae9712d9
  
  Revert "Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream" Skye 2024-02-15 12:16:40 +0900
• e7ca82762d Fix user creation failure handling in OAuth paths (#29207) Claire 2024-02-14 22:49:45 +0100
• bb4c06aa95 th: reapply css Kouhai 2024-02-14 12:25:00 -0800
• a1c7ba38b7 th: Merge remote-tracking branch 'glitch/main' (486e4bc7d3) Kouhai 2024-02-14 09:59:05 -0800
• c2887ef289 th: remove caddy from procfile Kouhai 2024-02-14 09:57:04 -0800
• 486e4bc7d3 Fix OmniAuth tests (#29201) Claire 2024-02-14 15:57:49 +0100
• 40439399c6 Bump version to v4.3.0-alpha.2 (#29200) Claire 2024-02-14 15:20:02 +0100
• 53b73ed6a2 Merge pull request from GHSA-vm39-j3vx-pch3 Claire 2024-02-14 15:16:07 +0100
• 436419cc2f Merge pull request from GHSA-7w3c-p9j8-mq3x Emelia Smith 2024-02-14 15:15:34 +0100
• 3c3ef8b9d3 Add sidekiq_unique_jobs:delete_all_locks task and disable sidekiq-unique-jobs UI by default (#29199) Claire 2024-02-14 13:12:13 +0100
• eae436c5a8 Disable administrative doorkeeper routes (#29187) Emelia Smith 2024-02-13 19:11:47 +0100
• b83076647e Ignore legacy moderator and admin columns on User model (#29188) Emelia Smith 2024-02-13 18:14:49 +0100
• 7100106f3f Update dependency sidekiq-unique-jobs to v7.1.33 (#29175) renovate[bot] 2024-02-13 08:56:46 +0100
• 04da8f887b Update dependency pghero to v3.4.1 (#29144) renovate[bot] 2024-02-08 11:03:39 +0100
• d9d0a6ef33 Update dependency irb to v1.11.2 (#29135) renovate[bot] 2024-02-08 11:03:30 +0100
• 93b365bfc0 Update dependency webmock to v3.20.0 (#29120) renovate[bot] 2024-02-07 11:56:52 +0100
• e3c4e90646
  Fix new list button being blank (#2616) Claire 2024-02-13 12:48:01 +0100
• 0d1e55d566
  
  th: smile sweet sadistic surprise service Kouhai 2024-02-12 02:35:47 -0800
• 6a5351ede0
  
  th: etc etc host host s s Kouhai 2024-02-12 02:35:47 -0800
• 084d051e6c
  Merge pull request #2608 from ClearlyClaire/glitch-soc/refactor/monolithic-components-css Claire 2024-02-12 22:18:55 +0100
• 34f677cd03 th: smile sweet sadistic surprise service Kouhai 2024-02-12 02:35:47 -0800
• 7719de5665 th: etc etc host host s s Kouhai 2024-02-12 02:35:47 -0800
• c249c10f74 Fix account suggestion size inconsistency with upstream Claire 2024-02-11 21:55:36 +0100
• c379487041 th: revert more emoji-mart twemoji 14 hacks Ariadne Conill 2024-02-10 21:02:47 -0800
• 342709ecb2 Revert "th: update emoji-mart sprite sheet for emoji 13.1" Ariadne Conill 2024-02-10 20:57:20 -0800
• eea2364a76 th: fix streaming image tagging Ariadne Conill 2024-02-10 20:22:44 -0800
• 191445ed32 th: drop obsolete emoji 14 patch vestiges Ariadne Conill 2024-02-10 20:02:11 -0800
• d391e01b59 Revert notification bar color for now Claire 2024-02-08 21:09:51 +0100
• 3f89cec3c9 Further reduce differences with upstream Claire 2024-02-08 19:52:03 +0100
• f6f62002c7 Remove leftovers from glitch-soc's layout option Claire 2024-02-08 19:12:02 +0100
• 189b70cd6a Merge SCSS in a single components.scss file Claire 2024-02-06 22:47:43 +0100
• 8c76a208ed
  Merge pull request #2607 from ClearlyClaire/glitch-soc/cherry-pick-upstream Claire 2024-02-06 21:56:01 +0100
• 65eb943b9d Fix confirmation e-mails when signing up through an app (#29064) Eugen Rochko 2024-02-02 16:51:26 +0100
• 19f1ffe287 Fix self-destruct schedule not actually replacing initial schedule (#29049) Claire 2024-02-06 16:32:09 +0100
• 5ea36a3606 Update dependency brakeman to v6.1.2 (#29062) renovate[bot] 2024-02-06 14:31:54 +0100
• b27cad27c2 Update dependency bootsnap to '~> 1.18.0' (#29019) renovate[bot] 2024-02-06 13:52:28 +0100
• 63f1f1465a Update dependency tzinfo-data to v1.2024.1 (#29052) renovate[bot] 2024-02-06 10:33:41 +0100
• 4cd00c0dd9 Update nsa gem to version 0.3.0 (#29065) Matt Jankowski 2024-02-06 04:33:11 -0500
• c6f7e3a1fb Update dependency haml_lint to v0.56.0 (#29082) renovate[bot] 2024-02-06 10:24:44 +0100
• 93aa783aa1 Update dependency nokogiri to v1.16.2 [SECURITY] (#29106) renovate[bot] 2024-02-06 10:20:23 +0100
• 868333c86f Update dependency capybara to v3.40.0 (#28966) renovate[bot] 2024-01-31 13:55:15 +0100
• ac49514bd6 Update dependency chewy to v7.5.1 (#29018) renovate[bot] 2024-01-30 16:40:43 +0100
• a2611d782c
  New Crowdin Translations (automated) (#2588) github-actions[bot] 2024-02-06 20:45:07 +0100
• 541cbdd963
  Add env variable support for number of followable hashtags in feed column (#2500) JS Moore 2024-02-06 14:23:36 -0500
• 08e511cecb
  Fix doodle modal icons (#2597) Essem 2024-02-06 13:22:42 -0600
• f50b12fe6e th: streaming builds again? Kouhai 2024-02-01 10:09:23 -0800
• 8fd45df06e th: fiddle with quote style Kouhai 2024-02-03 14:38:33 -0800
• 98ae4ef813 th: glitch: status: fix quote icon on quotes Ariadne Conill 2024-02-02 21:14:01 -0800
• 94a0b7a7f0 th: CSP: allow unsafe-inline for CSS Ariadne Conill 2024-02-02 21:07:12 -0800
• 46d70b1ca6 th: glitch: fix quote-toot icon Ariadne Conill 2024-02-02 20:59:21 -0800
• aa8741fff3 th: glitch: compose: remove annoying post published messages Ariadne Conill 2024-02-02 20:29:43 -0800
• cca4f085d6 th: woodpecker: build streaming image too Ariadne Conill 2024-02-02 20:11:11 -0800
• 43e58d1558 th: Merge remote-tracking branch 'glitch/main' Kouhai 2024-02-01 09:15:33 -0800
• 472eec8ae1
  
  I'm just trying random shit at this point Skye 2024-02-03 16:06:17 +0900
• 760b04e019
  
  uhhhhhh fuckign try anything Skye 2024-02-03 15:55:32 +0900
• ceb5c61a05
  
  Revert "uhhhhhh will this unfuck emoji picker" Skye 2024-02-03 15:49:54 +0900
• 9d3b88cf1b
  
  uhhhhhh will this unfuck emoji picker Skye 2024-02-03 15:44:30 +0900
• f27bc326d4
  
  woop Skye 2024-02-03 15:13:58 +0900
• b919006502
  
  uhhhhh help Skye 2024-02-03 15:03:02 +0900
• 1daea5fb31
  
  AAAAA Skye 2024-02-03 14:56:27 +0900
• c18931479c
  
  madness Skye 2024-02-03 14:51:17 +0900
• 309dd36816
  
  neofox_transgender Skye 2024-02-03 14:41:20 +0900
• 415c5eb2d4
  
  Merge remote-tracking branch 'claire/glitch-soc/features/redesign-localonly-toots' into th-downstream Skye 2024-02-03 14:28:39 +0900
• fa3b5195fd
  
  Merge remote-tracking branch 'TheEssem/feature/emoji-reactions' into th-downstream Skye 2024-02-03 14:21:55 +0900
• 1b1c4ff940
  
  also send misskey quote data Skye 2022-12-29 19:09:01 +0900
• 2029340d6a glitch: status: fix quote icon on quotes Ariadne Conill 2024-02-02 21:14:01 -0800
• cc97d5b0be CSP: allow unsafe-inline for CSS Ariadne Conill 2024-02-02 21:07:12 -0800
• 2a35ae9dc2 glitch: fix quote-toot icon Ariadne Conill 2024-02-02 20:59:21 -0800
• a3cebd15da glitch: compose: remove annoying post published messages Ariadne Conill 2024-02-02 20:29:43 -0800
• 243a7d967b woodpecker: build streaming image too Ariadne Conill 2024-02-02 20:11:11 -0800
• 5bc39b3196 Fix build-security docker tags Claire 2024-02-01 20:30:35 +0100
• c3936cbbe3 Temporary hack to correctly tag the security docker image… Claire 2024-02-01 18:39:28 +0100
• 4467b3ff37 Merge remote-tracking branch 'glitch/main' Kouhai 2024-02-01 09:15:33 -0800
• 970320d73c
  Restore -streaming suffix for security builds (#2602) Aaron Brady 2024-02-01 11:20:08 -0500
• 63d7a30503 Fix build-security workflow for glitch-soc Claire 2024-02-01 16:09:51 +0100
• ff58ec0103 Merge pull request from GHSA-3fjr-858r-92rw Claire 2024-02-01 15:56:46 +0100
• 3866597e24
  Merge pull request #2601 from ClearlyClaire/glitch-soc/fixes/security-builds-latest Claire 2024-02-01 11:48:45 +0100
• c1910db65f th: live from new york it's friday night Kouhai 2024-02-01 00:46:38 -0800
• a7b16003e1 Fix security builds not being marked latest Claire 2024-02-01 11:31:29 +0100
• 626ff320cf
  Merge pull request #2600 from ClearlyClaire/glitch-soc/fixes/failures Claire 2024-02-01 11:30:34 +0100
• f4416e6b3a Configure selenium to use Chrome version 120 (#29038) Matt Jankowski 2024-02-01 04:46:31 -0500
• 7bb5f6efbc
  Merge pull request #2599 from ClearlyClaire/glitch-soc/build-action Claire 2024-02-01 11:14:40 +0100
• 883f589653 Fix missing workflow_dispatch trigger for build-security (#29041) Claire 2024-02-01 10:52:01 +0100
• 85bdd145dc Adapt workflow to glitch-soc Claire 2024-02-01 10:40:04 +0100
• a48447a6b2 Add github action workflow for manual security builds (#29040) Claire 2024-02-01 10:33:12 +0100
• e9dbe31776 th: Merge remote-tracking branch 'glitch/main' Kouhai 2024-02-01 00:33:13 -0800
• 27f74617cc th: Merge remote-tracking branch 'glitch/main' (915cd36ac1) Kouhai 2024-02-01 00:31:27 -0800
• 8b87673f5e
  Remove obsolete locale file (#2596) Claire 2024-01-30 23:21:35 +0100
• 3ede233146
  Fix crash in private mention conversations in glitch-soc flavor (#2595) Claire 2024-01-30 22:42:22 +0100
• 9eef1295f0
  Fix rubocop lint issue Essem 2024-01-28 14:51:10 -0600