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
2,101 Commits 12 Branches 45 Tags 104 MiB
eea5e329af
Commit Graph

502 Commits

Author SHA1 Message Date
amcmanu3
177d99e002 Add mobile menu to pages without it 2022-06-21 15:59:34 -04:00
amcmanu3
6c360d1ff1 Make backup failed alert 2022-06-21 15:59:08 -04:00
Zedifus
70e9290627 Merge branch 'dev' into dev-ImprovingMobileDisplay 2022-06-21 20:23:48 +01:00
Zedifus
a6d9b81775 Add execution cmd -display only- for non supers 2022-06-21 20:11:01 +01:00
Zedifus
28e313ee1d Revert back to 'Do not override' as default 2022-06-21 19:53:23 +01:00
Zedifus
6fe5d16ded Remove java selection from bedrock 2022-06-21 19:05:56 +01:00
amcmanu3
c4fb6482cc Fix sec bug with server creation roles 
Retain current java version in dropdown.
 2022-06-21 01:18:19 -04:00
Zedifus
bad7a8d625 Merge branch 'dev' into feature/java-selection 2022-06-21 04:29:37 +01:00
amcmanu3
569d21f295 Fix java override for general user 2022-06-20 20:50:34 -04:00
amcmanu3
41532f97ef Change translation from None to javaNoChange 2022-06-20 18:53:19 -04:00
Zedifus
8e646df58c Add Java detect for win, and hook up to front end 2022-06-20 23:44:33 +01:00
Silversthorn
eb37faac08 Better Mobile Display for Dashboard 2022-06-20 23:41:52 +02:00
amcmanu3
7670b91cc6 Add backup shutdown feature 
Add backup notif for failed backup
 2022-06-20 17:16:56 -04:00
Silversthorn
2d3377b497 Fixing Resizing of the table 2022-06-20 22:39:03 +02:00
Andrew
7d286e60e0 Backup/Config.json rework for API key hardening 
See merge request crafty-controller/crafty-4!369
 2022-06-20 19:26:21 +00:00
Silversthorn
ce21ed6171 Fixing Mobile Display on Server Wizard 2022-06-20 19:24:09 +02:00
Andrew
4f5b52bbdf remove sticky from main menu 2022-06-18 18:19:32 -04:00
Andrew
e9bf2af83b Add wiki iframe as requested. 2022-06-18 15:57:37 -04:00
Andrew
4a35e09fbd Remove commander naming scheme from public 2022-06-18 15:53:47 -04:00
Andrew
fff186e547 Merge branch 'bugfix/reconnecting-websocket' into 'dev' 
Make the WebSocket automatically reconnect.

See merge request crafty-controller/crafty-4!345
 2022-06-16 13:39:25 +00:00
luukas
f39e75616c
Use an exponential backoff algorhithm. 
https://stackoverflow.com/a/37038217/15388424
 2022-06-16 02:37:53 +03:00
Iain Powrie
c22d07d832 Merge branch 'bugfix/getelementbyid-first-dashboard' into 'dev' 
Fix an error when there are no servers

See merge request crafty-controller/crafty-4!346
 2022-06-15 23:30:12 +00:00
luukas
d9c03caa9b
Fix an error when there are no servers 2022-06-16 00:19:48 +03:00
luukas
cd8ebfdcbe
Make the WebSocket automatically reconnect. 
The WebSocket reconnects 5 seconds after the connection's closure.
If the connection reconnection fails it will try to reconnect after
another 5 seconds.
 2022-06-16 00:10:48 +03:00
luukas
c9744554d4
Improve the code for save status 2022-06-14 03:07:26 +03:00
luukas
a67f069709
Fix Ace editor saving keybinds and ex-commands 
* Remove our manual keydown handler and use an Ace builtin function
* Define Vim's :write aka :w ex-command
 2022-06-14 02:45:17 +03:00
luukas
392cf3d4e7
Make the file editor stick to the top of the page 2022-06-14 01:35:43 +03:00
Andrew
474597d16c Add survery to admin first log 2022-06-12 17:03:42 -04:00
Andrew
52d53aafe4 Delay wss error message for slower systems 2022-06-12 10:47:12 -04:00
amcmanu3
d5be8d1531 Update contribution page 2022-06-11 16:36:07 -04:00
Silversthorn
538b78db47 Fixing Translations issues loaded in with js 2022-06-09 00:11:21 +02:00
Silversthorn
f23bdd14a2 Fixing an issue with single quotes and translations 2022-06-08 23:56:22 +02:00
Silversthorn
61806b6050 Correction of unused import 2022-06-04 02:13:11 +02:00
Iain Powrie
ebf00a1900 Merge branch 'secops/pre-beta-security-fixes' into 'dev' 
Pass 2 sec advisory fixes

See merge request crafty-controller/crafty-4!294
 2022-06-03 20:10:17 +00:00
amcmanu3
0200f1caec Remove useless console logs 2022-06-03 15:53:12 -04:00
amcmanu3
6eb3e541bf Fix player counts on dashboard 2022-06-03 15:21:57 -04:00
Zedifus
4cdd2bf776 Remove unused code 2022-06-03 19:50:58 +01:00
Zedifus
62bdf22618 Change for to forEach loop 
> Fixes ESLint rule ID security/detect-object-injection
 2022-06-03 19:49:51 +01:00
Zedifus
04ffe0eb65 Remove unused function 2022-06-03 18:41:05 +01:00
Zedifus
df86897108 Change for to forEach loop 
> Fixes ESLint rule ID security/detect-object-injection
 2022-06-03 18:33:21 +01:00
Andrew
293ae5dbd1 Remove link to non-used jquery item 2022-06-02 13:41:16 -04:00
Andrew
e561e112d4 Refactor jquery-ui to vendors 2022-06-02 13:27:38 -04:00
DarthLeo1000YT
d486fdd4c8 add jquery back to the main base.html template. 2022-05-30 20:57:19 -04:00
Andrew
26b3b8a869 Merge branch 'cleanup/remove-unused-dependencies' into 'dev' 
Remove unused dependencies

See merge request crafty-controller/crafty-4!279
 2022-05-30 13:18:42 +00:00
Zedifus
ca793807cb Add kofi widget 
Not sure how to remove the background behind the widget :(
 2022-05-29 07:09:39 +01:00
luukas
f2890fa31d
Remove unused dependencies 2022-05-28 18:31:11 +03:00
Andrew
7ca7232829 Add question to warning message 2022-05-24 19:11:14 -04:00
Andrew
5104c34513 Add link to documentation to WSS error 2022-05-23 21:23:29 -04:00
Zedifus
2a4295d9b3 Add subscription source parsing & format html 2022-05-23 22:21:32 +01:00
Iain Powrie
1e96e7a6c9 Merge branch 'merge/api-v2' into 'dev' 
New API v2 PR

See merge request crafty-controller/crafty-4!254
 2022-05-18 23:27:19 +00:00
Iain Powrie
11b7817a11 Merge branch 'dev-BetterDisplayMobile' into 'dev' 
Better display on mobile

See merge request crafty-controller/crafty-4!229
 2022-05-18 23:13:05 +00:00
Andrew
b7780682d5 Merge branch 'dev' into 'merge/api-v2' 
# Conflicts:
#   app/classes/controllers/crafty_perms_controller.py
 2022-05-18 21:56:39 +00:00
Andrew
ca73a5f60b Merge branch 'dev' into 'experimental/feature/permission-matrix' 
# Conflicts:
#   app/classes/web/panel_handler.py
 2022-05-18 20:47:43 +00:00
amcmanu3
0f661d5400 Disable checkboxes until server access 2022-05-18 16:37:38 -04:00
Silversthorn
bef099a5a8 Merge branch 'dev' into dev-BetterDisplayMobile 2022-05-18 22:13:44 +02:00
Silversthorn
8c21eddf2b Fixed Table occupation 2022-05-18 22:00:20 +02:00
amcmanu3
12390306fd Add permissions checks for quantity for users/role 
Remove the ability to add quantities for general users.
 2022-05-18 14:33:22 -04:00
luukas
559a345f25 Merge branch 'dev' into merge/api-v2 2022-05-18 01:49:19 +03:00
luukas
8737c15fcf Add a permission matrix to the role add and edit 2022-05-18 01:09:58 +03:00
Andrew
984f4cc4d6 Change Files Aesthetic 2022-05-15 12:38:48 -05:00
Andrew
5fa209bf52 Add date to uptime calc. 
Big assist from Zedifus
 2022-05-14 18:51:05 -05:00
luukas
1aa0d65cf7 Merge branch feature/external-frontend to feature/api-v2 without the frontend 2022-04-14 15:33:53 +03:00
Iain Powrie
5d209b0827 Merge branch 'macgeek.db' into 'dev' 
Macgeek database refactor

See merge request crafty-controller/crafty-commander!246
 2022-04-13 19:26:11 +00:00
Andrew
ec6421b62c Disable Backups when no path 2022-04-12 17:37:20 -04:00
Andrew
12b0f8326d Fix bug where no backup dir would exist on clone 2022-04-12 17:17:12 -04:00
Andrew
cbd99f2ccc Fix bug where users could not drag files 2022-04-12 15:27:03 -04:00
amcmanu3
9a6152abdd Add end quote 2022-04-02 23:34:58 -04:00
amcmanu3
f921f777eb Enhance file save feedback 2022-04-02 23:21:21 -04:00
amcmanu3
82df93c700 Fix bug where server id was hard coded on cmd send 2022-04-02 22:44:40 -04:00
amcmanu3
71fd416fd0 Appease Zedifus 2022-04-02 21:47:32 -04:00
amcmanu3
c7394ab77e Add ability for users to disable hints 2022-04-02 21:25:26 -04:00
amcmanu3
4166d99885 Change password name 2022-04-02 20:37:22 -04:00
amcmanu3
03ce4ec517 Add ability to use ctrl + s 
Add save status indicator
 2022-04-02 15:57:11 -04:00
amcmanu3
657d3e92f2 Add max stream size to config.json 
Add ability to translate error message
 2022-04-02 13:50:40 -04:00
amcmanu3
dc69a8a9f2 Add better feedback on upload max size failure 2022-04-02 13:06:20 -04:00
Andrew
f78d59fd34 Server jars/gravatar would stack with no internet 2022-03-27 18:09:49 -04:00
Andrew
c93824de7c Add quotes to fix formatting 2022-03-27 17:26:48 -04:00
Silversthorn
c7fab827d9 Adding Dropdown menus for small screens 2022-03-26 23:37:08 +01:00
Silversthorn
3797d5430f Merge branch 'dev' into dev-BetterDisplayMobile 2022-03-23 19:33:43 +01:00
Andrew
ecc87a6137 Add context menu for iOS + Bug fix 2022-03-22 14:24:15 +00:00
Silversthorn
0933c5750d Trying to do table dropdown for Dashboard page 2022-03-20 14:41:27 +01:00
Randy Carranza
6d6699638a Resolves an issue on mobile where the table cant be scrolled to the side 2022-03-20 08:03:56 -04:00
Randy Carranza
c303a866b6 Added code to disabled sorting when the user is a mobile user 2022-03-20 06:04:06 -04:00
Iain Powrie
f280da8c52 Better dashboard re-ordering 2022-03-19 01:48:24 +00:00
amcmanu3
1253d60ad8 Remove scroll bars from motd 2022-03-14 19:48:53 -04:00
Andrew
6659466427 Merge branch 'bug/cannot-create-server' into 'dev' 
Fix error where user could not create server

See merge request crafty-controller/crafty-commander!211
 2022-03-14 23:11:01 +00:00
amcmanu3
0f27b2df91 Fix error where user could not create server 
Fix error where user could not create support files
 2022-03-14 17:39:19 -04:00
Silversthorn
5900033134 Fixing Cookies deletion 
Adding redirection at Login
 2022-03-14 22:26:09 +01:00
Andrew
1f980484ae Adjust max size of motd 2022-03-13 17:12:33 -04:00
Andrew
f889dc1dad Fix bug could not drag servers after searching 2022-03-13 16:41:27 -04:00
Andrew
c111f7b69e Add === to check in dash 2022-03-13 16:14:50 -04:00
Andrew
6b42735444 Add search to dashboard 
Fix MOTD formatting
 2022-03-13 16:02:55 -04:00
Andrew
fdce9e2539 Add websocket warning/error 2022-03-13 08:44:19 -04:00
Andrew
3a8174cc22 Add status bar for support log archive 2022-03-13 08:29:26 -04:00
Andrew
33cad6afa8 Add percentage to backups page 
Helper designed to be used for support logs as well.
 2022-03-11 00:19:05 -05:00
Andrew
eda9f44b5f Merge branch 'bug/backups-restore/download' into 'dev' 
Bug/backups restore/download

See merge request crafty-controller/crafty-commander!197
 2022-03-08 02:56:52 +00:00
amcmanu3
7302737005 Fix 'server_id' not defined bug in download file 2022-03-07 21:48:37 -05:00
amcmanu3
244beed1e4 Fix restore message not showing up immediately 2022-03-07 21:46:42 -05:00
Iain Powrie
9c99346bbe 3.5 Translations (Squashed) 
Thank you translators <3 you're all amazing!
 2022-03-08 01:22:30 +00:00
Andrew
344348fafc Merge branch 'sync-symbol' into 'dev' 
Add sync symbol to status page

See merge request crafty-controller/crafty-commander!196
 2022-03-08 01:08:28 +00:00