Andrew
2d357a140a
Merge branch 'gravatar-fix' into 'dev'
...
Fix gravatar not loading after being removed from cookie. Improve gravatar...
See merge request crafty-controller/crafty-commander!136
2022-01-18 21:53:08 +00: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
Andrew
7e6aa8c817
Merge branch 'pretzel-branch' into 'dev'
...
If you want to start a server...or stop it... or send any command you should...
See merge request crafty-controller/crafty-commander!135
2022-01-18 20:44:12 +00:00
Andrew
2d169e8f97
Add terminal catches for server stop command and restart command in crafty's terminal
2022-01-18 15:42:26 -05:00
Andrew
b368246614
If you want to start a server...or stop it... or send any command you should patch your install with this commit
2022-01-18 15:00:00 -05:00
Andrew
5087813900
add catch for restart command. Fix windows bug.
2022-01-18 14:43:22 -05:00
Andrew
2f1b56121a
fix windows path bug
2022-01-18 13:59:53 -05:00
Andrew
a49c5c0e92
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2022-01-18 13:16:12 -05:00
Andrew
bda81b8e20
Add delay on logs download start for on screen messages
2022-01-18 13:16:09 -05:00
Lukas
b43928062a
Merge branch 'lukas-jwts' into 'dev'
...
Add more translations for API keys.
See merge request crafty-controller/crafty-commander!134
2022-01-16 12:15:24 +00:00
luukas
ba64681aa9
Merge branch 'lukas-jwts' of gitlab.com:crafty-controller/crafty-commander into lukas-jwts
2022-01-16 14:14:05 +02:00
luukas
9463560eb6
Add more translations for API keys.
2022-01-16 13:40:08 +02:00
Lukas
d9f734e632
Merge branch 'lukas-jwts' into 'dev'
...
JWT login and multi API keys!
See merge request crafty-controller/crafty-commander!133
2022-01-16 10:55:34 +00: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
351c386c17
Fix a websocket handler bug
2022-01-15 17:38:29 +02: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
b8e9efad76
Add zh_CN translation for API keys.
2022-01-15 14:12:09 +02:00
Andrew
fefa6248b4
Remove time from cron dbs
2022-01-15 02:01:51 -05:00
Andrew
27bdce74e8
Fix windows execution paths
2022-01-15 01:47:31 -05:00
Andrew
a54fe49d84
Windows should work now
2022-01-15 01:37:44 -05:00
Andrew
ef19cecc27
hopeful fix for windows path bug
2022-01-15 01:30:33 -05:00
Andrew
e6000577b3
Tryin something for windows
2022-01-15 01:21:04 -05:00
Andrew
0d8ff36fe4
fix windows path escaping
2022-01-15 00:58:17 -05:00
Andrew
6ec2e10a0a
fixing merge conflict
2022-01-14 23:56:49 -05: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
Iain Powrie
cae2b8a35c
Attempt to fix pip backtracking through versions.
...
Pipelines are stalling and failing.
2022-01-15 04:36:08 +00:00
Andrew
ebfd0b1b12
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2022-01-14 21:32:32 -05:00
Andrew
50a6c0a2ce
donwngrade tzlocal from 4.1 to 3.0
2022-01-14 21:32:26 -05:00
Iain Powrie
0e352029b8
Apply fix for pyinstaller apscheduler import
2022-01-15 02:21:06 +00:00
Andrew
43a315874e
Fix player data bug
2022-01-14 20:05:50 -05:00
Andrew
fa3a196586
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2022-01-14 19:52:58 -05:00
Andrew
ccc41b7419
fix bug where crash detection was still using schedule
2022-01-14 19:52:51 -05:00
luukas
93857f90db
JWT login and multi API keys!
2022-01-15 02:23:50 +02:00
Iain Powrie
00c7af8d8b
Add apscheduler sub-dep collect-alls back to pipe
...
Diagnose module not found windows pyinstaller error
2022-01-14 22:48:13 +00:00
Iain Powrie
c7e72f953a
Copy metadata for the apscheduler and deps
...
Still trying to diagnose pyinstaller hook issues,
May add back collect-alls for tz
2022-01-14 22:32:41 +00:00
Iain Powrie
dde282d05e
Change apscheduler back to collect-all in pipeline
...
Diagnose module not found windows pyinstaller error
2022-01-14 22:19:25 +00:00
Iain Powrie
ecba6da2a9
Add explicit collection of pytz to pipeline
...
Diagnose module not found windows pyinstaller error
2022-01-14 22:12:55 +00:00
luukas
ea3f36809d
Merge branch 'dev' of gitlab.com:crafty-controller/crafty-commander into dev
2022-01-14 23:52:20 +02:00
Iain Powrie
a9b4c21582
Change apscheduler to hidden-import in pipeline
...
Diagnose module not found windows pyinstaller error
2022-01-14 21:43:41 +00:00
Andrew
34039da9e2
Merge branch 'dev' of https://gitlab.com/crafty-controller/crafty-commander into dev
2022-01-14 16:08:08 -05: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
2689a579a7
fix bug where transveral would be true every delete file due to typo
2022-01-14 16:06:02 -05:00
Iain Powrie
6f11a722e4
Add explicit collection of apscheduler to pipeline
...
Diagnose module not found windows pyinstaller error
2022-01-14 20:50:09 +00:00
Iain Powrie
3125c6cc58
Add tzdata collection back to pipeline
...
Diagnose module not found windows pyinstaller error
2022-01-14 20:36:00 +00:00
Iain Powrie
aec8f79c36
Add explicit collection of tzlocal to pipeline
...
Diagnose module not found windows pyinstaller error
2022-01-14 20:24:49 +00:00
Iain Powrie
0a538a6127
Add explicit collection of tzdata to pipeline
...
Diagnose module not found windows pyinstaller error
2022-01-14 20:06:24 +00:00
Andrew
c736c2eec1
Fix for tzdata
2022-01-14 14:59:06 -05:00
Andrew
a124ab24e2
Update dependencies for tzdata
2022-01-14 14:25:43 -05:00
Andrew
9f846c051e
update python modules in requirements.txt
2022-01-14 14:14:51 -05:00
Iain Powrie
5812584de6
Add missing dependant for
...
8723a444
2022-01-14 18:27:49 +00:00
