benamaurer
/
minecraft_manager
forked from Minecraft/minecraft_manager
1
0
Fork 0
Code Pull Requests Activity
99 Commits
9 Branches
0 Tags
1.3 MiB
Commit Graph

99 Commits (master)

Author SHA1 Message Date
jolheiser aa7e4ea770 Change questions (#19) 
This PR updates the questions per Discord.

Reviewed-on: Minecraft/minecraft_manager#19
Co-authored-by: jolheiser <john.olheiser@gmail.com>
Co-committed-by: jolheiser <john.olheiser@gmail.com>
 2022-02-15 23:01:37 +00:00
Etzelia 66cf464f3d Add discord ID and sync (#17) 
UAT

Signed-off-by: Etzelia <etzelia@hotmail.com>

Optimize imports

Signed-off-by: Etzelia <etzelia@hotmail.com>

Add discord ID and sync

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.canopymc.net/Canopy/minecraft_manager/pulls/17
Reviewed-by: ZeroHD <joey@ahines.net>
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
 2021-07-26 15:23:37 +00:00
Etzelia 03608edfae Fix receiver for pre_delete (#12) 
Fix receiver for pre_delete

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.canopymc.net/Canopy/minecraft_manager/pulls/12
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
 2021-07-17 01:55:45 +00:00
Etzelia 9bdacbca75 Some changes (#9) 
Some changes

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.canopymc.net/Canopy/minecraft_manager/pulls/9
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
 2021-07-01 03:07:45 +00:00
Etzelia 7cb2a14716 You have logged out (#6) 
You have logged out

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.birbmc.com/BirbMC/minecraft_manager/pulls/6
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
 2021-05-12 00:19:43 +00:00
Etzelia aeea1e834d attachments (#2) 
Add migration for longer timezone

Signed-off-by: Etzelia <etzelia@hotmail.com>

Merge branch 'master' of birbmc.com:BirbMC/minecraft_manager into birb

# Conflicts:
#	external/views.py

Fix col

Signed-off-by: Etzelia <etzelia@hotmail.com>

Add attachments, clean up UI, etc.

Signed-off-by: Etzelia <etzelia@hotmail.com>

Fix Discord embeds (#59)

Fix Discord embeds

Reviewed-on: https://git.etztech.xyz/MMS/MinecraftManagerDjango/pulls/59
Reviewed-by: ZeroHD <joey@ahines.net>

Add requirements (not txt) (#57)

Add requirements (not txt)

Signed-off-by: Etzelia <etzelia@hotmail.com>

Reviewed-on: https://git.etztech.xyz/MMS/MinecraftManagerDjango/pulls/57
Reviewed-by: ZeroHD <joey@ahines.net>

Interim Patch (#54)

Birb Patches (#1)

Birb Patches

Signed-off-by: Etzelia <etzelia@hotmail.com>

Co-authored-by: Etzelia <etzelia@hotmail.com>

Reviewed-by: ZeroHD <joey@ahines.net>

Add 'LICENSE' (#53)

Add 'LICENSE'

Reviewed-by: ZeroHD <joey@ahines.net>

Fix captcha and generify community invite (#52)

Add validation for final question and some minor CSS

Signed-off-by: Etzelia <etzelia@hotmail.com>

Change some docs

Signed-off-by: Etzelia <etzelia@hotmail.com>

Fix captcha and generify community invite

Signed-off-by: Etzelia <etzelia@hotmail.com>

Co-authored-by: Etzelia <etzelia@hotmail.com>
Reviewed-by: ZeroHD <joey@ahines.net>

Co-authored-by: Etz Elia <etzelia@hotmail.com>
Reviewed-on: https://git.birbmc.com/BirbMC/minecraft_manager/pulls/2
Co-Authored-By: Etzelia <etzelia@hotmail.com>
Co-Committed-By: Etzelia <etzelia@hotmail.com>
 2021-05-06 17:50:18 +00:00
Etzelia dead183dad
Merge branch 'captcha' of birbmc.com:BirbMC/minecraft_manager 
# Conflicts:
#	models.py
#	overview.py
 2021-03-15 21:09:53 -05:00
Etzelia 725ac7f40f
Add validation for final question and some minor CSS 
Signed-off-by: Etzelia <etzelia@hotmail.com>
 2020-06-06 12:05:57 -05:00
Etzelia a31f49c7ce
Change some docs 
Signed-off-by: Etzelia <etzelia@hotmail.com>
 2020-06-06 11:39:26 -05:00
Etzelia 1489b5aa7d
Fix captcha and generify community invite 
Signed-off-by: Etzelia <etzelia@hotmail.com>
 2020-06-06 11:37:04 -05:00
Etz Elia faa342933e Various fixes and some improvements (#49) 
Rip out bot refs

Various fixes and some improvements

Signed-off-by: Etzelia <etzelia@hotmail.com>

Co-authored-by: Etzelia <etzelia@hotmail.com>
Reviewed-by: ZeroHD <joey@ahines.net>
 2020-04-19 22:26:51 +02:00
Etz Elia 3bb1e910c9 Make discord bot external again (#48) 
Make discord bot external again

Signed-off-by: Etzelia <etzelia@hotmail.com>

Co-authored-by: Etzelia <etzelia@hotmail.com>
Reviewed-by: ZeroHD <joey@ahines.net>
 2020-04-14 21:36:31 +02:00
Etz Elia dcd1db1d4a Loop MCM bot (#47) 
Loop

Signed-off-by: Etzelia <etzelia@hotmail.com>

Co-authored-by: Etzelia <etzelia@hotmail.com>
Reviewed-by: ZeroHD <joey@ahines.net>
 2020-03-05 17:38:39 +01:00
Etzelia 4c9b01e42a Remove print in model POST API (#46) 2019-11-25 16:33:23 +01:00
Etzelia e91f82366d Add model POST API (#45) 2019-11-24 19:52:29 +01:00
Etzelia e1696d3f5f Fix IP API (#42) 2019-10-01 23:08:49 +02:00
Etzelia 6cb25c0b4f Add link to applications in Discord (#41) 2019-10-01 22:24:02 +02:00
Etzelia aa221fb398 Allow filtering of active users for resolved tickets (#40) 2019-09-30 21:44:29 +02:00
Etzelia 3af8642ff0 Allow mods to re-register/reset their password (#37) 2019-09-30 21:43:13 +02:00
Etzelia d658f5fa85 Integrate DjangoCoreProtect (#39) 2019-09-30 21:42:55 +02:00
Etzelia 8eb43887cd Discord reminder for applications and tickets (#34) 2019-09-28 03:29:13 +02:00
Etzelia df30af20e6 Hotfix for CoreProtect URLs (#33) 2019-09-26 03:42:56 +02:00
Etzelia c813535489 Internalize Discord Bot (#31) 2019-08-30 20:03:12 +02:00
Joey Hines 8073765a57 Move `close_old_connections()` to `cog_before_invoke()` (#30) 2019-08-29 18:59:34 +02:00
Etzelia 12e41ce9b7 Re-implement shortcuts (#29) 2019-08-27 23:16:44 +02:00
Etzelia 773efe0606 Updates to API and Discord (#28) 2019-08-27 22:44:20 +02:00
Etzelia bc852b2090
Commit migration 
Fix overview divide-by-zero error
Remove CoreProtect permissions for new app

Signed-off-by: Etzelia <etzelia@hotmail.com>
 2019-07-26 12:37:20 -05:00
Etzelia da66751986 Change DO_NOTHING to SET_NULL 2019-02-01 18:56:40 +01:00
Etzelia 681a585818 Stop applications from removing all data related to them 2019-01-22 17:50:06 +01:00
Etzelia 16825f0dd2 Link Application to Player if exists 2019-01-16 17:40:38 +01:00
Etzelia c45f5529c7 Remove register command from MCM help 2019-01-09 19:28:28 +01:00
Etzelia bcfad87868 Removing register command from MCM 2019-01-08 23:00:21 +01:00
Etzelia caa7463b70 Protect stats from corrupted files 2019-01-07 05:18:37 +01:00
Etzelia 6d6538664e Fix Warnings to handle Notes instead 2018-12-18 17:35:44 +01:00
Etzelia 8b69c72d5a Cleanup 
Added resolve_application and resolve_player utilities, need to update usage as needed
Replaced Search Player back-end logic with resolve_player
 2018-12-13 16:28:33 -06:00
Etzelia 229bfffb58 Updated docs 
Created API filter for Token model
 2018-12-13 15:37:07 -06:00
Etzelia 02ab21aafc Migration of Warnings to Notes 
Notes to TicketNotes
Fixes #21
 2018-12-13 15:18:29 -06:00
Etzelia b44210e922 Bot Changes 
Decommissioned OreAlert since it was implemented in f2f2bc3233
Renamed the MCM Discord bot to clarify
 2018-12-12 15:36:47 -06:00
Etzelia 2de89f988c Merge branch 'master' of ZeroHD/MinecraftManagerDjango into master 2018-12-11 17:57:47 +01:00
Joey Hines 1b0c1ab8df Added case for apps still in review. 2018-12-11 10:53:41 -06:00
Joey Hines a34b8b7918 Added message for denied apps 2018-12-11 10:39:28 -06:00
Etzelia 2f2981154c Merge branch 'master' of ZeroHD/MinecraftManagerDjango into master 2018-12-11 17:25:47 +01:00
Joey Hines 94350da9bd Fixed issues brought up in issue #15 
+Fixed issue where Discord.util could have issue finding players on the server
+Added an error message if no player record is found
 2018-12-10 16:20:23 -06:00
Etzelia 93b3c881e0 Merge branch 'master' of ZeroHD/MinecraftManagerDjango into master 2018-12-10 22:30:20 +01:00
Joey Hines b09d4f69f6 Clarified register help message. 2018-12-10 15:28:32 -06:00
Joey Hines a423de0cb8 Removed appeal link and added register to the help command. 2018-12-10 15:22:02 -06:00
Joey Hines 6000251a1a Removed __exact from the end of accepted filters. 2018-12-10 15:10:41 -06:00
Joey Hines b1ac1a908b Merge branch 'master' of https://git.etztech.xyz/Etzelia/MinecraftManagerDjango 2018-12-10 15:06:37 -06:00
Joey Hines 6fdba9ff42 Added documentation for the new Discord Bot settings. 2018-12-10 15:04:47 -06:00
Joey Hines d3a1cd063f Added settings for appeal link and allowed a list of roles to get new members. 2018-12-10 14:58:53 -06:00