Merge pull request #5580 from metabase/release-0.25.0

Merge Release 0.25.0 back in (again)

bin/version

 #!/usr/bin/env bash
 
-VERSION="v0.25.0.RC2"
+VERSION="v0.25.0"
 
 # dynamically pull more interesting stuff from latest git commit
 HASH=$(git show-ref --head --hash=7 head)            # first 7 letters of hash should be enough; that's what GitHub uses

frontend/src/metabase/visualizations/components/LineAreaBarChart.jsx

@@ -96,7 +96,9 @@ export default class LineAreaBarChart extends Component {
         }
 
         // both or neither primary dimension must be numeric
-        if (isNumeric(initialDimensions[0]) !== isNumeric(newDimensions[0])) {
+        // a timestamp field is both date and number so don't enforce the condition if both fields are dates; see #2811
+        if ((isNumeric(initialDimensions[0]) !== isNumeric(newDimensions[0])) &&
+            !(isDate(initialDimensions[0]) && isDate(newDimensions[0]))) {
             return false;
         }