Skip to content

Commit

Permalink
Merge branch 'origin' into coding
Browse files Browse the repository at this point in the history
* origin:
  feat: release 2.11.0 (apache#2361)
  feat: add data loader framework (apache#2371)
  feat: improve Consumer module (apache#2327)
  fix: ! (reverse) operator not handled correctly (apache#2364)
  chore: modify the select upstream field to upstream (apache#2344)
  feat: support protobuf on Web (apache#2320)
  chore: Extract paging related functions into standalone hook (apache#2334)
  feat: basic support Apache APISIX 2.12.1 (apache#2315)

# Conflicts:
#	web/src/helpers.tsx
#	web/yarn.lock
  • Loading branch information
Boolean committed Mar 13, 2022
2 parents fd63d12 + 2c563dc commit 99ee6c3
Show file tree
Hide file tree
Showing 42 changed files with 19,666 additions and 214 deletions.
30 changes: 30 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@

# Table of Contents

- [2.11.0](#2110)
- [2.10.1](#2101)
- [2.10.0](#2100)
- [2.9.0](#290)
Expand All @@ -37,6 +38,35 @@
- [1.5.0](#150)
- [1.0.0](#100)

# 2.11.0

This release contains some features and bugfixes, and all the existing functionalities are compatible with Apache APISIX 2.12.1.

### Core

feat: add data loader framework [#2371](https://github.com/apache/apisix-dashboard/pull/2371)
feat: support protobuf on Web [#2320](https://github.com/apache/apisix-dashboard/pull/2320)
feat: basic support Apache APISIX 2.12.1 [#2315](https://github.com/apache/apisix-dashboard/pull/2315)
feat: Add more fields to limit-count plugin [#2322](https://github.com/apache/apisix-dashboard/pull/2322)
feat: support APISIX_PROFILE for env-specific configuration [#2293](https://github.com/apache/apisix-dashboard/pull/2293)
feat(upstream): add upstream priority field [#2271](https://github.com/apache/apisix-dashboard/pull/2271)
feat(route): show route id in list and edit views [#2269](https://github.com/apache/apisix-dashboard/pull/2269)
feat(route): remove key-auth plugin tip [#2261](https://github.com/apache/apisix-dashboard/pull/2261)
feat: add rejected_msg field to limit-count plugin form [#2328](https://github.com/apache/apisix-dashboard/pull/2328)
feat: add rejected_msg field to limit-req plugin form [#2312](https://github.com/apache/apisix-dashboard/pull/2312)
chore: Create route form optimization [#2336](https://github.com/apache/apisix-dashboard/pull/2336)
chore: add loading in route page [#2287](https://github.com/apache/apisix-dashboard/pull/2287)
chore(upstream): remove default port for upstream health check [#2278](https://github.com/apache/apisix-dashboard/pull/2278)
style: add ellipsis for route table [#2317](https://github.com/apache/apisix-dashboard/pull/2317)

### Bugfix

fix: ! (reverse) operator not handled correctly [#2364](https://github.com/apache/apisix-dashboard/pull/2364)
fix: idle_timeout filed to support set zero value [#2296](https://github.com/apache/apisix-dashboard/pull/2296)
fix: retries field to support zero value [#2298](https://github.com/apache/apisix-dashboard/pull/2298)
fix: get current dir error [#2283](https://github.com/apache/apisix-dashboard/pull/2283)
style: remove extra margin value [#2300](https://github.com/apache/apisix-dashboard/pull/2300)

# 2.10.1

This release contains bugfix, and all the existing functionalities are compatible with Apache APISIX 2.11.0.
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@

- The master version should be used with Apache APISIX master version.

- The latest released version is [2.10.1](https://apisix.apache.org/downloads/) and is compatible with [Apache APISIX 2.11.0](https://apisix.apache.org/downloads/).
- The latest released version is [2.11.0](https://apisix.apache.org/downloads/) and is compatible with [Apache APISIX 2.12.1](https://apisix.apache.org/downloads/).

## What's Apache APISIX Dashboard

Expand Down
2 changes: 1 addition & 1 deletion api/VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.10.1
2.11.0
Loading

0 comments on commit 99ee6c3

Please sign in to comment.