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
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
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
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