github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,474 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

1474 Commits (5f35b740df616e8fc081b246767c37747e4c595d)

Author SHA1 Message Date
yumaojun 4903a17104 Merge branch 'map_perm' into dev 
# Conflicts:
#	jperm/ansible_api.py
#	jperm/views.py
 2015-12-10 01:15:25 +08:00
yumaojun a068498561 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 
# Conflicts:
#	jperm/ansible_api.py
 2015-12-10 00:17:01 +08:00
halcyon 1a3541e575 fix bugs 2015-12-10 00:13:50 +08:00
yumaojun 49267b57e4 1. 角色添加和角色修改, Server 端　输入验证 
2. 日志打印
 2015-12-10 00:10:39 +08:00
ibuler d337b929ef perm edit fix 2015-12-09 17:27:13 +08:00
ibuler f74b15c1bf perm edit fix 2015-12-09 16:42:48 +08:00
ibuler d3fd9e05ca ansible api fix 2015-12-09 14:50:48 +08:00
ibuler 16b94c1089 bug fix 2015-12-09 11:49:30 +08:00
ibuler d6b4c7c485 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-12-08 23:19:42 +08:00
ibuler 0309213ccc bug fix 2015-12-08 23:19:39 +08:00
ibuler e408414631 bug fix 2015-12-08 19:25:11 +08:00
kelianchun_miller 80ffb9d762 update connect.py 2015-12-08 11:44:42 +08:00
ibuler bd2a3e6119 bugfix 2015-12-08 11:32:27 +08:00
ibuler 95e8115045 bug fix 2015-12-07 23:29:19 +08:00
ibuler b7cfac4d1f bug fix 2015-12-07 23:21:10 +08:00
ibuler 5be2633795 bug fix 2015-12-07 18:06:07 +08:00
ibuler cb12b83e47 bug fix 2015-12-07 17:41:29 +08:00
ibuler cd798daf0a bug fix 2015-12-07 17:30:57 +08:00
wangyong 7f6f46b662 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-12-06 23:48:46 +08:00
wangyong e78d7b0219 cu asset page and sth 2015-12-06 23:48:39 +08:00
yumaojun 58082179fe １. 用户的批量回收, 角色删除会回收推送的角色 2015-12-06 23:44:13 +08:00
ibuler 622611498c fix bug 2015-12-06 23:33:23 +08:00
ibuler b346e1c480 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-12-06 22:00:55 +08:00
ibuler bf23d6d7aa fix some bug 2015-12-06 22:00:44 +08:00
kelianchun_miller 3d0b8917fa update connect.py 2015-12-06 20:56:28 +08:00
yumaojun 8723d673d7 1. 计算该角色有哪些主机没推送时，使用交集计算（原来是差集） 
2. 修改rule   detail页面　不计算，经返回rule 记录的信息
3. 修改role   detail页面　不计算，经返回rule 记录的信息
4. 添加了 推送主机上的用户回收功能
5. TODO:  页面的美观展示，与　实现　用户的批量回收。
 2015-12-06 18:07:57 +08:00
ibuler 35c818f4a0 用户详情 2015-12-06 00:28:43 +08:00
ibuler 532646a431 Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-12-05 17:55:49 +08:00
ibuler 0fd7b980de fix some bug 2015-12-05 17:55:45 +08:00
wangyong 2f0e91a538 fix bug 2015-12-05 16:57:47 +08:00
wangyong 0f6f3bdb9a Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-12-05 16:15:33 +08:00
wangyong 2c3e681942 fix bugs 2015-12-05 16:15:19 +08:00
ibuler 34ccaeb10f fix push role bug 2015-12-05 12:03:18 +08:00
wangyong 8f985ade97 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2015-12-05 11:09:41 +08:00
wangyong 9b7ef1139e fix bugs 2015-12-05 11:09:34 +08:00
ibuler 2829a7ad31 fix asset admin count 2015-12-04 18:49:17 +08:00
ibuler b5325fd0ac bug fix for rule add check 2015-12-04 18:24:20 +08:00
ibuler 69bbdab450 完成上传下载 2015-12-04 13:42:05 +08:00
ibuler 6975acfc8a 文件上传日志 2015-12-03 23:24:34 +08:00
ibuler 9233fef63f exec log 2015-12-03 19:10:37 +08:00
ibuler 33663783cc 恢复错误修复 2015-12-03 18:49:04 +08:00
ibuler 6f4fd18c47 add 2015-12-03 18:38:06 +08:00
ibuler 7decfdc37f col-lg -> col-sm to 2015-12-03 18:37:18 +08:00
ibuler 267bb02417 修改exec 和 MyRUnner 2015-12-03 16:53:39 +08:00
ibuler 255e3a043a 修改支持选中执行 2015-12-03 10:38:10 +08:00
ibuler 6080a861db Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2015-12-02 23:50:31 +08:00
ibuler 4959073a33 web 批量执行命令 2015-12-02 23:50:20 +08:00
halcyon f6dbec1436 day update 2015-12-02 23:39:17 +08:00
ibuler 88fbcabcbb exec-cmd tempalate 2015-12-02 19:17:12 +08:00
ibuler 1f26e49fb8 完成web批量命令执行 2015-12-02 19:16:05 +08:00