liuzheng712
|
6db7642331
|
Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into NormalUserPageLZ
|
2015-11-09 16:58:55 +08:00 |
ibuler
|
91b5d039cc
|
修改邮件settings
|
2015-11-09 16:28:10 +08:00 |
ibuler
|
5692e9dc86
|
添加资产的默认设置
|
2015-11-09 11:56:31 +08:00 |
ibuler
|
7849ff2b92
|
解决搜索分页问题
|
2015-11-09 10:53:15 +08:00 |
halcyon
|
e77ec102d9
|
just do it
|
2015-11-08 22:39:30 +08:00 |
ibuler
|
7ea23e0fcc
|
修复无法终结web进程的bug
|
2015-11-08 12:01:08 +08:00 |
ibuler
|
e60a3a697e
|
添加测试web terminal按钮
|
2015-11-07 17:41:16 +08:00 |
ibuler
|
d899360c34
|
增加websocket认证
|
2015-11-07 17:32:32 +08:00 |
ibuler
|
98c4d9bdba
|
web terminal kill方法
|
2015-11-07 15:27:49 +08:00 |
ibuler
|
24730ebd0f
|
web terminal记录日志
|
2015-11-07 13:38:50 +08:00 |
liuzheng712
|
cab346686d
|
update
|
2015-11-07 10:27:55 +08:00 |
liuzheng712
|
d369d4b50f
|
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
|
2015-11-07 09:37:10 +08:00 |
liuzheng712
|
6897d063c2
|
error = '用户未激活'
|
2015-11-07 09:09:36 +08:00 |
liuzheng712
|
4ddddc134a
|
禁用 change to 启用
|
2015-11-06 23:13:02 +08:00 |
liuzheng712
|
44a330ac02
|
download page: waiting...
|
2015-11-06 23:04:09 +08:00 |
liuzheng712
|
f220ea367e
|
upload file with user id path
|
2015-11-06 22:26:19 +08:00 |
ibuler
|
43c0770770
|
使用原生select
|
2015-11-06 12:09:23 +08:00 |
Zi Chuanxiu
|
82286ea7ed
|
fix set host vars and add set group vars
|
2015-11-06 11:32:59 +08:00 |
ibuler
|
01d6f751b1
|
解决实时监控特殊字符,使用term.js
|
2015-11-06 10:42:10 +08:00 |
liuzheng712
|
7a25f348e4
|
upload file: save a copy in ./upload/%Y/%M/%D/. TODO: distinguish userID
|
2015-11-06 00:56:16 +08:00 |
liuzheng712
|
12a0a35adf
|
upload page: need to fix click problem, want to show the list of machines, TODO
|
2015-11-06 00:21:59 +08:00 |
Zi Chuanxiu
|
0f8abb6026
|
update
|
2015-11-05 22:53:19 +08:00 |
Zi Chuanxiu
|
8e2f3fdecd
|
update
|
2015-11-05 22:52:02 +08:00 |
Zi Chuanxiu
|
26e3634814
|
mapping model
|
2015-11-05 22:47:45 +08:00 |
ibuler
|
9a897e0cf4
|
修正导入select错误
|
2015-11-05 20:07:21 +08:00 |
ibuler
|
1bc15e57a6
|
完成webtermial demo
|
2015-11-05 18:31:00 +08:00 |
liuzheng712
|
09087a4d8f
|
set user password , if you don't want to change the password , leave password empty
|
2015-11-05 14:30:59 +08:00 |
liuzheng712
|
6934380b9c
|
jperm/perm_apply.html
|
2015-11-05 13:16:23 +08:00 |
ibuler
|
618aed3278
|
移动api中关于tty到connect.py
|
2015-11-04 17:04:25 +08:00 |
ibuler
|
c8c0061244
|
添加权限鉴定
|
2015-11-04 16:24:52 +08:00 |
ibuler
|
ad4b68a390
|
Merge branch 'jlog' of git.coding.net:jumpserver/Jumpserver into jlog
|
2015-11-04 15:21:44 +08:00 |
kelianchun_miller
|
a95e313733
|
update api.py
|
2015-11-04 15:20:28 +08:00 |
ibuler
|
8b25d3e32e
|
Merge branch 'jlog' of git.coding.net:jumpserver/Jumpserver into jlog
|
2015-11-04 15:15:03 +08:00 |
ibuler
|
a0a7623743
|
修复log kill和在线查看命令统计
|
2015-11-04 15:11:14 +08:00 |
kelianchun_miller
|
5e20ac0454
|
update api.py
|
2015-11-04 14:56:50 +08:00 |
kelianchun_miller
|
d182736bd7
|
update api.py
|
2015-11-04 14:50:47 +08:00 |
root
|
159398b391
|
fix bugs
|
2015-11-03 23:53:12 +08:00 |
ibuler
|
e4ccb1c43f
|
修复日志打印的异常bug
|
2015-11-03 23:21:33 +08:00 |
ibuler
|
9d75ad6cea
|
多线程修复监控阻塞bug
|
2015-11-03 23:03:31 +08:00 |
ibuler
|
b30697ea20
|
基本完成
|
2015-11-03 19:12:15 +08:00 |
wangyong
|
0c0f05b6d9
|
jasset base
|
2015-11-03 17:07:46 +08:00 |
ibuler
|
50d21fcdca
|
for log monitor
|
2015-11-02 23:20:40 +08:00 |
Zi Chuanxiu
|
c49a02d1c5
|
update ansible_api, and update perm_list_user view
|
2015-11-02 23:07:04 +08:00 |
Zi Chuanxiu
|
c26594a3ec
|
update ansible_api, and update perm_list_user view
|
2015-11-02 23:05:19 +08:00 |
Zi Chuanxiu
|
6572e6f10e
|
update ansible_api, and update perm_list_user view
|
2015-11-02 23:03:41 +08:00 |
liuzheng712
|
5144907ec0
|
there is no need to set the password value, very change user info needs password, make sure this is legal
|
2015-11-02 16:00:34 +08:00 |
liuzheng712
|
ba8ed23292
|
add the @login_required(login_url='/login')
|
2015-11-02 15:51:18 +08:00 |
liuzheng712
|
6583b0f530
|
change the login response redirect
|
2015-11-02 15:50:46 +08:00 |
liuzheng712
|
a3bea76994
|
juser/urls.py format
|
2015-11-02 15:49:05 +08:00 |
ibuler@qq.com
|
ebe8ce7109
|
some
|
2015-11-02 11:18:06 +08:00 |