Commit Graph

387 Commits

Author SHA1 Message Date
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
5adc48c524 Merge branch 'pretzel-bedrock' into 'pretzel-fixes'
# Conflicts:
#   app/frontend/templates/server/bedrock_wizard.html
#   app/frontend/templates/server/wizard.html
2022-02-10 20:57:31 +00:00
Andrew
b025899aee Inital bedrock support 2022-02-10 15:54:00 -05:00
Andrew
260c3b0059 Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev 2022-02-10 15:27:51 -05:00
Andrew
c89609ae61 Inital bedrock support 2022-02-10 15:27:40 -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
Iain Powrie
d3b601b29c Merge branch 'lukas-easier-navigation' into 'dev'
Added better navigation.

See merge request crafty-controller/crafty-commander!162
2022-02-10 13:42:21 +00:00
Zedifus
78224a9a55 Update wiki link to wiki
It's back from holiday
2022-02-10 06:49:35 +00:00
luukas
c25bc72315 Added better navigation.
* Double chevrons on the top right to expand/collapse the sidebar
* Save sidebar preference on extra large (>= 1200px) viewports
* Auto collapse sidebar on large (>= 992px) viewports
* (Old behavior) Medium (>= 768px) and smaller viewports are mobile
Check app/frontend/templates/main_menu.html line 45 onwards for more
2022-02-10 00:26:16 +02: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
4a2a1ab451 Remove motd dynamic update as it breaks json loading 2022-01-27 18:19:11 -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
Silversthorn
97cad998e8 Using Wabsocket for refreshing Status Page 2022-01-19 21:34:59 +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
Andrew
f37e1e04a4 Fix gravatar not loading after being removed from cookie. Improve gravatar loading so it changes without relogging 2022-01-18 16:44:36 -05:00
Lukas ‎‎‎‎
09bd01a634 Merge branch 'dev' into 'lukas-jwts'
# Conflicts:
#   app/classes/web/panel_handler.py
#   app/frontend/templates/notify.html
#   app/translations/en_EN.json
#   requirements.txt
2022-01-16 10:54:55 +00: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
Andrew
0d3fc43931 Remove schedules from DB when deleting a server.
Add better messaging for support log prep.
Add english translation for notify.
Chnage dep to 4.0 for tzlocal
2022-01-14 23:53:44 -05: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
Andrew
ef4a31d1e8 Attempt fix for delayed start issues - was finally able to reproduce
Port feature from 3.4 added by Trevor (@uplusion23) for terminal history.
Add datatable to mobile version of tasks.
2022-01-14 02:35:26 -05:00
Andrew
8424fc3149 Put support logs into a thread. 2022-01-13 20:42:53 -05:00
Andrew
362f16fec4 Fix sorting on schedules
Fix deleting scheduled tasks that are disabled.
2022-01-13 00:30:35 -05:00
Andrew
77b65de09b add sorting to tasks table 2022-01-12 23:58:16 -05:00
Andrew
5e59705251 Update sorting on activity log. 2022-01-12 23:52:47 -05:00
Andrew
6ad2075b5a change date formatting on audit log for better date sorting 2022-01-12 23:34:52 -05:00
Andrew
20a69b1e0d fix max size of audit table 2022-01-12 22:56:44 -05:00
Andrew
d4359da6b1 fix front end for tasks and activity logs 2022-01-12 22:54:22 -05:00
Andrew
9f798ff291 Add popover for tasks mobile
Add support logs download feature
2022-01-12 21:12:28 -05:00
Andrew
6fd5db3429 Add popover for mobile schedules 2022-01-12 18:52:44 -05:00
Silversthorn
fe7df99c19 Improve Tasks View for Mobile 2022-01-12 19:48:22 +01:00
Andrew
799b563e5f Fix runtime error with recalling stop command while editing tasks 2022-01-12 00:03:24 -05:00
Andrew
3acc89c0eb Remove depreciated scheduler from tasks 2022-01-11 21:56:37 -05:00
Andrew
79e33cd295 remove scroll bar 2022-01-11 20:26:39 -05:00
Andrew
751fffe4a3 Fix formatting for long commands on scheduled tasks 2022-01-11 20:16:39 -05:00
Andrew
f681e5d69d fix true/false flip on edit task enable/disable 2022-01-11 19:12:54 -05:00
Andrew
68e22de069 Fix bug where you could not select Shutdown from tasks 2022-01-11 19:09:46 -05:00
Andrew
4a4ff16d75 Add classname to delete task button 2022-01-11 18:53:41 -05:00
Andrew
47b48c3ee4 Fix translations in schedules 2022-01-11 18:51:07 -05:00
Andrew
04952737ed I'm dumb. More front end issues 2022-01-11 18:40:02 -05:00
Andrew
fc06c743bc fix bug where 'command' line was always shown 2022-01-11 18:37:31 -05:00
Andrew
51fcb2adc3 Add working schedules.
Add ability to edit schedules.
Add new pages for task creation/edit.
2022-01-11 17:24:05 -05:00
Andrew
5e7d0d64bd Cron tasks working.
Starting to rearrange front end for better UX
2022-01-11 12:17:57 -05:00
Andrew
c220c6d3d3 Remove schedule logic from backups. 2022-01-11 01:45:54 -05:00
Andrew
14ae7c9a46 Add working schedules.
Do not use advanced cron scheduling yet.
Ability to add/delete scheduled jobs.
2022-01-11 00:26:33 -05:00
Andrew
139b506554 Inital APScheduler code for integration with our SQLite DB in progress. Adding commands works with start/stop/restart 2022-01-10 20:11:52 -05:00
Andrew
73c6c1b871 Fix port reminder
Add Server time zone to details
2022-01-10 14:58:38 -05:00
Andrew
2cd15ba738 Fix tree-caret on zip imports 2022-01-09 23:47:10 -05:00
Andrew
70cc90549d Minor fixes to user deletion.
Allow users with user permissions to delete users...wow. How many times can I say user?
2022-01-09 23:34:11 -05:00
Andrew
db6a886e0f Fix minor bugs in super user activation. Add 'are you sure' to delete user 2022-01-09 23:16:11 -05:00
Andrew
3546d50142 add english translation for zip imports 2022-01-09 22:58:13 -05:00
Andrew
4d636cce1b add working zip import selection functionality 2022-01-09 22:49:03 -05:00
Andrew
b815cf38a8 Zip import semi broken.
Need to figure out why temp dir is not being passed correctly
Need to make sure tempdir gets deleted.
2022-01-09 22:21:28 -05:00
Andrew
369ac7ad15 initial changes for zip imports selection 2022-01-09 18:04:54 -05:00
Andrew
935ee66560 fix formatting on cron input 2022-01-09 01:24:04 -05:00
Andrew
83db2bc3e4 Fix naming for basic/cron schedules 2022-01-09 01:16:09 -05:00
Andrew
592121ef78 Fix bug where files tooltip showed up for dirs and tooltip didn't show up for files. 2022-01-09 00:15:18 -05:00
Andrew
9a3d7601e2 Fix file dir tooltip 2022-01-08 23:57:31 -05:00
Andrew
5eb953f2a0 Fix footer 2022-01-08 19:07:50 -05:00
Andrew
7dd24b6b15 Improved File Loading, Fixed Port checking 2022-01-08 23:03:45 +00:00
Andrew
abb7b8af08 Update copyright again 2022-01-01 00:16:43 -05:00
Andrew
1e54f2e3af Update copyright 2022-01-01 00:15:33 -05:00
Andrew
e53da60b4f Make files tree show up on page load 2021-12-20 12:51:27 -05:00
Andrew
a48078ac1a Take edit button out of if statement in server_tasks. 2021-12-09 17:46:07 -05:00
Andrew
49893ea5a6 Merge branch 'pretzels-fixes' into 'dev'
Pretzels fixes

See merge request crafty-controller/crafty-commander!110
2021-12-09 22:39:40 +00:00
Andrew
e12f11f6d5 Add translations
Add style to language select.
2021-12-09 11:44:08 -05:00
Andrew
ebe65e081f Minor change to aestetic for tasks 2021-11-30 15:50:40 -05:00