Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
colintucker committed Jun 12, 2018
2 parents 2412d75 + 2aaba2d commit 37165d4
Show file tree
Hide file tree
Showing 7 changed files with 5,212 additions and 3,997 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -135,9 +135,9 @@ for more information.

## Maintainers

[![Colin Tucker](https://avatars3.githubusercontent.com/u/1853705?s=144)](https://github.com/colintucker) | [![Praxis Interactive](https://avatars2.githubusercontent.com/u/1782612?s=144)](http://www.praxis.net.au)
[![Colin Tucker](https://avatars3.githubusercontent.com/u/1853705?s=144)](https://github.com/colintucker) | [![Praxis Interactive](https://avatars2.githubusercontent.com/u/1782612?s=144)](https://www.praxis.net.au)
---|---
[Colin Tucker](https://github.com/colintucker) | [Praxis Interactive](http://www.praxis.net.au)
[Colin Tucker](https://github.com/colintucker) | [Praxis Interactive](https://www.praxis.net.au)

## License

Expand Down
2 changes: 1 addition & 1 deletion admin/client/dist/js/bundle.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 4 additions & 4 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@
"name": "Colin Tucker",
"role": "Developer",
"email": "colin@praxis.net.au",
"homepage": "http://www.praxis.net.au"
"homepage": "https://www.praxis.net.au"
}
],
"require": {
"php": ">=5.6.0",
"silverstripe/admin": "^1@dev",
"silverstripe/framework": "^4@dev",
"silverstripe/versioned": "^1@dev"
"silverstripe/admin": "^1.0",
"silverstripe/framework": "^4.0",
"silverstripe/versioned": "^1.0"
},
"autoload": {
"psr-4": {
Expand Down
37 changes: 21 additions & 16 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
{
"name": "Colin Tucker",
"email": "colin@praxis.net.au",
"url": "http://www.praxis.net.au"
"url": "https://www.praxis.net.au"
}
],
"repository": {
Expand All @@ -27,28 +27,33 @@
"url": "https://github.com/praxisnetau/silverware-model-filters/issues"
},
"engines": {
"node": "^4.2.0"
"node": "^8.x"
},
"scripts": {
"watch": "webpack --env.development --colors --watch",
"build": "webpack --env.production --colors --optimize-minimize"
"build": "webpack --env.production --colors --progress --optimize-minimize"
},
"dependencies": {},
"devDependencies": {
"autoprefixer": "^7.1.5",
"autoprefixer": "^8.2.0",
"babel-core": "^6.26.0",
"babel-loader": "^7.1.2",
"babel-preset-env": "^1.6.0",
"clean-webpack-plugin": "^0.1.17",
"css-loader": "^0.28.7",
"extract-text-webpack-plugin": "^3.0.1",
"file-loader": "^1.1.5",
"node-sass": "^4.5.3",
"postcss-loader": "^2.0.6",
"sass-loader": "^6.0.6",
"style-loader": "^0.19.0",
"url-loader": "^0.6.2",
"webpack": "^3.6.0"
"babel-loader": "^7.1.4",
"babel-preset-env": "^1.6.1",
"clean-webpack-plugin": "^0.1.19",
"copy-webpack-plugin": "^4.5.1",
"css-loader": "^0.28.11",
"extract-text-webpack-plugin": "^3.0.2",
"file-loader": "^1.1.11",
"node-sass": "^4.8.3",
"postcss-loader": "^2.1.3",
"resolve-url-loader": "^2.3.0",
"sass-loader": "^6.0.7",
"style-loader": "^0.20.3",
"svgo": "^1.0.5",
"svgo-loader": "^2.1.0",
"uglifyjs-webpack-plugin": "^1.2.4",
"url-loader": "^1.0.1",
"webpack": "^3.11.0"
},
"babel": {
"presets": [
Expand Down
9 changes: 8 additions & 1 deletion postcss.config.js
Original file line number Diff line number Diff line change
@@ -1 +1,8 @@
module.exports = {};
/* PostCSS Configuration
===================================================================================================================== */

module.exports = {
plugins: [
require('autoprefixer')
]
};

0 comments on commit 37165d4

Please sign in to comment.