|
|
7389b37198
|
Initial commit on this broken branch
|
2021-08-22 10:17:33 -04:00 |
|
|
|
0b29bdf855
|
Deletion on User_Servers table
|
2021-08-22 12:21:59 +02:00 |
|
|
|
88042998d9
|
Merge branch 'dev' into dev-Silversthorn
|
2021-08-22 12:14:31 +02:00 |
|
|
|
c668b74ed8
|
Update DBCHANGES.md
Corrections and Improvement for Create table exemple
|
2021-08-22 10:00:39 +00:00 |
|
|
|
331f3e7b12
|
Adding Crafty Permissions
|
2021-08-22 11:57:02 +02:00 |
|
|
|
540cdf6149
|
Fixing Roles Permissions for Server Creation
|
2021-08-22 11:06:44 +02:00 |
|
|
|
73d8be2d57
|
Still cleaning up my mess...sorry
|
2021-08-21 23:56:02 -04:00 |
|
|
|
890b487d52
|
Merge branch 'dewfix' into 'dev'
Fixing dev after I broke it
See merge request crafty-controller/crafty-commander!52
|
2021-08-22 03:39:04 +00:00 |
|
|
|
0d11b80181
|
Merge branch 'dev' into 'dewfix'
# Conflicts:
# app/classes/shared/models.py
|
2021-08-22 03:38:39 +00:00 |
|
|
|
7f1f667212
|
This should fix everything
|
2021-08-21 23:36:48 -04:00 |
|
|
|
a57a66901c
|
Revert "Merge branch 'revert-ecb2cfbe' into 'dev'"
This reverts merge request !49
|
2021-08-22 03:34:05 +00:00 |
|
|
|
61c242bafb
|
Merge branch 'revert-cbd5d29f' into 'dev'
Revert "Fixed error with modelselect"
See merge request crafty-controller/crafty-commander!50
|
2021-08-22 03:30:54 +00:00 |
|
|
|
773ace55ad
|
Revert "Fixed error with modelselect"
This reverts commit cbd5d29fe9
|
2021-08-22 03:30:43 +00:00 |
|
|
|
4d09ee1f5b
|
Merge branch 'revert-ecb2cfbe' into 'dev'
Revert "Fixed bug where servers would not get added to roles on creation"
See merge request crafty-controller/crafty-commander!49
|
2021-08-22 03:27:51 +00:00 |
|
|
|
f472b377d2
|
Revert "Fixed bug where servers would not get added to roles on creation"
This reverts commit ecb2cfbe01
|
2021-08-22 03:27:12 +00:00 |
|
|
|
cbd5d29fe9
|
Fixed error with modelselect
|
2021-08-21 23:21:06 -04:00 |
|
|
|
8de3b3b3cd
|
Removed User_Servers table.
|
2021-08-21 23:17:54 -04:00 |
|
|
|
ecb2cfbe01
|
Fixed bug where servers would not get added to roles on creation
|
2021-08-21 22:47:43 -04:00 |
|
|
|
c86c5040ea
|
Fixed bug where new servers would not be added to current role
|
2021-08-21 22:43:16 -04:00 |
|
|
|
2851493589
|
Removed servers from user_role_permissions query. Not needed and caused query to result in none very time
|
2021-08-21 22:02:27 -04:00 |
|
|
|
032da16a7b
|
Somehow the delete function was broken. Fixed it
|
2021-08-21 20:20:33 -04:00 |
|
|
|
2df9810ab4
|
Merge branch 'dev' into dev-Silversthorn
|
2021-08-22 01:42:43 +02:00 |
|
|
|
f1fc2f7d49
|
Add update for French language
|
2021-08-22 01:41:55 +02:00 |
|
|
|
1262d6708b
|
Improve UI and Permissions on Dashboard
|
2021-08-22 01:41:25 +02:00 |
|
|
|
2ea4ff1214
|
Now I actually removed the scroll bars...I think
|
2021-08-21 18:52:46 -04:00 |
|
|
|
0058b6c8cb
|
Removed scroll bars from virt_console
|
2021-08-21 18:51:11 -04:00 |
|
|
|
6ecf6285b9
|
Made it so vterm stops auto scrolling if user interrupts.
|
2021-08-21 16:17:35 -04:00 |
|
|
|
35047e062a
|
Fixed term buttons not changing on start/stop
|
2021-08-21 15:17:07 -04:00 |
|
|
|
c8759ac872
|
Added serverdownload to thread.
Removed exit command if server jar doesn't exist. This was causing exit.txt to constantly try to stop crafty after a jar download in the thread.
|
2021-08-21 14:25:39 -04:00 |
|
|
|
d709c6bd60
|
Update DBCHANGES.md
Correction Syntax to add migrations
|
2021-08-21 14:53:24 +00:00 |
|
|
|
7c2f70cea9
|
Adding Ugly Apple FIle to gitignore
|
2021-08-21 16:50:06 +02:00 |
|
|
|
429938abdd
|
Removing Ugly Apple File
|
2021-08-21 16:49:31 +02:00 |
|
|
|
0e7013f2bc
|
Role Replication
Removing because Can give Role from an other Server to This Server
|
2021-08-21 16:46:50 +02:00 |
|
|
|
31436bdc62
|
Merge branch 'dev' into dev-Silversthorn
|
2021-08-21 16:44:02 +02:00 |
|
|
|
5f387106e2
|
Adding French Language File
|
2021-08-21 16:33:11 +02:00 |
|
|
|
1150c98faf
|
Made it so server is added to all user roles when created.
|
2021-08-21 10:30:37 -04:00 |
|
|
|
89f6a98dc9
|
Took out ability to assign specific users to specific servers. All role based now.
|
2021-08-21 10:07:43 -04:00 |
|
|
|
a68d24b890
|
Adding Working Permissions for roles on html pages
|
2021-08-21 10:44:03 +02:00 |
|
|
|
77a6d260a1
|
Made it so a new thread is spawned for uploads.
Need to add file checking so system doesn't crash when a user tries to upload a dmg or a .mov
|
2021-08-20 15:41:22 -04:00 |
|
|
|
1bc8acb1c5
|
FIxed scrollbars on overlay
|
2021-08-20 15:18:55 -04:00 |
|
|
|
af3ab28ee8
|
Fixed context menu css dupe
|
2021-08-20 15:15:17 -04:00 |
|
|
|
fc719d07d9
|
Merge branch 'pretzel' into 'dev'
Added Upload and Unzip functions. Added better context menu
See merge request crafty-controller/crafty-commander!48
|
2021-08-20 19:03:02 +00:00 |
|
|
|
6e59bbd524
|
Fixed context menu. Added feature for off-clicking.
|
2021-08-20 14:58:52 -04:00 |
|
|
|
bd51742b94
|
Added better context menu
|
2021-08-20 13:46:01 -04:00 |
|
|
|
f539f9e095
|
I leaned on my keyboard just before the last commit. Fixed the things
|
2021-08-19 23:50:24 -04:00 |
|
|
|
e08df4d369
|
Completed file uploading. Need to fix listing when right clicking. Unzip is shown at all times. Added unzip function to helpers and is called through ajax for unzipping files to current directory.
|
2021-08-19 23:36:25 -04:00 |
|
|
|
8b66fc3fc4
|
Adding permissions on role_servers with edit
|
2021-08-20 00:18:50 +02:00 |
|
|
|
90d59faf5b
|
This is broken right now. Trying to add unzip function
|
2021-08-19 16:50:18 -04:00 |
|
|
|
9883d980f4
|
Merge branch 'xithical' into 'dev'
Backups improvements
See merge request crafty-controller/crafty-commander!47
|
2021-08-18 23:32:10 +00:00 |
|
|
|
c20ffb522d
|
Merge branch 'dev' into 'xithical'
# Conflicts:
# app/classes/shared/server.py
|
2021-08-18 23:30:45 +00:00 |
|
