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,006 Commits 12 Branches 45 Tags 104 MiB
719896e4b2
Commit Graph

385 Commits

Author SHA1 Message Date
Zedifus
df86897108 Change for to forEach loop 
> Fixes ESLint rule ID security/detect-object-injection
 2022-06-03 18:33:21 +01:00
Andrew
e561e112d4 Refactor jquery-ui to vendors 2022-06-02 13:27:38 -04:00
Zedifus
ca793807cb Add kofi widget 
Not sure how to remove the background behind the widget :(
 2022-05-29 07:09:39 +01: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
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
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
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
Silversthorn
6effc85d82 Removing trad for patreon supporter 2022-03-05 18:46:52 +01:00
Silversthorn
671a8ce369 Fixing Display on Smartphone Translators 2022-03-05 14:22:35 +01:00
Silversthorn
1297eb3fbb Format File 2022-03-05 14:10:23 +01:00
Silversthorn
29f8fb391e Fixing Diplay for Credits 
Adding Profile Pic for empty ones
 2022-03-05 13:59:19 +01:00
Silversthorn
506129729e Update Translation 
- Adding Translation for Credits Page
 - Adding detection support for webpage
 2022-03-05 12:01:36 +01:00
amcmanu3
d5c623b928 Merge branch 'dev' into dev-RefreshStats_Threading 2022-03-03 19:57:06 -05:00
amcmanu3
ab7889914f Bug fixes to ensure player stats display correctly 
Add sync indicator to dashboard
 2022-03-03 19:41:30 -05:00
Andrew
d73316119b Add server download status indicator 2022-03-04 00:36:36 +00:00
Silversthorn
cb1679806e Seperate refresh statistics for each server 
Fixing Broken Things
 2022-03-03 23:13:40 +01:00
Andrew
61ac97c02e Add unexecuted clear. Add option to compress backups 2022-03-02 12:55:49 -05:00
Andrew
e0b8fb35fe Add option to compress backups 2022-03-02 11:34:26 -05:00
Andrew
18283cf2b3 Fix front end for removing world 2022-03-01 21:56:12 -05:00
Andrew
c8c1f301c0 Fix server importing for bedrock that's not a zip 2022-03-01 18:31:38 -05:00
xithical
c4f706d415 Rework of files handling and added exclusions selection for backups. 2022-03-01 01:02:30 +00:00
xithical
26014d0e86 Revert "Merge branch 'xithical-fixes' into 'dev'" 
This reverts merge request !173
 2022-02-28 04:40:33 +00:00
Andrew
10bf19bdf1 QOL changes for markup 2022-02-27 23:02:07 -05:00
Andrew
f563ceb8ad Fix delete backup 2022-02-27 22:45:22 -05:00
xithical
5758d64e96 Merge branch 'dev' into 'xithical-fixes' 
# Conflicts:
#   app/classes/web/ajax_handler.py
#   app/frontend/templates/panel/server_backup.html
 2022-02-28 03:04:23 +00:00
Andrew
70ba8cceec Add fully working backups 2022-02-27 21:49:26 -05:00
Andrew
2bf2902754 Working backup exclusions 2022-02-27 21:40:05 -05:00
Andrew
097d5689fc Fix typo in server_backup.html 2022-02-27 16:41:08 -05:00
Andrew
e7d78cadd4 Initial frontend for backup omissions 2022-02-27 16:15:40 -05:00
Andrew
652a4a28a3 Santize inputs to the best of our ability. Could not find full solutions for server_schedule_edit.hmtl 2022-02-27 14:36:33 -05:00
luukas
775c4d5c9f Fix this one little stupid bug 2022-02-27 20:14:14 +02:00
luukas
92c2af926a Reduced the amount of injection in JavaScript. 
* Moved file endpoints to file_handler.py
* Added a global `serverId` for some pages
* Fixed fi_FI translations
* Some other stuff I don't remember
 2022-02-27 19:26:54 +02:00
Andrew
3b0fbc7e36 English translation for edit scheudles 2022-02-26 20:40:17 -05:00
Andrew
5fa04d5ccc Refactor tasks.html to schedules.html to match naming scheme 2022-02-26 20:23:20 -05:00
Andrew
f82241c96e Add check so you cannot drag and drop anchor tag in dashboard row 2022-02-26 20:02:10 -05:00
Andrew
76b243d695 Remove codeblock that would cause js to vomit 2022-02-26 18:24:03 -05:00
Andrew
09335fc3d9 Add ability to reorder servers based on user 2022-02-26 18:00:54 -05:00
Andrew
18e2ac8328 Change zip import execution string to the correct one 
Fix front end for bedrock imports
Add server type to details
 2022-02-26 12:29:07 -05:00
Andrew
45ae49e84e Add features to child tasks 2022-02-25 19:53:38 -05:00
Andrew
a54a4780b3 fix typo in front end 2022-02-23 23:43:50 -05:00
Andrew
c1020ff3d1 Working chain reaction tasks 2022-02-23 22:58:48 -05:00
Andrew
540584990e Inital bedrock support 2022-02-10 18:20:36 -05:00
Andrew
a084b95426 Merge branch 'dev' into 'pretzel-fixes' 
Merge Dev to pretzel

See merge request crafty-controller/crafty-commander!165
 2022-02-10 19:32:59 +00:00
Andrew
e2930232cd Fix spacing with values in websocket stats update 2022-02-08 01:57:19 -05:00
Andrew
ce2e53a962 Remove (UTC Time) from server start in details. Server start time is localtime. 2022-02-08 01:08:58 -05:00
Andrew
5a290da11d Fix typo in edit_user 2022-02-07 23:36:32 -05:00
Zedifus
624f755fd4 Better format of titles for Support & Retired 2022-02-06 05:37:19 +00:00
Zedifus
0c6bcaa097 Add if for is no img is provided for credit file 
This fixes broken image symbol if no img provided in json
 2022-02-06 05:34:45 +00:00
Andrew
45ab07eb77 Revert migrations 2022-01-27 21:53:07 -05:00
Andrew
85eef71b9e Add max player/total player to stats keeping on dashboard 2022-01-27 18:16:27 -05:00
Iain Powrie
e0ce1d118c Create pylintrc, code review pipeline & correct codebase errors 
Fix uploads,
Only send server stats to user page when they have access to servers
 2022-01-26 01:45:30 +00:00
Silversthorn
bae08d05d9 Merge branch 'dev' into dev_websocket_server_status 2022-01-21 23:54:59 +01:00
Silversthorn
92a65ad7f1 Adding Websocket for server details 
Adding Starting status on languages files
Removing all useless refresh things
 2022-01-21 23:50:04 +01:00
Andrew
dc838d097f Add translations for panel config/users config/api keys/ role config 2022-01-20 00:05:14 -05:00
Silversthorn
b385d1add3 Add Update Dashboard by websocket 2022-01-19 22:45:52 +01:00
Andrew
cebb25b5e9 add try execpt around task scheduling. Fix edit task bug. Fix permission issue after JWT merge 2022-01-19 13:07:26 -05:00
luukas
a20f7c4acf Fix translation stuff 
* Make fallback stuff work
* Use helper.get_setting('language') instead of hardcoded 'en_US'
* Fix status and public pages lang variables
* Fix and add some translations for fi_FI
 2022-01-15 17:38:08 +02:00
luukas
93857f90db JWT login and multi API keys! 2022-01-15 02:23:50 +02:00
luukas
73ed194283 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev 
:P I had some really old changes
 2022-01-14 23:07:06 +02:00