Skip to content
Snippets Groups Projects
Commit 4652ca6e authored by Allen Gilliland's avatar Allen Gilliland
Browse files

Merge pull request #555 from metabase/hotfix-0.9.3

merge Hotfix 0.9.3 into master
parents 68e652da 70ebd60c
No related branches found
No related tags found
No related merge requests found
......@@ -144,7 +144,9 @@ export default React.createClass({
if (value && value.length > 0) {
// value casting. we need the value in the filter to be of the proper type
if (this.state.fieldDef.base_type === "IntegerField" ||
if (this.state.fieldDef.special_type === "timestamp_milliseconds" ||
this.state.fieldDef.special_type === "timestamp_seconds") {
} else if (this.state.fieldDef.base_type === "IntegerField" ||
this.state.fieldDef.base_type === "SmallIntegerField" ||
this.state.fieldDef.base_type === "BigIntegerField") {
value = parseInt(value);
......
......@@ -51,7 +51,7 @@ module.exports = {
{ test: /\.js$/, exclude: /node_modules/, loader: 'babel', query: { cacheDirectory: '.babel_cache' }},
{ test: /\.js$/, exclude: /node_modules|\.spec\.js/, loader: 'eslint' },
// CSS
{ test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader?sourceMap!cssnext-loader') }
{ test: /\.css$/, loader: ExtractTextPlugin.extract('style-loader', 'css-loader?-restructuring&compatibility!cssnext-loader') }
// { test: /\.css$/, loader: 'style-loader!css-loader!cssnext-loader' }
],
noParse: [
......@@ -125,7 +125,8 @@ module.exports = {
},
import: {
path: ['resources/frontend_client/app/css']
}
},
compress: false
},
// SourceMaps
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment