Commit Graph

2452 Commits

Author SHA1 Message Date
Zedifus
d2d812edb7 Merge branch 'dev' into tweak/backup-restore 2022-09-19 22:11:53 +01:00
Iain Powrie
cb50bb288f Merge branch 'bug/bleach' into 'dev'
Temporary bandaid for &

See merge request crafty-controller/crafty-4!457
2022-09-19 21:09:31 +00:00
Zedifus
ad8d85ef59 Update changelog !457 2022-09-19 22:07:31 +01:00
Zedifus
be8b24975d Merge branch 'dev' into bug/bleach 2022-09-19 22:04:59 +01:00
Iain Powrie
4b21270fa7 Merge branch 'bug/js-errors' into 'dev'
Cleanup JS errors

See merge request crafty-controller/crafty-4!455
2022-09-19 21:01:50 +00:00
Zedifus
c6dfd9688d Update changelog !455 2022-09-19 21:58:41 +01:00
Zedifus
07941b7c3c Merge branch 'dev' into bug/js-errors 2022-09-19 21:57:43 +01:00
Iain Powrie
67d853700a Merge branch 'tweak/terminal-scroll' into 'dev'
Add button to scroll to bottom of vterm

See merge request crafty-controller/crafty-4!454
2022-09-19 20:53:54 +00:00
Zedifus
e6351dab75 Update changelog !454 2022-09-19 21:49:50 +01:00
Zedifus
53be81dc08 Merge branch 'dev' into tweak/terminal-scroll 2022-09-19 21:47:52 +01:00
Iain Powrie
6ad0bf2daa Merge branch 'tweak/debug-backup-logging' into 'dev'
Change how we calc backup exclusions list range

See merge request crafty-controller/crafty-4!453
2022-09-19 20:45:40 +00:00
Zedifus
8ce36b5cc8 Update changelog !453 2022-09-19 21:42:48 +01:00
Zedifus
b93733c758 Merge branch 'dev' into tweak/debug-backup-logging 2022-09-19 21:39:14 +01:00
Iain Powrie
63c9f1cff6 Merge branch 'bug/roles-trace' into 'dev'
Fix traceback on roles config redundant nav

See merge request crafty-controller/crafty-4!452
2022-09-19 20:36:45 +00:00
Zedifus
dc5760ba24 Update changelog !452 2022-09-19 21:36:13 +01:00
Zedifus
93ccfa4304 Merge branch 'dev' into bug/roles-trace 2022-09-19 21:34:11 +01:00
Zedifus
0933d5a726 Update changelog to track 1b2fef06fb 2022-09-19 21:31:42 +01:00
Andrew
f5cdd9f573 Check to "which java" doesn't return none 2022-09-19 11:13:35 -04:00
Andrew
9ecf912a98 Make default option be selected option in edit 2022-09-16 13:15:07 -04:00
amcmanu3
187860056c Create set from list for client list size change 2022-09-16 13:09:10 -04:00
Andrew
a3c1d9e051 Fix typo in panel handler for unloaded config 2022-09-14 13:13:32 -04:00
Andrew
67d465b94c Add debug logging 2022-09-12 15:36:13 -04:00
Andrew
82c0452f55 Add pfp caching for users 2022-09-12 15:34:47 -04:00
amcmanu3
2b35da71fc Fix logic with gravatar email 2022-09-09 15:04:45 -04:00
amcmanu3
375df0c27d Only check for gravatar if internet 2022-09-09 15:00:08 -04:00
amcmanu3
e14e795b47 Add schedules to backup restore
Persist execution command
2022-09-09 14:49:31 -04:00
amcmanu3
17b6ec9fe3 Cleanup JS errors 2022-09-09 13:16:26 -04:00
Andrew
84838aae4d Fix vterm scroll logic when user is on bottom 2022-09-07 18:16:18 -04:00
Andrew
a0d921ffe3 Cleanup virtual term scroll
Add scroll to bottom button when scrolled
2022-09-07 18:02:49 -04:00
Andrew
6a6376ea8a appease the linter 2022-09-07 16:52:27 -04:00
Andrew
d45e32013b Fix backup exclusion issue 2022-09-07 16:51:41 -04:00
Andrew
296a5a46de Add comments. Debug logging 2022-09-07 16:01:42 -04:00
Andrew
7437944988 Fix & issues 2022-09-07 15:56:18 -04:00
Andrew
df7d10886e Fix & with bleach 2022-09-07 14:55:40 -04:00
Andrew
1a9dd53ebe Remove roles url from href
Fixes trace when clicking "roles config" tab while on roles config page.
2022-09-07 13:48:18 -04:00
amcmanu3
1b2fef06fb Fix critical bug with unloaded servers 2022-09-05 23:15:07 -04:00
Zedifus
3e29e3c77c Prepare 4.0.13 release base 2022-09-05 01:20:21 +01:00
Iain Powrie
e899753a6c Merge branch 'dev' into 'master'
4.0.12

See merge request crafty-controller/crafty-4!445
2022-09-05 00:06:55 +00:00
amcmanu3
011b66e1df Fix server startup after update 2022-09-04 19:06:07 -04:00
amcmanu3
83834286fb Fix creation aesthetic 2022-09-04 18:27:45 -04:00
amcmanu3
e3cf2765f0 Merge branch 'dev' of gitlab.com:crafty-controller/crafty-4 into dev 2022-09-04 18:01:03 -04:00
amcmanu3
ab2e8cde0f Fix formatting on server creation page. 2022-09-04 18:01:00 -04:00
Iain Powrie
3715dad06f Merge branch 'tweak/update-notifs' into 'dev'
Fix start server after updates

See merge request crafty-controller/crafty-4!449
2022-09-04 21:56:18 +00:00
amcmanu3
76a499f5a4 Fix start server after updates
Fix update notifs
2022-09-04 17:50:08 -04:00
Iain Powrie
1ca34948cc Merge branch 'bug/mc-ping-traceback' into 'dev'
Wrap sock.recv in try/execpt to stop failure

See merge request crafty-controller/crafty-4!444
2022-09-04 20:56:34 +00:00
Zedifus
469428d48d Update changelog !444 2022-09-04 21:52:33 +01:00
Zedifus
b0403a0b1f Merge branch 'dev' into bug/mc-ping-traceback 2022-09-04 21:51:50 +01:00
Iain Powrie
e4b4cc6027 Merge branch 'tweak/password-reset' into 'dev'
Make password resets not case sensitive

See merge request crafty-controller/crafty-4!447
2022-09-04 20:47:26 +00:00
Zedifus
6dbe92fb90 Update changelog !447 2022-09-04 21:42:27 +01:00
Zedifus
385ceb9655 Merge branch 'dev' into tweak/password-reset 2022-09-04 21:41:27 +01:00