main #36

Open
Araya wants to merge 7 commits from Araya/student-web-if-development-kit:main into main

7 Commits

Author SHA1 Message Date
Araya's Project ff00530922 Resolving conflict at localization.js 2026-06-12 10:01:00 +07:00
Araya's Project bb0f9567e8 resolve: merge upstream localization.js and preserve On Going filter labels
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
2026-06-12 09:59:34 +07:00
Araya 7141132c84 Resolve conflict at localization.js 2026-06-12 02:55:02 +00:00
Araya's Project 802a4c5d9a Resolving conflict at localization.js 2026-06-12 09:22:05 +07:00
Araya's Project 5f87c0ad28 New beasiswa.json 2026-06-12 08:53:27 +07:00
Araya's Project 7d290c2e8a New beasiswa.json 2026-06-12 08:51:18 +07:00
natban_8 511c65d360 feat: fix scholarship filter and add data reference date to statistics 2026-06-11 18:52:42 +07:00