Merge branch 'jlog' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
# Conflicts: # jumpserver/views.py # juser/models.py # juser/views.py # templates/jperm/perm_apply.html
Showing
.DS_Store
deleted
100644 → 0
File deleted
jlog/log_api.py
0 → 100644
jperm/perm_api.py
0 → 100644
jumpserver/models.py
0 → 100644
jumpserver/tasks.py
0 → 100644
playbook/user_perm.yaml
0 → 100644
run_websocket.py
0 → 100644
646 Bytes
872 Bytes
static/js/term.js
0 → 100644
This source diff could not be displayed because it is too large.
You can
view the blob
instead.
static/js/wssh.js
0 → 100644
templates/jlog/base.jinja2
0 → 100644
templates/jlog/static.jinja2
0 → 100644
templates/log_watch.html
0 → 100644
templates/setting.html
0 → 100644
templates/test2.html
0 → 100644