Skip to content

Commit

Permalink
Merge pull request #72 from shzlw/0.12.1
Browse files Browse the repository at this point in the history
Fix multi series data issue on bar, line and area chart
  • Loading branch information
shzlw authored May 13, 2020
2 parents af41bd8 + df19e50 commit 1129ebd
Show file tree
Hide file tree
Showing 12 changed files with 155 additions and 151 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ FROM openjdk:8-jre-alpine

WORKDIR /app

COPY --from=builder /app/src/target/poli-0.12.0.jar /app/poli-0.12.0.jar
COPY --from=builder /app/src/target/poli-0.12.1.jar /app/poli-0.12.1.jar
COPY --from=builder /app/src/db/poli.db /app/db/poli.db
COPY --from=builder /app/src/build_release/start.sh /app/start.sh
COPY --from=builder /app/src/config/poli.docker.properties /app/config/poli.properties
Expand Down
6 changes: 3 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# **Poli(魄力)**

[![Version](https://img.shields.io/badge/Version-0.12.0-0065FF.svg)](#)
[![Version](https://img.shields.io/badge/Version-0.12.1-0065FF.svg)](#)
[![license: MIT](https://img.shields.io/badge/license-MIT-FF5630.svg)](https://opensource.org/licenses/MIT)
[![Download](https://img.shields.io/github/downloads/shzlw/poli/total.svg?color=6554C0)](https://github.com/shzlw/poli/releases)
[![Docker Pulls](https://img.shields.io/docker/pulls/zhonglu/poli.svg)](https://cloud.docker.com/u/zhonglu/repository/docker/zhonglu/poli)
Expand Down Expand Up @@ -56,13 +56,13 @@ Auto refresh, drill through, fullscreen, embeds, color themes + more features in
Windows/Linux

```sh
java -jar poli-0.12.0.jar
java -jar poli-0.12.1.jar
```

Docker

```sh
docker run -d -p 6688:6688 --name poli zhonglu/poli:0.12.0
docker run -d -p 6688:6688 --name poli zhonglu/poli:0.12.1
```

Check [installation guide](https://shzlw.github.io/poli/#/installation) for more details.
Expand Down
2 changes: 1 addition & 1 deletion build_release/start.bat
Original file line number Diff line number Diff line change
@@ -1 +1 @@
java -jar poli-0.12.0.jar --spring.config.name=application,poli
java -jar poli-0.12.1.jar --spring.config.name=application,poli
2 changes: 1 addition & 1 deletion build_release/start.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
set -e

java -jar poli-0.12.0.jar --spring.config.name=application,poli
java -jar poli-0.12.1.jar --spring.config.name=application,poli
5 changes: 5 additions & 0 deletions docs/change-logs.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# Change Logs

## v0.12.1

### Bug Fixes
- Fix the issue that bar, line and area chart display wrong data when multi series option is checked in the chart option.

## v0.12.0

### Upgrade Steps
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@
1. Pull and run the Poli image.

```bash
docker run -d -p 6688:6688 --name poli zhonglu/poli:0.12.0
docker run -d -p 6688:6688 --name poli zhonglu/poli:0.12.1
```
2. Add JDBC drivers.

Expand Down
2 changes: 1 addition & 1 deletion pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<groupId>com.shzlw.poli</groupId>
<artifactId>poli</artifactId>
<packaging>jar</packaging>
<version>0.12.0</version>
<version>0.12.1</version>
<name>Poli</name>
<description>The SQL BI tool</description>

Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/shzlw/poli/util/Constants.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ public final class Constants {

private Constants() {}

public static final String CURRENT_VERSION = "0.12.0";
public static final String CURRENT_VERSION = "0.12.1";

public static final String SUCCESS = "success";
public static final String GOOD = "";
Expand Down
2 changes: 1 addition & 1 deletion version
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/bin/sh
VERSION=0.12.0
VERSION=0.12.1

echo $VERSION
73 changes: 20 additions & 53 deletions web-app/package-lock.json

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

2 changes: 1 addition & 1 deletion web-app/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "poli-web-app",
"version": "0.12.0",
"version": "0.12.1",
"private": true,
"dependencies": {
"@fortawesome/fontawesome-svg-core": "^1.2.28",
Expand Down
Loading

0 comments on commit 1129ebd

Please sign in to comment.