Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

M

Metabase
- Activity
- Members
- Labels
- Issues
- Issue boards
- Milestones
- Iterations
- Wiki
- Requirements
- Environments
- Terraform modules
- Incidents
- Service Desk

Snippets Groups Projects

6b3d1111

Commit 6b3d1111 authored 7 years ago by Tom Robinson

Downloads
- Plain Diff

Merge branch 'dash-filter-search-widget' of github.com:metabase/metabase into...

Merge branch 'dash-filter-search-widget' of github.com:metabase/metabase into dash-filter-new-endpoints

parents f5a158fa 0e3ed52a

No related branches found

No related tags found

No related merge requests found

Changes 10

Hide whitespace changes

Inline Side-by-side

Showing

frontend/src/metabase-lib/lib/queries/StructuredQuery.js 2 additions, 3 deletions

frontend/src/metabase-lib/lib/queries/StructuredQuery.js
frontend/src/metabase/components/FieldValuesWidget.jsx 39 additions, 5 deletions

frontend/src/metabase/components/FieldValuesWidget.jsx
frontend/src/metabase/components/TokenField.jsx 83 additions, 23 deletions

frontend/src/metabase/components/TokenField.jsx
frontend/src/metabase/query_builder/components/filters/FilterPopover.jsx 1 addition, 0 deletions

...tabase/query_builder/components/filters/FilterPopover.jsx
frontend/test/admin/datamodel/datamodel.integ.spec.js 4 additions, 0 deletions

frontend/test/admin/datamodel/datamodel.integ.spec.js
frontend/test/components/FieldValuesWidget.unit.spec.js 7 additions, 7 deletions

frontend/test/components/FieldValuesWidget.unit.spec.js
frontend/test/internal/__snapshots__/components.unit.spec.js.snap 18 additions, 18 deletions

.../test/internal/__snapshots__/components.unit.spec.js.snap
frontend/test/metabase-lib/queries/StructuredQuery.unit.spec.js 11 additions, 11 deletions

...nd/test/metabase-lib/queries/StructuredQuery.unit.spec.js
frontend/test/query_builder/qb_editor_bar.integ.spec.js 5 additions, 3 deletions

frontend/test/query_builder/qb_editor_bar.integ.spec.js
package.json 1 addition, 1 deletion

package.json

with 171 additions and 71 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment