System-End/hackatime
1
0
Fork 0
mirror of https://github.com/System-End/hackatime.git synced 2026-04-19 19:55:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions
1819 commits 4 branches 0 tags 12 MiB
Commit graph

1819 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mahad Kalam
1f695850e5
Bring back Mailkick (#1021) 
* 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
 2026-03-01 14:26:54 +00:00
Mahad Kalam
c846217ce6
Revert all commits after d5d987a8f4 (#1020) 
Reverts the following commits:
- 2e3cfd60 Revert Mailkick
- de320443 Merge branch 'main'
- efd189a8 Add safety-hatch for summary emails
- d5c62922 Remove exploding queries (#1018)
- 2b37201d Bump actions/upload-artifact from 6 to 7 (#1007)
- a4c10b47 Expand scopes to all time for summaries/goals (#1017)
- 4dec2f44 Unsubscribe links + slow job monitoring (#1016)
 2026-03-01 13:09:10 +00:00
Mahad Kalam
0c7fb13c82
Revert Mailkick (#1019) 2026-03-01 12:56:23 +00:00
Mahad Kalam
de32044332 Merge branch 'main' of https://github.com/hackclub/hackatime 2026-03-01 12:43:51 +00:00
Mahad Kalam
efd189a8c4 Add safety-hatch for summary emails 2026-03-01 12:43:41 +00:00
Mahad Kalam
d5c6292220
Remove exploding queries (#1018) 2026-03-01 12:42:28 +00:00
dependabot[bot]
2b37201dac
Bump actions/upload-artifact from 6 to 7 (#1007) 
Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 6 to 7.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/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>
 2026-03-01 12:19:36 +00:00
Mahad Kalam
a4c10b473a
Expand scopes to all time for summaries/goals (#1017) 
* Expand scopes to all time for summaries/goals

* oops i forgor to remove the second line
 2026-03-01 12:18:22 +00:00
Mahad Kalam
4dec2f44a4
Unsubscribe links + slow job monitoring (#1016) 
* 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
 2026-03-01 12:11:38 +00:00
Mahad Kalam
d5d987a8f4
Email layout v2 (#1015) 
* Better emails!

* Fix tests?

* bit o' cleanup

* add rant

* pt2

* pt3

* Update tests

* oop

* man what on earth

* ffs!!!!!

* Revert "ffs!!!!!"

This reverts commit b58bfed0f4c6288e95d0a111aeb3d7d7900ac9e7.

* Revert "man what on earth"

This reverts commit 8752cc2200eb3b852ea545d10ccbd555ab09d2b4.

* Revert "Fix tests?"

This reverts commit 810ebde73376ff7da0595e6b927f1b464d62b4a4.

* Ignore external Google Fonts link in premailer
 2026-03-01 07:18:24 +00:00
Mahad Kalam
cb67e125d0
Work around aws_sdk_s3 + R2 incompatibility (#1014) 2026-03-01 00:08:20 +00:00
Mahad Kalam
26663ddad5
Set up R2! (#1013) 
* Set up R2!

* Update .env.example
 2026-02-28 23:55:39 +00:00
Mahad Kalam
afb7e260e8
Temporarily disable weekly summaries (#1012) 
* Bit of SEO stuff + disable weekly summaries for now

* Update bundle
 2026-02-28 23:41:57 +00:00
Mahad Kalam
66f928ca24
OS switcher tabs updates (#1002) 
* 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>
 2026-02-25 10:43:52 +00:00
Mahad Kalam
36816f59b3
Add OS switcher tabs to WakatimeSetup page (#1001) 
- 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
 2026-02-25 10:24:01 +00:00
Mahad Kalam
df9e4d8aef
Split test and test_system (#1000) 2026-02-24 12:57:09 +00:00
Mahad Kalam
8b8297f45a
Add Linguist colours + langmapper (#999) 
* Let's use Linguist for colours?

* oops
 2026-02-24 12:53:13 +00:00
Mahad Kalam
de363bc8d2 oop 2026-02-23 22:25:09 +00:00
Mahad Kalam
2816314df9
Weekly summary emails + move off Loops (#998) 
* Weekly summary emails + move off Loops

* Remove unused asset
 2026-02-23 22:15:02 +00:00
Mahad Kalam
5bd4b7b0c7 Fix mirror auth 2026-02-23 20:46:28 +00:00
Mahad Kalam
1a28bc744a
UI tweak (#996) 2026-02-23 20:26:33 +00:00
Mahad Kalam
64849e2656 Fix migration! 2026-02-23 20:20:05 +00:00
Mahad Kalam
8c0227cb57
Bye, warehouse! (#994) 2026-02-23 20:16:03 +00:00
Mahad Kalam
7317cc45e7
Imports + mirrors :DD (#993) 
* Imports + mirrors :DD

* Stuff and things

* Fixes

* Fixes x2

* Tests!

* Hmm
 2026-02-23 15:00:43 +00:00
Mahad Kalam
73223f1ec7
TIL Hackatime uses the Disk service?! (#991) 2026-02-21 12:42:56 +00:00
Mahad Kalam
1b7e0462dc
Make large exports go to ActiveStorage (#990) 
* Make em go to ActiveStorage

* Oops!
 2026-02-21 11:53:18 +00:00
Mahad Kalam
44777ad644
Data export fix + async exports + more tests (#989) 
* 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
 2026-02-21 11:28:21 +00:00
Mahad Kalam
ef50839744
Fix modal close button alignment when icon is present (#988) 
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.
 2026-02-20 18:44:23 +00:00
Mahad Kalam
d3af585822
Several tests and fixes. (#987) 
* 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!
 2026-02-20 15:30:48 +00:00
Mahad Kalam
694526ded9
Small README tweaks (#986) 
Updated README.md with new images and documentation link.
 2026-02-20 06:21:23 +00:00
dependabot[bot]
2dda452270
Bump good_job from 4.13.2 to 4.13.3 (#982) 
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](https://github.com/bensheldon/good_job/compare/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>
 2026-02-20 06:19:43 +00:00
Mahad Kalam
e3456be187
goaaaal! (#985) 
* 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>
 2026-02-19 18:47:01 +00:00
ShyMike
a5ad8bf6cb
Add heatmap to badges page (#981) 
* add heatmap to badges page

* fix: add hash + fmt

* Fix slashes

---------

Co-authored-by: Mahad Kalam <55807755+skyfallwastaken@users.noreply.github.com>
 2026-02-19 16:06:53 +00:00
Nathan
891b28b01a Add start/end date to admin projects 2026-02-18 10:28:12 -05:00
Mahad Kalam
f6ed964b2f
Use Bun for deps (#980) 
* Use Bun for deps

* Oops, formatting
 2026-02-18 09:11:15 +00:00
Mahad Kalam
5aabfe8fa7
UI fixes (#979) 
* Small UI fixes

* OAuth2 applications tweaks
 2026-02-18 09:02:13 +00:00
Mahad Kalam
3fdc2bfced
Small tweaks to /wakatime-alternative (#978) 2026-02-18 08:41:33 +00:00
Mahad Kalam
17d9679547
llms.txt/llms-full.txt/.md docs routes, SSR (#977) 
* 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>
 2026-02-18 08:34:06 +00:00
Mahad Kalam
3fbc925572
Remove unused ERBs, /wakatime-alternative (#976) 
* Remove unused ERBs, /wakatime-alternative

* Update grid icons

* Fix classes
 2026-02-18 06:44:27 +00:00
Mahad Kalam
32c97bbf1b Merge branch 'main' of https://github.com/hackclub/hackatime 2026-02-18 01:16:34 +00:00
Mahad Kalam
6b3f6d3adb GSC verify 2026-02-18 01:16:24 +00:00
Mahad Kalam
79c6bb80b2
Allow disabling Hackatime v1 import via Flipper flag (#975) 
* Allow disabling Hackatime v1 import via Flipper flag

* Handle Greptile suggestion
 2026-02-18 00:46:33 +00:00
Mahad Kalam
535eae15cd
Update Gemfile.lock (#974) 2026-02-18 00:28:09 +00:00
Mat Manna
ac4073c7e9
Update some homepage stuff (#972) 
* 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>
 2026-02-18 00:25:07 +00:00
Mahad Kalam
4077de8206
Fix contrast on select items (#973) 2026-02-18 00:09:33 +00:00
Mahad Kalam
3f5470464a
New signed out page, new sign in page, no minimal login, fix redirect (#968) 
* New signed out page, new sign in page, no minimal login, fix redirect
issue

* Format + deps

* Implement that fix

* Readd the numbers

* Remove the +s
 2026-02-17 17:08:11 +00:00
Mahad Kalam
ef94a9da9d
OAuth2 apps inertia'd! (#966) 
* OAuth2 apps Inertia'd!

* Rose Pine/Rose Pine Dawn themes!

* Run formatting pass

* add some tests?
 2026-02-17 13:45:44 +00:00
dependabot[bot]
8adf2a7fce
Bump actions/setup-node from 5 to 6 (#960) 
Bumps [actions/setup-node](https://github.com/actions/setup-node) from 5 to 6.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v5...v6)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-version: '6'
  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>
 2026-02-16 23:40:17 +00:00
Mahad Kalam
7dd45cd965
Stop preloading rails_modals on Firefox (#965) 2026-02-16 23:37:59 +00:00
Mahad Kalam
f3350234f5
Modals! New projects page! Better dev imports! Fix OAuth2 projects! (#958) 
* Modals! New projects page!

* Update modal close buttons

* Make progress bar better

* Various fixes + tests

* Formatting

* Fix tests?
 2026-02-16 23:11:25 +00:00