Commit Graph

796 Commits

Author SHA1 Message Date
c439d5925f Merge pull request '1.0.1' (#278) from 1.0.1 into master
Reviewed-on: sh-edraft.de/kd_discord_bot#278
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
2023-03-29 21:00:02 +02:00
1777a32899 Merge pull request '#281' (#282) from #281 into 1.0.1
Reviewed-on: sh-edraft.de/kd_discord_bot#282
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #281
2023-03-29 19:45:10 +02:00
3e5301b2d8 Merge branch '1.0.1' into #281 2023-03-29 19:39:04 +02:00
653562b908 idk #281 2023-03-29 19:38:42 +02:00
8025c31339 Set xp by level only when incoming level is different from user level #281 2023-03-29 19:38:25 +02:00
ccf41bec79 Retry select after half a second 2023-03-29 15:17:19 +02:00
f75d8f2068 Merge pull request 'Fixed reaction handling #279' (#280) from #279 into 1.0.1
Reviewed-on: sh-edraft.de/kd_discord_bot#280
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #279
2023-03-29 14:53:49 +02:00
da02aca7e4 Fixed reaction handling #279 2023-03-29 14:52:36 +02:00
3762f16c7e Merge pull request 'Fixed remove warning team notification #270' (#271) from #270 into 1.0.1
Reviewed-on: sh-edraft.de/kd_discord_bot#271
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #270
2023-03-28 23:39:41 +02:00
b3099121ab Build bot version #270 2023-03-28 23:36:33 +02:00
6a750ee31b Set bot version #270 2023-03-28 23:36:06 +02:00
3c371ec074 Set correct frontend version #270 2023-03-28 23:34:42 +02:00
d818eafb9d Merge branch '1.0.1' into #270 2023-03-28 23:30:32 +02:00
b4a5fdb258 Merge pull request 'Fixed unnecessary voice states #274' (#275) from #274 into 1.0.1
Reviewed-on: sh-edraft.de/kd_discord_bot#275
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #274
2023-03-28 23:29:47 +02:00
cf69436168 Merge pull request 'Fixed can_user_see_element #272' (#273) from #272 into 1.0.1
Reviewed-on: sh-edraft.de/kd_discord_bot#273
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #272
2023-03-28 23:29:35 +02:00
ccf171e876 Merge pull request 'Fixed id access #266' (#267) from #266 into 1.0.1
Reviewed-on: sh-edraft.de/kd_discord_bot#267
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #266
2023-03-28 23:29:22 +02:00
5a312bf660 Merge pull request 'Als Admin möchte ich, dass bei Erstellung einer AutoRollen Regel die Reaktion automatisch hinzugefügt wird #259' (#263) from #259 into 1.0.1
Reviewed-on: sh-edraft.de/kd_discord_bot#263
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #259
2023-03-28 23:29:05 +02:00
0003255d7c Merge branch '1.0.1' into #274 2023-03-28 18:24:21 +02:00
27a4c140e4 Fixed unnecessary voice states #274 2023-03-28 18:23:45 +02:00
3183461195 Merge branch '1.0.1' into #272 2023-03-28 15:46:14 +02:00
cb4f8d870c Fixed can_user_see_element #272 2023-03-28 15:45:38 +02:00
7c447bb0f2 Set frontend version for patch version #270 2023-03-28 15:04:20 +02:00
4debe4e2ba Fixed remove warning team notification #270 2023-03-28 15:01:35 +02:00
3cd3df3e5f Merge branch '1.0.1' into #266 2023-03-27 19:46:51 +02:00
b4a631d4e4 Fixed id access #266 2023-03-27 19:46:10 +02:00
7ba0247519 Merge pull request 'Fixed dropdown color #260' (#262) from #260 into 1.0.1
Reviewed-on: sh-edraft.de/kd_discord_bot#262
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #260
2023-03-27 19:35:30 +02:00
209e75fdcc Merge pull request 'Disabled add button for mods in level list #264' (#265) from #264 into 1.0.1
Reviewed-on: sh-edraft.de/kd_discord_bot#265
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #264
2023-03-27 19:35:04 +02:00
3bca3f86eb Disabled add button for mods in level list #264 2023-03-27 19:33:22 +02:00
657a8fa586 Added comment #259 2023-03-27 10:17:56 +02:00
3c8a092f40 Added logic to add reaction after creating auto role rule in WI #259 2023-03-27 10:17:55 +02:00
61bf508cea Fixed dropdown color #260 2023-03-27 10:04:18 +02:00
75ad07477a Merge pull request '1.0.0' (#253) from 1.0.0 into master
Reviewed-on: sh-edraft.de/kd_discord_bot#253
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
2023-03-27 09:30:49 +02:00
132d41f0a2 Fixed some stuff 2023-03-26 22:58:56 +02:00
707a835672 Updated docker & config 2023-03-26 20:08:04 +02:00
f56dbf8e2a Merge pull request 'Fixed permission handling for member data #256' (#258) from #256 into 1.0.0
Reviewed-on: sh-edraft.de/kd_discord_bot#258
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
#Closes #256
2023-03-25 18:01:57 +01:00
c311e534d7 Merge pull request 'Fixed profile navigation #255' (#257) from #255 into 1.0.0
Reviewed-on: sh-edraft.de/kd_discord_bot#257
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #255
2023-03-25 18:01:41 +01:00
87b277515c Fixed permission handling for member data #256 2023-03-24 14:23:13 +01:00
e6c614dfdc Fixed profile navigation #255 2023-03-24 14:15:21 +01:00
24d5bbf4d8 Made version in presence optional 2023-03-24 14:14:49 +01:00
52035af0cc Fixed jwt handling 2023-03-21 19:14:39 +01:00
fdc9a118c8 Fixed jwt handling 2023-03-20 16:30:07 +01:00
ba1f4ee955 Merge pull request '1.0.0-fix' (#254) from 1.0.0-fix into 1.0.0
Reviewed-on: sh-edraft.de/kd_discord_bot#254
2023-03-20 14:41:33 +01:00
35d161c080 Removed obsolete fix 2023-03-20 14:40:56 +01:00
818163cbed Formatted tools 2023-03-20 14:39:23 +01:00
468ebb5f79 Merge branch 'master' into 1.0.0-fix
# Conflicts:
#	kdb-bot/src/bot/__init__.py
#	kdb-bot/src/bot/bot.json
#	kdb-bot/src/bot/config
#	kdb-bot/src/bot/extension/__init__.py
#	kdb-bot/src/bot_api/__init__.py
#	kdb-bot/src/bot_api/abc/__init__.py
#	kdb-bot/src/bot_api/bot-api.json
#	kdb-bot/src/bot_api/configuration/__init__.py
#	kdb-bot/src/bot_api/controller/__init__.py
#	kdb-bot/src/bot_api/event/__init__.py
#	kdb-bot/src/bot_api/exception/__init__.py
#	kdb-bot/src/bot_api/filter/__init__.py
#	kdb-bot/src/bot_api/filter/discord/__init__.py
#	kdb-bot/src/bot_api/logging/__init__.py
#	kdb-bot/src/bot_api/model/__init__.py
#	kdb-bot/src/bot_api/model/discord/__init__.py
#	kdb-bot/src/bot_api/route/__init__.py
#	kdb-bot/src/bot_api/service/__init__.py
#	kdb-bot/src/bot_api/transformer/__init__.py
#	kdb-bot/src/bot_core/__init__.py
#	kdb-bot/src/bot_core/abc/__init__.py
#	kdb-bot/src/bot_core/bot-core.json
#	kdb-bot/src/bot_core/configuration/__init__.py
#	kdb-bot/src/bot_core/core_extension/__init__.py
#	kdb-bot/src/bot_core/events/__init__.py
#	kdb-bot/src/bot_core/exception/__init__.py
#	kdb-bot/src/bot_core/helper/__init__.py
#	kdb-bot/src/bot_core/logging/__init__.py
#	kdb-bot/src/bot_core/pipes/__init__.py
#	kdb-bot/src/bot_core/service/__init__.py
#	kdb-bot/src/bot_data/__init__.py
#	kdb-bot/src/bot_data/abc/__init__.py
#	kdb-bot/src/bot_data/bot-data.json
#	kdb-bot/src/bot_data/migration/__init__.py
#	kdb-bot/src/bot_data/model/__init__.py
#	kdb-bot/src/bot_data/service/__init__.py
#	kdb-bot/src/bot_graphql/__init__.py
#	kdb-bot/src/bot_graphql/abc/__init__.py
#	kdb-bot/src/bot_graphql/filter/__init__.py
#	kdb-bot/src/bot_graphql/mutations/__init__.py
#	kdb-bot/src/modules/auto_role/__init__.py
#	kdb-bot/src/modules/auto_role/auto-role.json
#	kdb-bot/src/modules/auto_role/command/__init__.py
#	kdb-bot/src/modules/auto_role/events/__init__.py
#	kdb-bot/src/modules/auto_role/helper/__init__.py
#	kdb-bot/src/modules/base/__init__.py
#	kdb-bot/src/modules/base/abc/__init__.py
#	kdb-bot/src/modules/base/base.json
#	kdb-bot/src/modules/base/command/__init__.py
#	kdb-bot/src/modules/base/configuration/__init__.py
#	kdb-bot/src/modules/base/events/__init__.py
#	kdb-bot/src/modules/base/events/base_on_voice_state_update_event.py
#	kdb-bot/src/modules/base/helper/__init__.py
#	kdb-bot/src/modules/base/model/__init__.py
#	kdb-bot/src/modules/base/service/__init__.py
#	kdb-bot/src/modules/base/thread/__init__.py
#	kdb-bot/src/modules/boot_log/__init__.py
#	kdb-bot/src/modules/boot_log/boot-log.json
#	kdb-bot/src/modules/boot_log/configuration/__init__.py
#	kdb-bot/src/modules/database/__init__.py
#	kdb-bot/src/modules/database/database.json
#	kdb-bot/src/modules/level/__init__.py
#	kdb-bot/src/modules/level/command/__init__.py
#	kdb-bot/src/modules/level/configuration/__init__.py
#	kdb-bot/src/modules/level/events/__init__.py
#	kdb-bot/src/modules/level/level.json
#	kdb-bot/src/modules/level/service/__init__.py
#	kdb-bot/src/modules/permission/__init__.py
#	kdb-bot/src/modules/permission/abc/__init__.py
#	kdb-bot/src/modules/permission/configuration/__init__.py
#	kdb-bot/src/modules/permission/events/__init__.py
#	kdb-bot/src/modules/permission/permission.json
#	kdb-bot/src/modules/permission/service/__init__.py
#	kdb-bot/src/modules/stats/service/__init__.py
#	kdb-bot/src/modules/stats/stats.json
#	kdb-bot/src/modules/technician/__init__.py
#	kdb-bot/src/modules/technician/command/__init__.py
#	kdb-bot/src/modules/technician/technician.json
#	kdb-bot/tools/get_version/get-version.json
#	kdb-bot/tools/post_build/post-build.json
#	kdb-bot/tools/set_version/set-version.json
2023-03-20 14:39:18 +01:00
085726bf60 Updated config 2023-03-20 14:32:44 +01:00
223abbe66f Fixed user mutation 2023-03-20 14:11:02 +01:00
4c5a8baed5 Build release 2023-03-20 14:01:08 +01:00
59162408e5 Merge pull request 'Datenschutz und Impressum angeben #251' (#252) from #251 into 1.0.0
Reviewed-on: sh-edraft.de/kd_discord_bot#252
Reviewed-by: edraft-dev <dev.sven.heidemann@sh-edraft.de>
Closes #251
2023-03-20 13:42:23 +01:00
634b81d23b Merge branch '1.0.0' into #251 2023-03-20 13:40:17 +01:00