Skip to content

Commit a35c783

Browse files
Merge branch '_bump_dev-v4.0.0-alpha.2-local' into branch-4.0-dev-dist
2 parents f560428 + ca9d236 commit a35c783

File tree

53 files changed

+577
-280
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+577
-280
lines changed

Gruntfile.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ module.exports = function (grunt) {
132132
'node_modules/c3/c3.js',
133133
'node_modules/d3/d3.js',
134134
'node_modules/patternfly/dist/js/patternfly-settings.js',
135+
'node_modules/patternfly/dist/js/patternfly-settings-colors.js',
136+
'node_modules/patternfly/dist/js/patternfly-settings-charts.js',
135137
'node_modules/angular/angular.js',
136138
'node_modules/angular-datatables/dist/angular-datatables.min.js',
137139
'node_modules/angular-datatables/dist/plugins/select/angular-datatables.select.min.js',

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-patternfly",
3-
"version": "4.0.0-alpha.1",
3+
"version": "4.0.0-alpha.2",
44
"authors": [
55
"Red Hat"
66
],
@@ -45,7 +45,7 @@
4545
"angular-datatables": "^0.5.6",
4646
"datatables.net": "^1.10.12",
4747
"datatables.net-select": "~1.2.0",
48-
"patternfly": "~4.0.0-alpha.1"
48+
"patternfly": "~4.0.0-alpha.2"
4949
},
5050
"devDependencies": {
5151
"angular-mocks": "1.5.*",

dist/docs/grunt-scripts/angular-datatables.min.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/docs/grunt-scripts/angular-datatables.select.min.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)