Andrew
1d3032b23c
Merge branch 'api-perm-fix' into 'dev'
...
Fix for perms error thrown when posting api key from regular user
See merge request crafty-controller/crafty-commander!143
2022-01-20 19:16:02 +00:00
Andrew
33984c9629
Fix for perms error thrown when posting api key from regular user
2022-01-20 14:14:03 -05:00
Andrew
a745e6110d
Merge branch 'notifications' into 'dev'
...
Notifications are only visible to valid server users
See merge request crafty-controller/crafty-commander!142
2022-01-20 18:59:14 +00:00
Andrew
b4bf125a0d
Notifications are only visible to valid server users
2022-01-20 13:37:45 -05:00
xithical
85b040e41f
Updates example nginx config to prevent Crafty being served when a request comes in for a domain that does not match another config. We probably need to document this in the wiki.
...
See merge request crafty-controller/crafty-commander!141
2022-01-20 17:13:15 +00:00
xithical
a12ff2fcf1
Update proxy configs
2022-01-20 17:10:05 +00:00
Andrew
b1e4c88e1f
Merge branch 'panel-translations' into 'dev'
...
Add translations for panel config/users config/api keys/ role config
See merge request crafty-controller/crafty-commander!139
2022-01-20 05:06:49 +00:00
Andrew
dc838d097f
Add translations for panel config/users config/api keys/ role config
2022-01-20 00:05:14 -05:00
Andrew
6b9f50a739
Merge branch 'pretzel-branch' into 'dev'
...
Pretzel branch
See merge request crafty-controller/crafty-commander!138
2022-01-19 23:37:06 +00:00
Andrew
2f3110b107
fix server deleting function due to type error after JWT merge.
2022-01-19 18:28:08 -05:00
Andrew
285a4ff9b4
fix error with logging so we can try to find out what's going on with windows servers not starting
2022-01-19 17:23:04 -05:00
Andrew
7f45b0544a
new windows fix for space escaping
2022-01-19 17:08:29 -05:00
Andrew
4fe174d6d2
additonal fix to windows path bug
2022-01-19 16:47:51 -05:00
Silversthorn
b385d1add3
Add Update Dashboard by websocket
2022-01-19 22:45:52 +01:00
Andrew
e0b3ec4634
Merge branch 'pretzel-branch' into 'dev'
...
push changes to fix loading server pages as regular user. Creating new api...
See merge request crafty-controller/crafty-commander!137
2022-01-19 21:28:10 +00:00
Andrew
dff7c4890b
push changes to fix loading server pages as regular user. Creating new api keys as a regular user does not work - get a white traceback.
2022-01-19 16:22:22 -05:00
Silversthorn
97cad998e8
Using Wabsocket for refreshing Status Page
2022-01-19 21:34:59 +01:00
Silversthorn
0412480216
Fixing Server Command for Windows
2022-01-19 21:33:24 +01:00
Andrew
6f860e967c
final changes for windows path issues
2022-01-19 15:14:56 -05:00
Andrew
e7f51ce65a
refine APScheduler cron triggers
2022-01-19 14:43:34 -05: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
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
