beenull/ctrlpanel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
103 commits 7 branches 34 tags 24 MiB
Commit graph

103 commits

This branch
This branch
All branches
Author SHA1 Message Date
AVMG
e6159525c2
Merge pull request #58 from ControlPanel-gg/add_user_role_in_discord_server 
adds the ability to give a role to the discord user on verify
 2021-06-12 17:29:55 +02:00
AVMG20
4b628988ee role to discord user 
added the ability to give a role to the discord user that has verified there discord
 2021-06-12 17:29:08 +02:00
AVMG20
c9571988a5 removed the resend verification in the admin panel 2021-06-12 17:11:44 +02:00
AVMG20
b8f25cce87 Merge remote-tracking branch 'origin/development' into development 2021-06-12 17:06:08 +02:00
AVMG20
5aeacbd7fc small bug fix where ptero id validation stopped working 2021-06-12 17:05:54 +02:00
RamonRobben
0b770b5af7
Deleted .github workflows (#55) 
Will look into a better testing workflow. CD/CI
 2021-06-12 15:29:55 +02:00
AVMG20
b181798ae4 added default discord invite url 2021-06-12 15:00:04 +02:00
AVMG20
cd7f14a1e0 removed workflow tests 2021-06-12 14:55:57 +02:00
AVMG20
1e58230d49 Merge remote-tracking branch 'origin/development' into development 2021-06-12 14:54:06 +02:00
AVMG20
6969b7fadf Discord 0Auth more optional, .env.example cleanup 2021-06-12 14:54:00 +02:00
AVMG20
178d672ed9 Discord 0Auth more optional, .env.example cleanup 2021-06-12 14:50:51 +02:00
AVMG20
3cb0c042fc Merge remote-tracking branch 'origin/development' into development 2021-06-12 14:42:33 +02:00
AVMG20
3795fabcf6 Merge remote-tracking branch 'origin/development' into development 2021-06-12 14:42:25 +02:00
AVMG20
f83992c1f9 Merge remote-tracking branch 'origin/development' into development 2021-06-12 14:40:47 +02:00
AVMG20
6c175c9160 cleanup 2021-06-12 14:40:40 +02:00
AVMG20
d6a00f62ae cleanup 2021-06-12 14:24:50 +02:00
AVMG20
0e5eda1470 clickable link to pterodactyl when clicking on the users name 2021-06-12 14:15:36 +02:00
AVMG
580dc223f8
Merge pull request #54 from ControlPanel-gg/verify_email 
Remind to verify email #30
 2021-06-12 14:02:28 +02:00
AVMG20
2439788a82 Merge remote-tracking branch 'origin/verify_email' into verify_email 2021-06-12 14:00:45 +02:00
AVMG20
662135451e Remind to verify email #30 2021-06-12 14:00:28 +02:00
AVMG20
f6de15c0e4 Remind to verify email #30 2021-06-12 13:59:48 +02:00
AVMG20
def2b2b94e small cleanup 2021-06-12 12:58:04 +02:00
AVMG20
6989a079c9 Merge remote-tracking branch 'origin/development' into development 2021-06-11 10:34:57 +02:00
AVMG
a22f50399d
Merge pull request #53 from ControlPanel-gg/useful_links_tests 
Testing usefulLinkController
 2021-06-11 10:34:44 +02:00
AVMG20
082e877506 Merge branch 'useful_links_tests' into development 2021-06-11 10:33:45 +02:00
AVMG20
5f6221e88a Testing usefulLinkController 2021-06-11 10:33:26 +02:00
AVMG20
d7a9e47d62 usefullinks bug fix cuss of merge request :) 2021-06-10 23:38:37 +02:00
AVMG
1cfdd11f71
Merge pull request #52 from ControlPanel-gg/useful_links_and_menu 
Auto stash before revert of "Merge remote-tracking branch 'origin/dev…
 2021-06-10 23:36:54 +02:00
AVMG
e0199589dc
Merge branch 'development' into useful_links_and_menu 2021-06-10 23:36:50 +02:00
AVMG20
690abe03ba Auto stash before revert of "Merge remote-tracking branch 'origin/development' into development" 
Added all the plugins from adminlite, added usefulllinks tab
 2021-06-10 23:29:25 +02:00
AVMG
e80c52dc80
Merge pull request #51 from ControlPanel-gg/useful_links_and_menu 
Auto stash before revert of "Merge remote-tracking branch 'origin/dev…
 2021-06-10 23:27:58 +02:00
AVMG20
ffa6035c2b Auto stash before revert of "Merge remote-tracking branch 'origin/development' into development" 
Added all the plugins from adminlite, added usefulllinks tab
 2021-06-10 23:25:13 +02:00
RamonRobben
866f7c12ed
Added docker container building / uploading (#47) 2021-06-10 22:18:56 +02:00
RamonRobben
52e281ee9b
Added docker container building / uploading (#46) 2021-06-10 22:15:53 +02:00
AVMG20
acdf7965ea API authorization and Testing WIP 2021-06-10 21:09:37 +02:00
AVMG20
2773e4a26a Merge remote-tracking branch 'origin/development' into development 2021-06-10 18:01:49 +02:00
AVMG20
74e3c336f8 Seeding changes 2021-06-10 18:01:41 +02:00
AVMG20
bdbf1fc77a Seeding changes 2021-06-10 17:41:47 +02:00
AVMG20
0a7e000550 Fixed a bug where you couldn't edit a user due to pterodactyl id 2021-06-10 14:37:48 +02:00
RamonRobben
b32352e925
Custom useful links via database / command (#41) 
* Small change to the test command

* Custom useful links via database and command
 2021-06-10 00:16:34 +02:00
RamonRobben
6d45731254
Small change to the test command (#40) 2021-06-09 22:56:15 +02:00
RamonRobben
bfdbe62cd7
General improvements to testing environment and removed clutter (#36) 2021-06-09 20:53:58 +02:00
AVMG20
de00a3c5d4 very tiny small tweaks 2021-06-09 20:11:04 +02:00
AVMG20
6c581d1879 .env.dev update :) 2021-06-09 19:42:43 +02:00
LogischJo
5aba2c27bc
Password Changes from Admin User Edit (#33) 
* Password Changes from Admin User Edit

With this Commit Admins can change the user password from the admin user edit page

* Admin Password Change: UI Changes
 2021-06-09 00:16:31 +02:00
AVMG20
b0ab16ec3e Merge remote-tracking branch 'origin/development' into development 2021-06-08 00:04:54 +02:00
AVMG20
d0e6dc0367 Changes the way discord verification works 2021-06-08 00:04:33 +02:00
RamonRobben
a7a4692ff8
Fixed docker permissions 
Fixed docker permissions
 2021-06-07 20:34:36 +02:00
Ramon Robben
21ea518d78 Fixed docker permissions 2021-06-07 20:33:12 +02:00
AVMG
160a65ff2d
Merge pull request #21 from LogischJo/development 
Create the update command
 2021-06-07 18:04:17 +02:00