Commit fed15be
merge: resolve conflicts with main branch
DBEditTimeChartForm.tsx was refactored into a directory on main (PR #2026).
Applied our changes (getTraceDurationNumberFormat import, autoDetectedNumberFormat
computation, defaultNumberFormat prop on ChartDisplaySettingsDrawer) to the
new EditTimeChartForm.tsx file. Deleted the old monolithic file.
Co-authored-by: Mike Shi <mike@hyperdx.io>File tree
150 files changed
+7029
-2853
lines changed- .changeset
- .claude/skills/playwright
- .github/workflows
- agent_docs
- packages
- api
- src
- controllers
- models
- routers/api
- __tests__
- app
- src
- __tests__
- components
- DBEditTimeChartForm
- __tests__
- DBSearchPageFilters
- Dashboards
- SQLEditor
- SavedSearches
- __tests__
- charts
- hooks
- tests/e2e
- components
- core
- features
- search
- fixtures
- page-objects
- common-utils
- src
- __tests__
- core
- otel-collector
- scripts/dev-portal
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
150 files changed
+7029
-2853
lines changedThis file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
This file was deleted.
This file was deleted.
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
This file was deleted.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| 2 | + | |
| 3 | + | |
| 4 | + | |
| 5 | + | |
This file was deleted.
This file was deleted.
0 commit comments