Skip to content

latest changes from upstream#2

Merged
matmanna merged 46 commits intomatmanna:mainfrom
hackclub:main
Mar 2, 2026
Merged

latest changes from upstream#2
matmanna merged 46 commits intomatmanna:mainfrom
hackclub:main

Conversation

@matmanna
Copy link
Owner

@matmanna matmanna commented Mar 2, 2026

No description provided.

skyfallwastaken and others added 30 commits February 18, 2026 00:09
* add new icon from bounty

* Add sidebar to docs pages with dashboard link

- Add dedicated sidebar to docs pages (Index and Show)
- Hide authenticated user nav on docs pages via hide_nav flag
- Add Hackatime logo and 'Go to Dashboard' button to sidebar
- Add 17 popular editors to sidebar navigation
- Remove breadcrumbs from docs pages
- Add /home route for signed-out homepage

* Update homepage CTA text and docs screenshot

* Add 'More' button to homepage editor grid with docs anchor

* feat: add more editors to homepage editorgrid

* fix: weirdness in docs sidebar

* implement isActive function suggestion

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* Fixes?

---------

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
Co-authored-by: Mahad Kalam <mahadkalam1234@gmail.com>
Co-authored-by: Mahad Kalam <55807755+skyfallwastaken@users.noreply.github.com>
* Allow disabling Hackatime v1 import via Flipper flag

* Handle Greptile suggestion
* Remove unused ERBs, /wakatime-alternative

* Update grid icons

* Fix classes
* llms.txt/llms-full.txt/.md docs routes, SSR

* Fixes!

* Tests!

* More fixes

* Fix SSR!

* Update bin/docker-entrypoint

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* Use Bun for SSR!

---------

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
* Small UI fixes

* OAuth2 applications tweaks
* Use Bun for deps

* Oops, formatting
* add heatmap to badges page

* fix: add hash + fmt

* Fix slashes

---------

Co-authored-by: Mahad Kalam <55807755+skyfallwastaken@users.noreply.github.com>
* Add goals

* Fix up some migrations

* Formatting

* Simplify migration

* Update test/controllers/settings_goals_controller_test.rb

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* Update test/controllers/settings_goals_controller_test.rb

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

* Fix svelte-check issues, make CI less janky on dev

* svelte-check/fix tests

* Fix N+1s

* Formatting!

* More tests, fix anonymization and N+1

---------

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
Bumps [good_job](https://github.com/bensheldon/good_job) from 4.13.2 to 4.13.3.
- [Release notes](https://github.com/bensheldon/good_job/releases)
- [Changelog](https://github.com/bensheldon/good_job/blob/main/CHANGELOG.md)
- [Commits](bensheldon/good_job@v4.13.2...v4.13.3)

---
updated-dependencies:
- dependency-name: good_job
  dependency-version: 4.13.3
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Updated README.md with new images and documentation link.
* Several tests and fixes.

* Harden safe_return_url to reject URLs containing colons

Adds an extra guard in safe_return_url to reject paths containing ':'
characters, preventing edge-case scheme-like redirects (e.g.
/javascript:...). Addresses CodeQL URL redirection warning.

* Oops!
Change flex alignment from items-center to items-start so the X button
stays at the top-right corner instead of vertically centering with the
icon + title block.
* Fix data export + Capybara

* Continue?

* A ton of system tests :D + test cleanup

* More system tests

* Add placeholder keys for tests?

* Get rid of the double-query!

* Speed up CI Chrome setup by avoiding snap installs

* Pin CI Chrome version to reduce system test flakiness

* Stabilize integrations settings system test interaction
* Make em go to ActiveStorage

* Oops!
* Imports + mirrors :DD

* Stuff and things

* Fixes

* Fixes x2

* Tests!

* Hmm
* Weekly summary emails + move off Loops

* Remove unused asset
* Let's use Linguist for colours?

* oops
skyfallwastaken and others added 16 commits February 25, 2026 10:24
- Add segmented control with macOS/Linux/Codespaces, Windows, and Advanced tabs
- Default tab is auto-detected from user agent (server-side)
- Show WSL option in mac/linux tab label only when user is on Windows
- Use modal-matching cubic-bezier easing for tab transitions
* Add OS switcher tabs to WakatimeSetup page

- Add segmented control with macOS/Linux/Codespaces, Windows, and Advanced tabs
- Default tab is auto-detected from user agent (server-side)
- Show WSL option in mac/linux tab label only when user is on Windows
- Use modal-matching cubic-bezier easing for tab transitions

* Add system test for WakatimeSetup OS switcher tabs

* Extract repeated tab classes into tabClass helper

* Remove Xcode reference from setup subtitle

* Show Xcode in subtitle only on macOS/Linux tab

* pf

* Update test/system/wakatime_setup_test.rb

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>

---------

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
* Bit of SEO stuff + disable weekly summaries for now

* Update bundle
* Set up R2!

* Update .env.example
* Better emails!

* Fix tests?

* bit o' cleanup

* add rant

* pt2

* pt3

* Update tests

* oop

* man what on earth

* ffs!!!!!

* Revert "ffs!!!!!"

This reverts commit b58bfed.

* Revert "man what on earth"

This reverts commit 8752cc2.

* Revert "Fix tests?"

This reverts commit 810ebde.

* Ignore external Google Fonts link in premailer
* Notable + unsubscribe links

* Add the migrations/initializers!

* oops

* Fix a bug

* Address Copilot warn

* Fixes

* stop swallowing errors!!!!

* Flipper flag WeeklySummaryEmailJob

* Split WeeklySummaryEmailJob into new email
* Expand scopes to all time for summaries/goals

* oops i forgor to remove the second line
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](actions/upload-artifact@v6...v7)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-version: '7'
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Mahad Kalam <55807755+skyfallwastaken@users.noreply.github.com>
Reverts the following commits:
- 2e3cfd6 Revert Mailkick
- de32044 Merge branch 'main'
- efd189a Add safety-hatch for summary emails
- d5c6292 Remove exploding queries (#1018)
- 2b37201 Bump actions/upload-artifact from 6 to 7 (#1007)
- a4c10b4 Expand scopes to all time for summaries/goals (#1017)
- 4dec2f4 Unsubscribe links + slow job monitoring (#1016)
* Sources say Charlie Kick is stable. Please god

* Some tests + guards + unsub URL fix

* Fix lockfile!

* bin/rubocop -A

* if this does not work I am going to kms

* phew
@matmanna matmanna merged commit 5ff4402 into matmanna:main Mar 2, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants