| 
						
					 | 
					
						
						
							
						
						9ed66c2560
					 | 
					
						
						
							
							Merge branch '0.3' of https://git.sh-edraft.de/sh-edraft.de/kd_discord_bot into 0.3
						
						
						
						
						
						
						
						 Conflicts:
	kdb-bot/src/modules/technician/command/log_command.py 
						
						
					 | 
					
						2022-11-18 15:39:36 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						6e6157ccf2
					 | 
					
						
						
							
							Fixed log command
						
						
						
						
						
						
					 | 
					
						2022-11-18 15:34:25 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f136d6164e
					 | 
					
						
						
							
							Fixed log command
						
						
						
						
						
						
					 | 
					
						2022-11-18 15:05:39 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						9b5033b80e
					 | 
					
						
						
							
							Fixed some on member join stuff
						
						
						
						
						
						
					 | 
					
						2022-11-18 14:33:54 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						f5a71a8450
					 | 
					
						
						
							
							Fixed some on member join stuff
						
						
						
						
						
						
					 | 
					
						2022-11-18 14:14:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d3279eb7c7
					 | 
					
						
						
							
							Updated config
						
						
						
						
						
						
					 | 
					
						2022-11-18 10:23:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ec7aeb8712
					 | 
					
						
						
							
							Added icmplib
						
						
						
						
						
						
					 | 
					
						2022-11-18 10:16:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fd609eb923
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/0.3' into 0.3
						
						
						
						
						
						
						
						# Conflicts:
#	kdb-bot/cpl-workspace.json 
						
						
					 | 
					
						2022-11-18 09:58:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a7dbc75d2e
					 | 
					
						
						
							
							Updated configs
						
						
						
						
						
						
					 | 
					
						2022-11-18 09:58:05 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						b0459567f4
					 | 
					
						
						
							
							Fixed workspace
						
						
						
						
						
						
					 | 
					
						2022-11-18 09:52:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						25b7b18013
					 | 
					
						
						
							
							Fixed workspace
						
						
						
						
						
						
					 | 
					
						2022-11-18 09:51:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						87350cba1a
					 | 
					
						
						
							
							Moved dockerfile
						
						
						
						
						
						
					 | 
					
						2022-11-18 09:50:06 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						864d181de0
					 | 
					
						
						
							
							Fixed project files
						
						
						
						
						
						
					 | 
					
						2022-11-18 09:33:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						90011be760
					 | 
					
						
						
							
							Updated api config ?
						
						
						
						
						
						
					 | 
					
						2022-11-18 09:30:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						47dd6fdc2d
					 | 
					
						
						
							
							Improved build version stuff
						
						
						
						
						
						
					 | 
					
						2022-11-18 09:30:29 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						8445c23e7f
					 | 
					
						
						
							
							Merge pull request '0.3 - Log Befehl (#44)' (#125) from #44 into 0.3
						
						
						
						
						
						
						
						Reviewed-on: sh-edraft.de/kd_discord_bot#125
Reviewed-by: Sven Heidemann <sven.heidemann@sh-edraft.de>
Closes #44 
						
						
					 | 
					
						2022-11-17 23:03:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e6fc41090a
					 | 
					
						
						
							
							Refactored code #44
						
						
						
						
						
						
					 | 
					
						2022-11-17 23:02:27 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7c79c6f992
					 | 
					
						
						
							
							Merge branch '0.3' into #44
						
						
						
						
						
						
						
						# Conflicts:
#	kdb-bot/src/bot/config 
						
						
					 | 
					
						2022-11-17 22:54:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7b8dca64bf
					 | 
					
						
						
							
							Finished log command #44
						
						
						
						
						
						
					 | 
					
						2022-11-17 22:45:10 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						549b05087f
					 | 
					
						
						
							
							Merge pull request '0.3 - /user info für alle (#119)' (#122) from #119 into 0.3
						
						
						
						
						
						
						
						Reviewed-on: sh-edraft.de/kd_discord_bot#122
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #119 
						
						
					 | 
					
						2022-11-17 20:40:55 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						83d18da58f
					 | 
					
						
						
							
							Merge pull request '0.3 - level check for all members on seed (#123)' (#124) from #123 into 0.3
						
						
						
						
						
						
						
						Reviewed-on: sh-edraft.de/kd_discord_bot#124
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #123 
						
						
					 | 
					
						2022-11-17 20:40:37 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						18e4465b17
					 | 
					
						
						
							
							Merge branch '0.3' into #123
						
						
						
						
						
						
					 | 
					
						2022-11-17 20:01:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2e20bb12de
					 | 
					
						
						
							
							Merge branch '0.3' into #119
						
						
						
						
						
						
					 | 
					
						2022-11-17 20:01:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						4f4e80fb6b
					 | 
					
						
						
							
							Merge pull request '0.3 - Xp für Reaction (#118)' (#121) from #118 into 0.3
						
						
						
						
						
						
						
						Reviewed-on: sh-edraft.de/kd_discord_bot#121
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #121 
						
						
					 | 
					
						2022-11-17 20:01:12 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fd1245fb4f
					 | 
					
						
						
							
							Merge remote-tracking branch 'origin/#118' into #118
						
						
						
						
						
						
					 | 
					
						2022-11-17 19:59:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						fdb358c45e
					 | 
					
						
						
							
							Removed xp when remove reaction #118
						
						
						
						
						
						
					 | 
					
						2022-11-17 19:58:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						c438a91b87
					 | 
					
						
						
							
							Added logic to add xp on reaction #118
						
						
						
						
						
						
					 | 
					
						2022-11-17 19:58:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						a46fbcd9fc
					 | 
					
						
						
							
							Removed xp when remove reaction #118
						
						
						
						
						
						
					 | 
					
						2022-11-17 19:57:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						91285540c6
					 | 
					
						
						
							
							Merge pull request '0.3 - /ping pings to urls (#117)' (#120) from #117 into 0.3
						
						
						
						
						
						
						
						Reviewed-on: sh-edraft.de/kd_discord_bot#120
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #117 
						
						
					 | 
					
						2022-11-17 19:54:17 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ab2145d5df
					 | 
					
						
						
							
							Check level for each member after changes #123
						
						
						
						
						
						
					 | 
					
						2022-11-17 19:31:57 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						63fe566044
					 | 
					
						
						
							
							Improved /user info command #119
						
						
						
						
						
						
					 | 
					
						2022-11-17 16:49:33 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d45d787cea
					 | 
					
						
						
							
							Added logic to add xp on reaction #118
						
						
						
						
						
						
					 | 
					
						2022-11-17 16:35:47 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						442170eca9
					 | 
					
						
						
							
							Added pings to servers to ping command #117
						
						
						
						
						
						
					 | 
					
						2022-11-17 16:16:28 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						2c7f4647af
					 | 
					
						
						
							
							[WIP] Added log command #44
						
						
						
						
						
						
					 | 
					
						2022-11-16 21:04:07 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						53604706c2
					 | 
					
						
						
							
							Added technician module #44
						
						
						
						
						
						
					 | 
					
						2022-11-14 22:29:43 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						42d8a16d05
					 | 
					
						
						
							
							Merge pull request '0.3 - Nachricht an Moderatoren, wenn Hilfe-Channel betreten wird (#113)' (#116) from #113 into 0.3
						
						
						
						
						
						
						
						Reviewed-on: sh-edraft.de/kd_discord_bot#116
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #113 
						
						
					 | 
					
						2022-11-14 21:56:40 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d933cae73c
					 | 
					
						
						
							
							Merge branch '0.3' into #113
						
						
						
						
						
						
					 | 
					
						2022-11-14 21:56:24 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ce73145dbb
					 | 
					
						
						
							
							Merge pull request '0.3 - Checks in Befehlen als Decorators (#114)' (#115) from #114 into 0.3
						
						
						
						
						
						
						
						Reviewed-on: sh-edraft.de/kd_discord_bot#115
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #114 
						
						
					 | 
					
						2022-11-14 21:49:59 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						ab7fdec499
					 | 
					
						
						
							
							Merge branch '0.3' into #114
						
						
						
						
						
						
					 | 
					
						2022-11-14 21:49:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d2968e0652
					 | 
					
						
						
							
							Merge pull request '0.3 - Admins können keine anderen Benutzer zu Admin machen (#88)' (#112) from #88 into 0.3
						
						
						
						
						
						
						
						Reviewed-on: sh-edraft.de/kd_discord_bot#112
Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com>
Closes #88 
						
						
					 | 
					
						2022-11-14 21:10:35 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						cebdc1b860
					 | 
					
						
						
							
							Merge branch '0.3' into #88
						
						
						
						
						
						
					 | 
					
						2022-11-14 21:09:30 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						87435614db
					 | 
					
						
						
							
							Fixed angular setup for windoof and linux
						
						
						
						
						
						
					 | 
					
						2022-11-14 20:10:44 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e9386633d8
					 | 
					
						
						
							
							Merge branch '0.3' into #88
						
						
						
						
						
						
					 | 
					
						2022-11-13 22:20:51 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						49d9509255
					 | 
					
						
						
							
							Added logic to send mods a message when member joins help channel #113
						
						
						
						
						
						
					 | 
					
						2022-11-13 12:32:31 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						905182931c
					 | 
					
						
						
							
							Improved event checks #114
						
						
						
						
						
						
					 | 
					
						2022-11-13 12:15:53 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						026d989789
					 | 
					
						
						
							
							Improved event checks #114
						
						
						
						
						
						
					 | 
					
						2022-11-13 12:11:01 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						d38fa77757
					 | 
					
						
						
							
							Added checks to commands #114
						
						
						
						
						
						
					 | 
					
						2022-11-13 12:07:50 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						5cdf2834cc
					 | 
					
						
						
							
							Added is ready check to events #114
						
						
						
						
						
						
					 | 
					
						2022-11-13 12:01:34 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						7173dee28d
					 | 
					
						
						
							
							Added event checks #114
						
						
						
						
						
						
					 | 
					
						2022-11-13 11:58:09 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 | 
				
			
				
					| 
						
					 | 
					
						
						
							
						
						e754a10241
					 | 
					
						
						
							
							Added command checks #114
						
						
						
						
						
						
					 | 
					
						2022-11-13 11:56:42 +01:00 | 
					
					
						
						
						
							
							
							
							
							
							
						
					 |