Skip to content

Commit 3e5710c

Browse files
SantiagoDePoloniaSantiagoDePolonia
committed
Merge remote-tracking branch 'origin/main' into feature/usage-per-user-tracking
# Conflicts: # internal/admin/dashboard/static/js/modules/execution-plans.js # internal/auditlog/reader_postgresql.go # internal/auditlog/reader_sqlite.go # internal/auditlog/store_postgresql.go # internal/auditlog/store_postgresql_test.go # internal/auditlog/store_sqlite.go # internal/auditlog/store_sqlite_test.go
2 parents b76cd60 + 64320e7 commit 3e5710c

40 files changed

Lines changed: 3201 additions & 860 deletions

‎docs/plans/token-usage-tracking.md‎

Lines changed: 0 additions & 331 deletions
This file was deleted.

‎internal/admin/dashboard/dashboard.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ type Handler struct {
2222

2323
// New creates a new dashboard handler with parsed templates and static file server.
2424
func New() (*Handler, error) {
25-
tmpl, err := template.ParseFS(content, "templates/layout.html", "templates/index.html", "templates/date-picker.html")
25+
tmpl, err := template.ParseFS(content, "templates/*.html")
2626
if err != nil {
2727
return nil, err
2828
}

0 commit comments

Comments
 (0)