Merge pull request #309 from orlabs/v0.8.0

V0.8.0

Makefile

@@ -27,7 +27,7 @@ else
 endif
 	$(INSTALL) conf/nginx.conf.example conf/nginx.conf
 	$(INSTALL) conf/orange.conf.example conf/orange.conf
-	$(INSTALL) install/orange-v0.7.0.sql conf/orange-v0.7.0.sql
+	$(INSTALL) install/orange-v0.8.0.sql conf/orange-v0.8.0.sql
 
 
 ### install:      Install the Orange
@@ -41,7 +41,7 @@ install:
 	$(INSTALL) conf/nginx.conf.example /usr/local/orange/conf/nginx.conf
 	$(INSTALL) conf/orange.conf.example /usr/local/orange/conf/orange.conf
 	$(INSTALL) conf/mime.types /usr/local/orange/conf/mime.types
-	$(INSTALL) install/orange-v0.7.0.sql /usr/local/orange/conf/orange-v0.7.0.sql
+	$(INSTALL) install/orange-v0.8.0.sql /usr/local/orange/conf/orange-v0.8.0.sql
 
 	$(INSTALL) -d $(INST_LUADIR)/orange/dashboard
 	$(INSTALL) -d $(INST_LUADIR)/orange/orange

README.md

@@ -21,10 +21,6 @@ System dependencies (`openresty`, `resty-cli`, `luarocks`, etc.) necessary to in
 
 Check the [official documentation](https://github.com/sumory/lor) for `Lor Framework` or execute the following command.
 
- - Orange v0.6.1 and versions before v0.6.1 are compatible with lor v0.2.*
-
- - Orange v0.6.2+ is compatible with lor v0.3.0+
-
 ```bash
 git clone https://github.com/sumory/lor.git
 cd lor
@@ -38,15 +34,15 @@ curl -Lo install.sh https://raw.githubusercontent.com/orlabs/orange/master/insta
 sudo sh install.sh
 ```
 
-After the installation process is completed, the output message `orange 0.7-0 is now installed in /usr/local/orange/deps (license: MIT)` indicates that the installation was successful.
+After the installation process is completed, the output message `orange 0.8-0 is now installed in /usr/local/orange/deps (license: MIT)` indicates that the installation was successful.
 
 #### 4) Import MySQL
 
 Requirements: MySQL Version 5.5+
 
  - Login to the `MySQL` client, create an `orange` database.
 
- - Import the data table (`/usr/local/orange/conf/orange-v0.7.0.sql`).
+ - Import the data table (`/usr/local/orange/conf/orange-v0.8.0.sql`).
 
  - Modify the `Orange` configuration file (`/usr/local/orange/conf/orange.conf`) `MySQL` related configuration.
 
@@ -77,7 +73,7 @@ cd orange
 sodu make dev
 ```
 
-After the installation process is completed, the output message `Stopping after installing dependencies for orange 0.7-0` indicates that the installation was successful.
+After the installation process is completed, the output message `Stopping after installing dependencies for orange-master 1.0-0` indicates that the installation was successful.
 
 #### 3) Import MySQL
 

README_zh.md

@@ -26,10 +26,6 @@
 
 查看`Lor Framework`[官方文档](https://github.com/sumory/lor)或执行以下命令。
 
- - 若使用的 `Orange` 版本低于 `v0.6.2` 则应安装 `lor v0.2.*` 版本。
-
- - 若使用的 `Orange` 版本高于或等于 `v0.6.2` 则应安装 `lor v0.3.0+` 版本。
-
 ```bash
 git clone https://github.com/sumory/lor.git
 cd lor
@@ -43,15 +39,15 @@ curl -Lo install.sh https://raw.githubusercontent.com/orlabs/orange/master/insta
 sudo sh install.sh
 ```
 
-安装过程结束后，输出消息 `orange 0.7-0 is now installed in /usr/local/orange/deps (license: MIT)` 即说明安装成功。
+安装过程结束后，输出消息 `orange 0.8-0 is now installed in /usr/local/orange/deps (license: MIT)` 即说明安装成功。
 
 #### 4) 导入 MySQL
 
 要求：`MySQL`版本 5.5+
 
  - 登录到 `MySQL` 客户端，创建一个 `orange` 数据库。
 
- - 导入数据表（`/usr/local/orange/conf/orange-v0.7.0.sql`）。
+ - 导入数据表（`/usr/local/orange/conf/orange-v0.8.0.sql`）。
 
  - 修改`Orange`配位置文件中（`/usr/local/orange/conf/orange.conf`）`MySQL`相关配置。
 
@@ -82,7 +78,7 @@ cd orange
 sudo make dev
 ```
 
-安装过程结束后，输出消息 `Stopping after installing dependencies for orange 0.7-0` 即说明安装成功。
+安装过程结束后，输出消息 `Stopping after installing dependencies for orange-master 1.0-0` 即说明安装成功。
 
 #### 3) 导入 MySQL
 

orange/version.lua

@@ -1,2 +1,2 @@
-local version = "0.7.0"
+local version = "0.8.0"
 return version