Skip to content

Commit

Permalink
release: 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@ruibaby
ruibaby committed Mar 28, 2020
1 parent 76cbf46 commit c353411
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 13 deletions.
7 changes: 7 additions & 0 deletions CHANGELOG.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,12 @@
# CHANGELOG

# 1.3.1

# Fixed

- 修复自定义页面设置中的地址预览出现 undefined 的问题。
- 升级 fastjson 版本为 `1.2.67`。

# 1.3.0

## Feature
Expand Down
50 changes: 42 additions & 8 deletions CONTRIBUTING.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,48 @@
### 开发步骤

1. `Fork` 本仓库到你自己的 Github。
2. `Clone` 你刚刚 Fork 的仓库到本地。
3. 执行 `git checkout dev` 切换到 `dev` 分支并进行开发。
4. 提交代码到自己的仓库。
5. 回到自己的仓库页面，选择 `New pull request` 按钮，创建 `Pull request` 到原仓库的 `dev` 分支。
6. 等待合并。
#### 1. Fork 此仓库

点击右上角的 `fork` 按钮即可。

#### 2. Clone 仓库到本地

```bash
git clone https://github.com/{YOUR_USERNAME}/halo

git submodule init

git submodule update
```

#### 3. 创建新的开发分支

```bash
git checkout -b {BRANCH_NAME}
```

#### 4. 提交代码

```bash
git push origin {BRANCH_NAME}
```

#### 5. 提交 pull request

回到自己的仓库页面，选择 `New pull request` 按钮，创建 `Pull request` 到原仓库的 `master` 分支。

然后等待我们 Review 即可，如有 `Change Request`，再本地修改之后再次提交即可。

#### 6. 更新主仓库代码到自己的仓库

```bash
git remote add upstream [email protected]:halo-dev/halo.git

git pull upstream master

git push
```

### 开发规范

1. 在提交前请使用 IDE 格式化代码。
2. 不接受创建 `Pull request` 到 `master` 分支。
请参考 [https://halo.run/archives/code-style](https://halo.run/archives/code-style)，请确保所有代码格式化之后再提交。
6 changes: 3 additions & 3 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
另外，写给想自己拉代码编译运行的同学：

> 目前我们的开发分支即 master，肯定会有很多小问题，不要运行不起来就跑过来吐槽什么代码开源不完整之类的，多找找自己的原因。同时建议下载最新 release 版本的代码，或者在 master 分支执行 `git checkout v1.3.0`。
> 目前我们的开发分支即 master，肯定会有很多小问题，不要运行不起来就跑过来吐槽什么代码开源不完整之类的，多找找自己的原因。同时建议下载最新 release 版本的代码，或者在 master 分支执行 `git checkout v1.3.1`。
PS：实在不想写这个声明（影响 README 的美观），但是就目前来看，写在 README 上是有必要的，因为大部分遇到问题的人都不会去仔细阅读文档。

Expand All @@ -35,13 +35,13 @@ PS：实在不想写这个声明（影响 README 的美观），但是就目前
### 下载最新的 Halo 安装包

```bash
curl -L https://github.com/halo-dev/halo/releases/download/v1.3.0/halo-1.3.0.jar --output halo-latest.jar
curl -L https://github.com/halo-dev/halo/releases/download/v1.3.1/halo-1.3.1.jar --output halo-latest.jar
```

或者

```bash
wget https://github.com/halo-dev/halo/releases/download/v1.3.0/halo-1.3.0.jar -O halo-latest.jar
wget https://github.com/halo-dev/halo/releases/download/v1.3.1/halo-1.3.1.jar -O halo-latest.jar
```

### 启动 Halo
Expand Down
2 changes: 1 addition & 1 deletion build.gradle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

group = "run.halo.app"
version = "1.3.0"
version = "1.3.1"
description = "Halo, An excellent open source blog publishing application."

java {
Expand Down
2 changes: 1 addition & 1 deletion src/main/resources/admin/index.html
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<!DOCTYPE html><html lang=zh-cmn-Hans><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name=robots content=noindex,nofllow><meta name=generator content="Halo 1.3.0"><link rel=icon href=https://cdn.jsdelivr.net/npm/[email protected]/dist/logo.png><title>Halo Dashboard</title><style>body {height: 100%;background-color: #f5f5f5;}#loader{position:absolute;top:0;right:0;bottom:0;left:0;margin:auto;border:solid 3px #e5e5e5;border-top-color:#333;border-radius:50%;width:30px;height:30px;animation:spin .6s linear infinite}@keyframes spin{to{transform:rotate(360deg)}}</style><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-0b44f908.c76aeee1.css rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-39955e50.e76ee991.css rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-7e9c61cd.e32891ce.css rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-966610cc.be194fd2.css rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-d88240c2.473c30ca.css rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-068aa3f1.8ec27c3f.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-0b44f908.85c7e697.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-17f8cd22.d7a31ff5.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-1b10433b.bb15655d.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-27659703.d9966ea2.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d0b383e.ef3a6907.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d0b64bf.ffef597d.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d0b8b03.7bffbc1d.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d0ba57a.ac4bcfd4.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d0cf13d.67bc9b1f.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d213307.6cc73546.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d2165e6.d03ad4d7.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d221c57.0102f040.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d228c74.f4e59128.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d228d13.1d49167d.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-39955e50.2030857e.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-3c38e9a4.ae2cbb9c.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-528a0184.87af25a5.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-5889a1fc.c001b76f.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-5b9394ac.aa568c46.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-76ee4b7f.5153e8c1.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-7e9c61cd.d4d0a98f.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-966610cc.0b1d0392.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-a87c1354.4ed085fa.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-d88240c2.751db3ef.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-db6b8cbe.f2d5d605.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-ec5bbb3c.930c6e0b.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-f04cc1dc.afbaf3e8.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/app.98eb780d.css rel=preload as=style><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-vendors.fbe63da7.css rel=preload as=style><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/app.675317f0.js rel=preload as=script><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-vendors.631888d9.js rel=preload as=script><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-vendors.fbe63da7.css rel=stylesheet><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/app.98eb780d.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app><div id=loader></div></div><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/vue.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/vue-router.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/vuex.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/axios.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/marked.min.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-vendors.631888d9.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/app.675317f0.js></script></body></html>
<!DOCTYPE html><html lang=zh-cmn-Hans><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><meta name=viewport content="width=device-width,initial-scale=1,maximum-scale=1,user-scalable=no"><meta name=robots content=noindex,nofllow><meta name=generator content="Halo 1.3.1"><link rel=icon href=https://cdn.jsdelivr.net/npm/[email protected]/dist/logo.png><title>Halo Dashboard</title><style>body {height: 100%;background-color: #f5f5f5;}#loader{position:absolute;top:0;right:0;bottom:0;left:0;margin:auto;border:solid 3px #e5e5e5;border-top-color:#333;border-radius:50%;width:30px;height:30px;animation:spin .6s linear infinite}@keyframes spin{to{transform:rotate(360deg)}}</style><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-0b44f908.c76aeee1.css rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-39955e50.e76ee991.css rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-7e9c61cd.e32891ce.css rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-966610cc.be194fd2.css rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-d88240c2.473c30ca.css rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-068aa3f1.9fd01737.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-0b44f908.d38ba511.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-17f8cd22.50e1f573.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-1b10433b.72c2bfbf.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-27659703.4997e8a6.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d0b383e.2da77176.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d0b64bf.6c825e9d.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d0b8b03.b0e0f097.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d0ba57a.2e266bff.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d0cf13d.7eb056ef.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d213307.7d9d9327.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d2165e6.cb7785ab.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d221c57.1acf57e2.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d228c74.36d6365d.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-2d228d13.d0b46ad5.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-39955e50.a9d6a67e.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-3c38e9a4.4756dd5b.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-528a0184.9589fa7f.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-5889a1fc.e135b083.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-5b9394ac.88318890.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-76ee4b7f.74cb165d.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-7e9c61cd.b43174eb.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-966610cc.a1bf1074.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-a87c1354.b04d264f.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-d88240c2.50d66964.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-db6b8cbe.d569caeb.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-ec5bbb3c.f883c5bc.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-f04cc1dc.116082fa.js rel=prefetch><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/app.98eb780d.css rel=preload as=style><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-vendors.96b7842f.css rel=preload as=style><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/app.9e02d773.js rel=preload as=script><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-vendors.cae1e3cb.js rel=preload as=script><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/chunk-vendors.96b7842f.css rel=stylesheet><link href=https://cdn.jsdelivr.net/npm/[email protected]/dist/css/app.98eb780d.css rel=stylesheet></head><body><noscript><strong>We're sorry but vue-antd-pro doesn't work properly without JavaScript enabled. Please enable it to continue.</strong></noscript><div id=app><div id=loader></div></div><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/chunk-vendors.cae1e3cb.js></script><script src=https://cdn.jsdelivr.net/npm/[email protected]/dist/js/app.9e02d773.js></script></body></html>

0 comments on commit c353411

Please sign in to comment.