diff --git a/docs/en-US/getting-started/installation/docker-compose.md b/docs/en-US/getting-started/installation/docker-compose.md index 0c77a1c8b..f174d7637 100644 --- a/docs/en-US/getting-started/installation/docker-compose.md +++ b/docs/en-US/getting-started/installation/docker-compose.md @@ -14,19 +14,43 @@ git clone https://github.com/nocobase/nocobase.git nocobase ## 2. Select database (choose one) -Supports SQLite, MySQL, PostgreSQL +Change the directory to the folder downloaded in the first step. ```bash -# SQLite -cd nocobase/docker/app-sqlite -# MySQL -cd nocobase/docker/app-mysql -# PostgreSQL -cd nocobase/docker/app-postgres +# MacOS, Linux... +cd /your/path/nocobase +# Windows +cd C:\your\path\nocobase +``` + +The docker configuration of different databases is slightly different, please choose to switch to the corresponding directory. + +### SQLite + +```bash +cd docker/app-sqlite +``` + +### MySQL + +```bash +cd docker/app-mysql +``` + +### PostgreSQL + +```bash +cd docker/app-postgres ``` ## 3. Configure docker-compose.yml (optional) + + +Non-developers skip this step. If you know development, you can also learn more about how to configure `docker-compose.yml`. + + + Directory structure (related to docker) ```bash diff --git a/docs/en-US/release-notes.md b/docs/en-US/release-notes.md index 39c010173..3820559c6 100644 --- a/docs/en-US/release-notes.md +++ b/docs/en-US/release-notes.md @@ -1,5 +1,45 @@ # Release Notes +## To be released + +- fix(plugin-multi-app-manager): fix pg cannot create database block tests +- refactor(database): hook proxy (#402) +- feat: chart blocks (#484) +- refactor(plugin workflow): support number in repeat config for schedule +- chore(debug): add debug config (#475) +- fix: has one bug +- feat: relationships (#473) +- fix(plugin-workflow): fix collection trigger transaction (#474) +- fix(plugin-workflow): temporary solution for collection trigger conditions +- fix: markdown component (#469) +- fix: formula field and percent field (#467) +- fix(plugin-workflow): fix update workflow action (#464) +- fix(acl): skip when field does not exist +- fix: update formula field and percent field (#461) +- fix(client): export useSignin and useSignup +- fix(ci): node_version = 14 +- fix(cli): yarn install --production error +- fix(client): build error +- feat: add formula field type (#457) +- fix: the details of the associated data in the subtable are not displayed +- fix(plugin-workflow): fix languages (#451) +- fix: afterSync hook not triggered (#450) + +## 2022/06/01 ~ v0.7.0-alpha.83 + +- fix: default value of time zone +- fix(database): add timezone support +- docs(various): Improve readability (#447) +- fix(client): datetime with timezone +- feat(plugin-file-manager): record the creator of the attachment +- feat: custom request (#439) +- feat(plugin workflow): schedule trigger (#438) +- feat(database): db migrator (#432) +- fix(client): select component cannot be opened in sub-table block (#431) +- fix: error message "error:0308010C:digital envelope routines::unsupported +- docs(github): change to markdown format (#430) +- fix(cli): typo (#429) + ## 2022/05/26 ~ v0.7.0-alpha.82 - feat(client,sdk): improve api client diff --git a/docs/zh-CN/getting-started/installation/docker-compose.md b/docs/zh-CN/getting-started/installation/docker-compose.md index a550837a4..7caf32113 100644 --- a/docs/zh-CN/getting-started/installation/docker-compose.md +++ b/docs/zh-CN/getting-started/installation/docker-compose.md @@ -14,19 +14,43 @@ git clone https://gitee.com/nocobase/nocobase.git nocobase ## 2. 选择数据库（任选其一） -支持 SQLite、MySQL、PostgreSQL 数据库 +将目录切换到第一步下载的文件夹里（根据实际情况调整）。 ```bash -# SQLite -cd nocobase/docker/app-sqlite -# MySQL -cd nocobase/docker/app-mysql -# PostgreSQL -cd nocobase/docker/app-postgres +# MacOS, Linux... +cd /your/path/nocobase +# Windows +cd C:\your\path\nocobase +``` + +不同数据库的 docker 配置有些许差异，请选择切换到对应的目录下。 + +### SQLite + +```bash +cd docker/app-sqlite +``` + +### MySQL + +```bash +cd docker/app-mysql +``` + +### PostgreSQL + +```bash +cd docker/app-postgres ``` ## 3. 配置 docker-compose.yml（非必须） + + +非开发人员，跳过这一步。如果你懂得开发，也可以进一步了解怎么配置 `docker-compose.yml`。 + + + 目录结构（与 docker 相关） ```bash diff --git a/docs/zh-CN/release-notes.md b/docs/zh-CN/release-notes.md index dc7437e76..1d30b9a47 100644 --- a/docs/zh-CN/release-notes.md +++ b/docs/zh-CN/release-notes.md @@ -1,5 +1,45 @@ # 更新日志 +## To be released + +- fix(plugin-multi-app-manager): fix pg cannot create database block tests +- refactor(database): hook proxy (#402) +- feat: chart blocks (#484) +- refactor(plugin workflow): support number in repeat config for schedule +- chore(debug): add debug config (#475) +- fix: has one bug +- feat: relationships (#473) +- fix(plugin-workflow): fix collection trigger transaction (#474) +- fix(plugin-workflow): temporary solution for collection trigger conditions +- fix: markdown component (#469) +- fix: formula field and percent field (#467) +- fix(plugin-workflow): fix update workflow action (#464) +- fix(acl): skip when field does not exist +- fix: update formula field and percent field (#461) +- fix(client): export useSignin and useSignup +- fix(ci): node_version = 14 +- fix(cli): yarn install --production error +- fix(client): build error +- feat: add formula field type (#457) +- fix: the details of the associated data in the subtable are not displayed +- fix(plugin-workflow): fix languages (#451) +- fix: afterSync hook not triggered (#450) + +## 2022/06/01 ~ v0.7.0-alpha.83 + +- fix: default value of time zone +- fix(database): add timezone support +- docs(various): Improve readability (#447) +- fix(client): datetime with timezone +- feat(plugin-file-manager): record the creator of the attachment +- feat: custom request (#439) +- feat(plugin workflow): schedule trigger (#438) +- feat(database): db migrator (#432) +- fix(client): select component cannot be opened in sub-table block (#431) +- fix: error message "error:0308010C:digital envelope routines::unsupported +- docs(github): change to markdown format (#430) +- fix(cli): typo (#429) + ## 2022/05/26 ~ v0.7.0-alpha.82 - feat(client,sdk): improve api client