Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,134 Commits 12 Branches 45 Tags 104 MiB
1297eb3fbb
Commit Graph

1134 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
xithical
d3539974d1 Fixed typo in WTF error 
Changed from "What a Terrble Failure!" to "What a Terrible Failure!"
 2021-08-09 20:25:02 -05:00
Andrew
8db46d6ab6 Added option to remove server files on delete. 
Added confirmation for server delete.
 2021-08-09 20:48:22 -04:00
Andrew
e62b24fdb8 Merge branch 'pretzel-unstable' into 'pretzel' 
Added user list with users attached to role on role config page.

See merge request crafty-controller/crafty-commander!42
 2021-08-09 21:19:17 +00:00
Andrew
046228a0e1 Fixed bug that I created in create roles. Just didn't add data to the page that should have been there 2021-08-09 17:18:02 -04:00
Andrew
488175cc2e Added users attached to roles on role edit page. 2021-08-09 17:11:45 -04:00
Andrew
4d7592fcaa Fixed error thrown on add user 2021-08-09 01:45:01 -04:00
Andrew
7dd4702680 Fixed error thrown on add user 2021-08-09 01:44:16 -04:00
Andrew
1791f1c724 Merge branch 'pretzel' into 'pretzel-unstable' 
Merge branch 'pretzel' into 'pretzel-unstable'

See merge request crafty-controller/crafty-commander!41
 2021-08-09 05:34:16 +00:00
Andrew
8c947bbbb7 Merge branch 'pretzel-unstable' into 'pretzel' 
Added ability for non super-user to change password

See merge request crafty-controller/crafty-commander!40
 2021-08-09 05:32:11 +00:00
Andrew
0e5e2cd217 Added the ability for non super-users to change their own password. 2021-08-09 01:29:13 -04:00
Andrew
e901e3dda7 Merge branch 'pretzel' into 'pretzel-unstable' 
Setting branches back to being the exact same. Working from stable.

See merge request crafty-controller/crafty-commander!39
 2021-08-09 04:28:16 +00:00
Andrew
92632b5cff Merge branch 'pretzel-unstable' into 'pretzel' 
Fixed bug in roles on server listing

See merge request crafty-controller/crafty-commander!38
 2021-08-09 04:27:01 +00:00
Andrew
b1215ff20a Fixed bug where all roles showed the sum of servers associated with all roles 2021-08-09 00:24:08 -04:00
Andrew
79f9fd0990 Merge branch 'pretzel-unstable' into 'pretzel' 
Added server lists to config page

See merge request crafty-controller/crafty-commander!37
 2021-08-08 22:29:18 +00:00
Andrew
9ec10db762 Disabled checkboxes in user configs if servers were granted by role. 2021-08-08 18:26:28 -04:00
Andrew
debabfc045 Added server/role lists to panel config 2021-08-08 16:43:04 -04:00
Andrew
26dbcd14e9 Merge branch 'pretzel-unstable' into 'pretzel' 
role_ID fix in role editor

See merge request crafty-controller/crafty-commander!34
 2021-08-08 17:33:08 +00:00
Andrew
e4db76e4b9 Removing print statements. 2021-08-08 13:30:16 -04:00
Andrew
ad4b3b6075 Merge branch 'pretzel-unstable' of https://gitlab.com/crafty-controller/crafty-commander into pretzel-unstable 2021-08-08 11:59:50 -04:00
Andrew
a4aee7e413 Fixed "other" page on role editor so it looks for role id and not role name 2021-08-08 11:59:18 -04:00
Andrew
28e8bfd7ac Merge branch 'pretzel' into 'pretzel-unstable' 
Updating unstable with stable due to changes made in stable.

See merge request crafty-controller/crafty-commander!33
 2021-08-08 15:36:10 +00:00
Andrew
ea57d62b1b Fixed reset buttons on role editor and user server edit page 2021-08-08 10:49:00 -04:00
Andrew McManus
f9559a601e Merge branch 'pretzel-unstable' into 'pretzel' 
Added error statements for Failed Starts

See merge request crafty-controller/crafty-commander!32
 2021-08-07 19:26:13 +00:00
Andrew
160e374c7a Update messages are working, but it's not clean and we should find a better way at some point. 2021-08-07 15:23:22 -04:00
Andrew
f50e80749c Still fighting with failed start message 2021-08-07 14:28:34 -04:00
Andrew
85fe2c9d21 Working through start error messages 2021-08-07 14:25:47 -04:00
Andrew
e86998e57d This is the unstable version of pretzel where he breaks things. 2021-08-07 13:15:53 -04:00
Andrew
ca9788081b Removed print statements 2021-08-06 14:15:10 -04:00
Andrew
f957d54348 Fixed issue with duplicate servers on dash if role and user both had access to the server. 2021-08-06 13:47:06 -04:00
Andrew
67008f0e37 Fixed bug where if a user created a server they would not have access to it. 2021-08-06 12:49:07 -04:00
Andrew
e40fb45853 Bug fixes for user/role based servers. 2021-08-06 12:21:47 -04:00
Andrew
e827460a18 Revert 2021-08-06 01:13:58 -04:00
Andrew
4bb798fd0c Dumb commit because I had an extraneous _ 2021-08-06 01:08:33 -04:00
Andrew
41846e34a9 Made it so only super user can see other roles/users 2021-08-06 01:05:46 -04:00
Andrew
b39e0e3a62 Added users to servers. Fixed some bugs with assigning users to role/servers. Fixed bug where user could not edit server config 2021-08-06 00:34:57 -04:00
Andrew McManus
2f8abc25bd Delete exit.txt 2021-08-05 21:27:24 +00:00
Andrew
6aa910c8de Added check for server.properties to avoid white throwback if server.properties doesn't exist on a zip import. 2021-08-05 17:17:36 -04:00
Andrew
e15de6c461 Merge branch 'pretzel' of https://gitlab.com/crafty-controller/crafty-commander into pretzel 2021-08-04 22:07:51 -04:00
Andrew
4f9dd972cb Added a fix for zip import. Should still add a catch for no server.properties and create one. 2021-08-04 22:06:38 -04:00
luukas
801d79fdca Fix Crafty version string 2021-07-30 22:50:33 +03:00
luukas
f5b6583dbf Remove unnecessary console.debug's 2021-07-30 19:27:48 +03:00
luukas
7acf095463 Make HTTP handler functions not return anything else than None to remove an error in the log. Also make users not log out when visiting a page on the public handler 2021-07-30 19:20:01 +03:00
luukas
3559c0a942 Basic README 2021-07-30 18:37:36 +03:00
Andrew McManus
3d979ffed3 Merge branch 'pretzel_update' into 'pretzel' 
Added update button and bug fixes

See merge request crafty-controller/crafty-commander!31
 2021-07-30 14:59:16 +00:00
Andrew McManus
c2a673dfc3 Added Try Catch around server job spawn. This fixes bug where crafty would not gracefully handle if java did not exist. 2021-07-30 10:30:58 -04:00
Andrew McManus
feab08b36f Minor changes 2021-07-26 22:22:31 -04:00
Andrew McManus
c3b4b1f213 Minor adjustments to updates 2021-07-26 22:17:37 -04:00
Andrew McManus
f8cda4b748 I don't know the difference between str and int I guess. 2021-07-26 21:49:47 -04:00
Andrew McManus
4e4911e0b5 I don't know how to indent 2021-07-26 21:45:33 -04:00
Andrew McManus
a661d33698 Fixing bugs with updates 2021-07-26 21:39:22 -04:00