merge dev

zekroTJA · Oct 27, 2020 · 34abc10 · 34abc10
2 parents 0c4c9e1 + 2ce1523
commit 34abc10
Show file tree

Hide file tree

Showing 10 changed files with 468 additions and 132 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,4 @@
-1.4.0-rc1
+1.4.0
 
 > MAJOR PATCH
 
@@ -16,7 +16,7 @@ To counteract this, the antiraid system constantly checks the rate of users join
 Of course, the antiraid system can be toggled and the trigger threshold values can be managed in the web interface *(if you have the `sp.guild.config.antiraid` permission)*.  
 ![](https://i.imgur.com/vLMgrM9.png)
 
-### Metrics Monitoring
+### Metrics Monitoring [#170]
 
 You are now able to monitor core metrics of shinpuru using Prometheus and Grafana.
 
@@ -30,7 +30,17 @@ metrics:
 [Here](https://github.com/zekroTJA/shinpuru/blob/master/config/prometheus/prometheus.yml) you can find an example Prometheus configuration and [here](https://github.com/zekroTJA/shinpuru/blob/master/config/grafana/example-dashboard.json) you can find an example grafana dashboard to monitor shinpuru's metrics.  
 
 *Example dashboard. Data from shinpuru Canary instance.*  
-![](https://i.imgur.com/Srr8CwE.png)
+![](https://i.imgur.com/fEkV7fe.png)
+
+
+## Minor Updates
+
+- Add aliases to `karma` command: `leaderboard`, `lb`, `sb` and `top`. [#181]
+- The `karma` command now shows the karma points of a user when specified as argument. [#179]
+
+## Bug Fixes
+
+- The web frontend route `/guilds/:guildid/guildadmin` now redirects to `/guilds/:guildid/guildadmin/antiraid` instead of firing errors. [#180]
 
 ## Backstage
 
@@ -42,5 +52,5 @@ metrics:
 
 Pull the docker image of this release:
 ```
-$ docker pull zekro/shinpuru:1.4.0-rc1
+$ docker pull zekro/shinpuru:1.4.0
 ```
diff --git a/bughunters.md b/bughunters.md
@@ -7,19 +7,20 @@ A list to honor all people who found some bugs, had some great ideas or contribu
 | [voxain](https://github.com/voxain) | [#52](https://github.com/zekroTJA/shinpuru/issues/52), [#61](https://github.com/zekroTJA/shinpuru/issues/61), [#67](https://github.com/zekroTJA/shinpuru/issues/67), [#147](https://github.com/zekroTJA/shinpuru/issues/147), [#148](https://github.com/zekroTJA/shinpuru/issues/148), [#150](https://github.com/zekroTJA/shinpuru/issues/150), [#153](https://github.com/zekroTJA/shinpuru/issues/153), [#159](https://github.com/zekroTJA/shinpuru/issues/159), [#163](https://github.com/zekroTJA/shinpuru/issues/163), [#165](https://github.com/zekroTJA/shinpuru/issues/165) |  | `10` |
 | [SnowLeoo](https://github.com/SnowLeoo) | [#129](https://github.com/zekroTJA/shinpuru/issues/129), [#145](https://github.com/zekroTJA/shinpuru/issues/145), [#169](https://github.com/zekroTJA/shinpuru/issues/169) | [#175](https://github.com/zekroTJA/shinpuru/pull/175), [#176](https://github.com/zekroTJA/shinpuru/pull/176), [#178](https://github.com/zekroTJA/shinpuru/pull/178) | `9` |
 | [error2507](https://github.com/error2507) | [#28](https://github.com/zekroTJA/shinpuru/issues/28), [#29](https://github.com/zekroTJA/shinpuru/issues/29), [#55](https://github.com/zekroTJA/shinpuru/issues/55) | [#1](https://github.com/zekroTJA/shinpuru/pull/1), [#2](https://github.com/zekroTJA/shinpuru/pull/2) | `7` |
+| [Ron31](https://github.com/Ron31) |  | [#32](https://github.com/zekroTJA/shinpuru/pull/32), [#181](https://github.com/zekroTJA/shinpuru/pull/181) | `4` |
 | [Eli-Dev](https://github.com/Eli-Dev) | [#45](https://github.com/zekroTJA/shinpuru/issues/45), [#47](https://github.com/zekroTJA/shinpuru/issues/47), [#49](https://github.com/zekroTJA/shinpuru/issues/49) |  | `3` |
 | [Not-Nik](https://github.com/Not-Nik) | [#53](https://github.com/zekroTJA/shinpuru/issues/53) | [#56](https://github.com/zekroTJA/shinpuru/pull/56) | `3` |
 | [InterXellar](https://github.com/InterXellar) | [#70](https://github.com/zekroTJA/shinpuru/issues/70), [#73](https://github.com/zekroTJA/shinpuru/issues/73), [#74](https://github.com/zekroTJA/shinpuru/issues/74) |  | `3` |
+| [Skillkiller](https://github.com/Skillkiller) | [#180](https://github.com/zekroTJA/shinpuru/issues/180) | [#79](https://github.com/zekroTJA/shinpuru/pull/79) | `3` |
 | [ShowMeYourSkil](https://github.com/ShowMeYourSkil) | [#140](https://github.com/zekroTJA/shinpuru/issues/140), [#171](https://github.com/zekroTJA/shinpuru/issues/171) |  | `2` |
-| [Ron31](https://github.com/Ron31) |  | [#32](https://github.com/zekroTJA/shinpuru/pull/32) | `2` |
-| [Skillkiller](https://github.com/Skillkiller) |  | [#79](https://github.com/zekroTJA/shinpuru/pull/79) | `2` |
 | [nanderLP](https://github.com/nanderLP) | [#41](https://github.com/zekroTJA/shinpuru/issues/41) |  | `1` |
 | [newtox](https://github.com/newtox) | [#57](https://github.com/zekroTJA/shinpuru/issues/57) |  | `1` |
 | [anathemamask](https://github.com/anathemamask) | [#85](https://github.com/zekroTJA/shinpuru/issues/85) |  | `1` |
 | [lus](https://github.com/lus) | [#90](https://github.com/zekroTJA/shinpuru/issues/90) |  | `1` |
 | [pavll](https://github.com/pavll) | [#108](https://github.com/zekroTJA/shinpuru/issues/108) |  | `1` |
 | [Zoriot](https://github.com/Zoriot) | [#128](https://github.com/zekroTJA/shinpuru/issues/128) |  | `1` |
 | [okrplay](https://github.com/okrplay) | [#162](https://github.com/zekroTJA/shinpuru/issues/162) |  | `1` |
+| [cloudybyte](https://github.com/cloudybyte) | [#179](https://github.com/zekroTJA/shinpuru/issues/179) |  | `1` |
 
 
 ---