Commit Graph

1970 Commits

Author SHA1 Message Date
Zedifus
9927d43bf9 Update changelog !403 2022-07-18 21:44:46 +01:00
Zedifus
28b321f100 Fix import order
I have needs
2022-07-18 21:43:13 +01:00
Zedifus
4a2e5d1558 Merge branch 'dev' into tweak/remove_prop_requirement 2022-07-18 21:42:14 +01:00
Iain Powrie
a550c3d47f Merge branch 'dev-FixStatusPage-JS_errors' into 'dev'
Fixing motd not displaying properly one mobiles

See merge request crafty-controller/crafty-4!402
2022-07-18 20:28:11 +00:00
Zedifus
1d8732e2a4 Update changelog !402 2022-07-18 21:24:44 +01:00
Zedifus
ec2094d378 Merge branch 'dev' into dev-FixStatusPage-JS_errors 2022-07-18 21:23:35 +01:00
Iain Powrie
924d39040d Merge branch 'bug/fix-issue-#106' into 'dev'
Fix for issue #106

See merge request crafty-controller/crafty-4!401
2022-07-18 20:22:28 +00:00
Zedifus
cbb1cd7d3b Update changelog !401 2022-07-18 21:19:03 +01:00
Zedifus
374454f11c Merge branch 'dev' into bug/fix-issue-#106 2022-07-18 21:17:41 +01:00
Zedifus
b7b4c7ac11 Merge branch 'dev' into bug/fix-issue-#106 2022-07-18 21:17:16 +01:00
Iain Powrie
ca058be900 Merge branch 'Fix-Pylint-no-self-use' into 'dev'
Fix Pylint no-self-use

See merge request crafty-controller/crafty-4!400
2022-07-18 20:16:43 +00:00
Zedifus
4d7fbe01f5 Update changelog !400 2022-07-18 21:11:40 +01:00
Zedifus
523e51a0ae Merge branch 'dev' into Fix-Pylint-no-self-use 2022-07-18 21:09:51 +01:00
Zedifus
44f3b903d4 Merge branch 'dev' into Fix-Pylint-no-self-use 2022-07-18 21:09:26 +01:00
Iain Powrie
d96845bae3 Merge branch 'feature/pretzel-status-page-show' into 'dev'
Toggle Visible servers on status page

See merge request crafty-controller/crafty-4!399
2022-07-18 20:07:42 +00:00
Zedifus
6be6250f50 Update changelog !399 2022-07-18 21:03:41 +01:00
Zedifus
11dd41501e Merge branch 'dev' into feature/pretzel-status-page-show 2022-07-18 21:01:32 +01:00
Iain Powrie
8694c5024a Merge branch 'hotfix/host-stats-error' into 'dev'
Check for None when getting the CPU frequency data

See merge request crafty-controller/crafty-4!397
2022-07-18 19:59:22 +00:00
Zedifus
514ef419f6 Update changelog !397
Remove tag comparison, gitlab adds tag view hint when viewing changelog
2022-07-18 20:55:50 +01:00
Zedifus
a9e0970a1c Merge branch 'dev' into hotfix/host-stats-error 2022-07-18 20:48:32 +01:00
Zedifus
8db2c693c5 Remove requirement for dev's to update CHANGELOG
This  will be handled on merge  to dev.
2022-07-18 20:47:30 +01:00
Zedifus
015351ed67 Backdate Commit view 2022-07-18 20:42:52 +01:00
Zedifus
6629bf2947 Correct release tracking in changelog 2022-07-18 20:34:58 +01:00
Silversthorn
98fa8e8940 Giving json to auth_data 2022-07-18 20:57:04 +02:00
Silversthorn
bc16e0df2b Revert "Revert changes on base_handler, fixing things in the api methods"
This reverts commit f863357633.
2022-07-18 20:53:49 +02:00
Silversthorn
f863357633 Revert changes on base_handler, fixing things in the api methods 2022-07-17 12:17:45 +02:00
Silversthorn
b6d6b9c0a4 Remove unused elements and move get_players to py file instead of html file 2022-07-17 10:57:25 +02:00
Andrew
d8fadc6abd fix bug broken server creation 2022-07-16 19:19:34 -04:00
Andrew
2ddc1e7c96 Remove server.props requirement 2022-07-16 19:05:00 -04:00
Andrew
ea9b14e917 Add default value to show_status 2022-07-16 18:50:05 -04:00
Silversthorn
b6fc8c059d Fixing motd not displaying properly one mobiles 2022-07-16 19:58:58 +02:00
Silversthorn
a6afd18201 Adding modification to Changelog 2022-07-16 18:55:31 +02:00
Silversthorn
37e812187f Fixing wrong Changelog 2022-07-16 18:54:49 +02:00
Silversthorn
615266fed4 Changelog Correct Typo 2022-07-16 10:58:05 +02:00
Silversthorn
174f5970e9 Update Changelog 2022-07-16 10:57:13 +02:00
Silversthorn
8e58d5f8ac Trying Fixing issue #106 2022-07-16 10:49:48 +02:00
Silversthorn
ee2c2f8bb1 Better use of functions and objects 2022-07-16 10:06:49 +02:00
Silversthorn
9f30ca3931 Fix pylint no-self-use 2022-07-16 09:52:30 +02:00
Andrew
5b599d0058 Appease the linter 2022-07-15 18:47:41 -04:00
Andrew
11260a34d6 Toggle Visible servers on status page 2022-07-14 18:26:42 -04:00
Andrew
b69cdd757e Merge branch 'feature/ajax-schedule-enabled' into 'dev'
Add a schedule toggle

See merge request crafty-controller/crafty-4!398
2022-07-14 22:16:48 +00:00
Andrew
1438ce1c36 Add handle.
Change text color in "on" position
2022-07-14 14:46:23 -04:00
luukas
6af0dc32bd
Add CHANGELOG.md entries related to !398+ 2022-07-13 16:21:08 +03:00
luukas
875767e16c
Merge branch 'dev' into feature/ajax-schedule-enabled 2022-07-13 15:48:09 +03:00
luukas
c88ef5e9d6
Add a title to the schedule toggle on mobile 2022-07-13 13:42:43 +03:00
luukas
4f7e1bfa24
Check for None when getting the CPU frequency data
Default to -1 when an error occurs
2022-07-06 19:00:17 +03:00
Zedifus
43a93f35b3 Version bump to 4.0.6 2022-07-06 03:04:24 +01:00
Iain Powrie
f3c09648f9 Merge branch 'bug/edit-user-issues' into 'dev'
Tweak Edit User Form

See merge request crafty-controller/crafty-4!395
2022-07-06 02:01:20 +00:00
Zedifus
b714d3d0f1 Update changelog for f1d11bfb 2022-07-06 02:54:10 +01:00
Zedifus
f404e38739 Update changelog !395 2022-07-06 02:50:59 +01:00