Skip to content

Merge master into development #389

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 32 commits into from
Mar 9, 2021
Merged

Merge master into development #389

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
b5220bb
First attempt at datagrid quick filters
Lukeaber Feb 27, 2020
9ac0c1c
Make tableheader a controlled component and rename pillbuilder
Lukeaber Mar 18, 2020
541ec0f
Merge pull request #280 from puppetlabs/development
vine77 Aug 21, 2020
7fc2551
Merge pull request #286 from puppetlabs/development
vine77 Aug 24, 2020
23c03f3
Merge pull request #294 from puppetlabs/development
vine77 Aug 27, 2020
96636e0
Merge pull request #297 from puppetlabs/development
vine77 Sep 2, 2020
7a7a95b
Merge branch 'development'
vine77 Sep 16, 2020
593649d
merge with master
Lukeaber Sep 28, 2020
c1db98d
fix failing tests
Lukeaber Sep 28, 2020
aa013c0
fix broken docs
Lukeaber Sep 28, 2020
5745246
Merge pull request #308 from puppetlabs/development
vine77 Sep 30, 2020
3188c08
Merge pull request #323 from puppetlabs/development
sebastian-adam Oct 7, 2020
e3a7123
Merge pull request #224 from puppetlabs/Data-Grid-Quick-Filter
melcherry98 Oct 7, 2020
169bda1
Merge pull request #326 from puppetlabs/development
vine77 Oct 8, 2020
742c860
Merge branch 'development'
vine77 Oct 8, 2020
59e84a4
Merge pull request #337 from puppetlabs/development
melcherry98 Oct 12, 2020
3de5b11
Merge branch 'development'
vine77 Oct 15, 2020
6e57810
Merge pull request #349 from puppetlabs/development
vine77 Oct 22, 2020
63246d3
Merge pull request #350 from puppetlabs/development
vine77 Oct 27, 2020
eb15ba1
Merge pull request #356 from puppetlabs/development
vine77 Nov 3, 2020
2e5a35f
Merge pull request #362 from puppetlabs/development
vine77 Nov 10, 2020
aa8bd06
(MAINT) Rev react components for sorting bug
Lukeaber Nov 10, 2020
7743b7c
Merge pull request #363 from puppetlabs/MAINT-DataGrid-Sort-Bug
vine77 Nov 10, 2020
5d9b126
Merge pull request #364 from puppetlabs/development
vine77 Nov 10, 2020
5d4ee35
Merge branch 'development'
vine77 Jan 7, 2021
875329b
Merge pull request #375 from puppetlabs/development
vine77 Jan 8, 2021
7e9588f
Merge pull request #377 from puppetlabs/development
vine77 Jan 27, 2021
8fc6fc2
Merge pull request #378 from puppetlabs/development
vine77 Jan 27, 2021
0b1b379
Merge pull request #380 from puppetlabs/development
vine77 Feb 1, 2021
f28d100
Merge pull request #382 from puppetlabs/development
vine77 Feb 10, 2021
61e214b
Merge pull request #383 from puppetlabs/development
vine77 Feb 10, 2021
3634cc7
Merge pull request #385 from puppetlabs/development
vine77 Feb 24, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,6 @@
},
"engines": {
"node": "12.4.0"
}
},
"dependencies": {}
}
2 changes: 1 addition & 1 deletion packages/data-grid/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"react-dom": "^16.13.0"
},
"dependencies": {
"@puppet/react-components": "^5.22.0",
"@puppet/react-components": "^5.25.1",
"@puppet/sass-variables": "^1.4.3",
"classnames": "^2.2.6",
"init": "^0.1.2",
Expand Down
Loading