treehouse
/
mastodon
21
8
Fork 5
Code Issues 32 Pull Requests Projects 1 Releases Wiki Activity
18,484 Commits
12 Branches
15 Tags
760 MiB
Commit Graph

18484 Commits (9af6f6db1a56f5201a43e48462a7055169fc4ef0)

Author SHA1 Message Date
Claire 9af6f6db1a Merge commit '5ad5dcd563671f9b73e761a42cff991869a37adc' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream changed how releases are tagged, we don't have releases.
  Ignored the changes
 2023-07-12 15:54:58 +02:00
Trevor Wolf 7e3d2d3b4f [Glitch] fix buttons showing inconsistent styles 
Port 29c29410d2 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:50:56 +02:00
Claire 05c57b674f [Glitch] Fix filters not applying to explore tab 
Port 047d44611b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:48:13 +02:00
Claire e91c424b7c [Glitch] Add `forward_to_domains` parameter to `POST /api/v1/reports` 
Port 66693177ff to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:47:43 +02:00
Claire 2189682f8f Merge commit '29c29410d2b5386dddcb12bdb413c7b3d078dbc5' into glitch-soc/merge-upstream 2023-07-12 15:44:33 +02:00
Eugen Rochko 70c0ba7e5b [Glitch] Change label and design of sensitive and unavailable media in web UI 
Port 7496c1b655 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:43:10 +02:00
Claire 54b6b035a7 Merge commit 'b945f16ddf0c87654d5dc5d0f46f475913247dab' into glitch-soc/merge-upstream 
Conflicts:
- `app/models/trends.rb`:
  Conflict due to glitch-soc's code splitting trends mailing depending on type.
  Ported upstream's changes.
 2023-07-12 15:38:35 +02:00
Eugen Rochko c2a5484268 [Glitch] Fix explore page being inaccessible when opted-out of trends in web UI 
Port 9f5eab728b to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:34:12 +02:00
Claire 63ca7222d6 Merge commit 'e75e734ac2d972ee82d344ebb7632a26d0746cb7' into glitch-soc/merge-upstream 
Conflicts:
- `app/serializers/initial_state_serializer.rb`:
  Upstream renamed an initial state parameter, where we had extra ones.
  Renamed as upstream did.
- `app/workers/feed_insert_worker.rb`:
  Upstream wrapped database query in a block, we had extra database
  queries because of the DM timeline.
  Moved everything in the block.
 2023-07-12 15:27:32 +02:00
fusagiko / takayamaki f9042a3d40 [Glitch] simplify counters 
Port 4106a801a0 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:18:41 +02:00
alfe 4781c1f7eb [Glitch] Rewrite `<ShortNumber />` as FC and TS 
Port b5c5e2bf36 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:17:18 +02:00
Renaud Chaput 5a6f556541 [Glitch] Convert `<DismissableBanner>` to Typescript 
Port 9203ab410c to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:09:14 +02:00
Renaud Chaput 5cd9e85fbb [Glitch] Fix translate button position 
Port 7ff696d848 to glitch-soc

Signed-off-by: Claire <claire.github-309c@sitedethib.com>
 2023-07-12 15:05:24 +02:00
Claire 8a27e68050 Merge commit '9203ab410c09efbd9facf202f2570cdd0def8de0' into glitch-soc/merge-upstream 2023-07-12 15:00:41 +02:00
Claire a64181f28b Fix import order inconsistencies (#2289) 2023-07-12 15:00:10 +02:00
renovate[bot] 5ad5dcd563 Update babel monorepo (#25930) 
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
 2023-07-12 09:05:17 +02:00
Stanislas Signoud 01b9ee2b81 Fix sounds not being loaded from assets host (#25931) 2023-07-12 03:02:32 +02:00
Stanislas Signoud d36859f37e Use invariant colors on notification toasts (#25919) 2023-07-11 23:30:21 +02:00
Claire 9215676925 Fix incorrect syntax in Github action configuration (#25918) 2023-07-11 19:52:37 +02:00
Matt Jankowski dd7aaed762 Run the rebase conflict checker once an hour (#25914) 2023-07-11 19:40:51 +02:00
Claire 086ddcb021 Update brakeman ignores (#25912) 2023-07-11 17:08:37 +02:00
Nick Schonning 639c066a09 Run brakeman in GitHub Actions (#23713) 2023-07-11 15:23:57 +02:00
trwnh 536232583b Fix changelog referencing wrong API version (#25857) 2023-07-11 14:53:58 +02:00
Renaud Chaput e9312afa0d Fixes `latest` Docker tag (#25812) 2023-07-11 14:52:00 +02:00
Trevor Wolf 29c29410d2 fix buttons showing inconsistent styles (#25903) 2023-07-11 12:26:09 +02:00
jsgoldstein c6ac835588 Change searching with # to include account index (#25638) 2023-07-10 20:58:13 +02:00
Claire 047d44611b Fix filters not applying to explore tab (#25887) 2023-07-10 19:33:07 +02:00
Claire de3b86a5f8 Fix remote accounts being possibly persisted to database with incomplete protocol values (#25886) 2023-07-10 18:42:19 +02:00
Claire 2b174c0d78 Fix moderation interface for remote instances with a .zip TLD (#25885) 2023-07-10 18:42:10 +02:00
Claire 66693177ff Add `forward_to_domains` parameter to `POST /api/v1/reports` (#25866) 2023-07-10 18:26:56 +02:00
Matt Jankowski 482071a976 Refactor `NotificationMailer` to use parameterization (#25718) 2023-07-10 03:06:22 +02:00
Eugen Rochko 896f4ef2f6 Change feed merge, unmerge and regeneration workers to use a replica (#25849) 2023-07-10 03:06:09 +02:00
Eugen Rochko b945f16ddf Fix trend calculation working on too many items at a time (#25835) 2023-07-08 20:16:48 +02:00
Eugen Rochko 7496c1b655 Change label and design of sensitive and unavailable media in web UI (#25712) 2023-07-08 20:05:33 +02:00
Matt Jankowski b63d71fd48 Remove unused `NotificationMailer#digest` preview (#25719) 2023-07-08 20:04:21 +02:00
Matt Jankowski 6555c33503 Admin mailer parameterization (#25759) 2023-07-08 20:03:38 +02:00
Renaud Chaput e75e734ac2 Remove unused `missed_update` state (#25832) 2023-07-08 20:02:14 +02:00
Eugen Rochko 703ff75549 Add toast with option to open post after publishing in web UI (#25564) 2023-07-08 20:01:08 +02:00
Eugen Rochko 3df957104a Fix dropdowns being disabled for logged out users in web UI (#25714) 2023-07-08 20:00:52 +02:00
Eugen Rochko 9f5eab728b Fix explore page being inaccessible when opted-out of trends in web UI (#25716) 2023-07-08 20:00:12 +02:00
Eugen Rochko 6894f5c114 Add forwarding of reported replies to servers being replied to (#25341) 2023-07-08 20:00:02 +02:00
Kurtis Rainbolt-Greene a27f2686ca First pass at multi-database for read replica using Rails native adapter (#25693) 
Co-authored-by: emilweth <7402764+emilweth@users.noreply.github.com>
 2023-07-08 19:45:36 +02:00
Renaud Chaput 9203ab410c Convert `<DismissableBanner>` to Typescript (#25582) 2023-07-08 11:12:20 +02:00
alfe b5c5e2bf36 Rewrite `<ShortNumber />` as FC and TS (#25492) 2023-07-08 11:11:58 +02:00
fusagiko / takayamaki 4106a801a0 simplify counters (#25541) 2023-07-08 11:11:22 +02:00
Matt Jankowski 3f04f0c37b Regenerate brakeman ignore, pruning warnings (#25749) 2023-07-08 11:07:19 +02:00
Renaud Chaput 7ff696d848 Fix translate button position (#25807) 2023-07-08 00:12:31 +02:00
Claire db11493851 Merge pull request #2279 from ClearlyClaire/glitch-soc/merge-upstream 
Merge upstream changes
 2023-07-07 20:33:32 +02:00
Claire 9ba89aeeb5 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.github/workflows/build-image.yml`:
  Upstream attempted something with tags.
  Kept our version.
 2023-07-07 19:59:43 +02:00
Claire 784f7fb497 Bump version to v4.1.4 (#25805) 2023-07-07 19:42:03 +02:00