github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
2,337 Commits
98 Branches
262 Tags
144 MiB
Commit Graph

504 Commits (ac3553babb5b761ab3c17b487a85a1d06901b6c6)

Author SHA1 Message Date
ibuler ac3553babb [Fixture] 修改asset detail 2017-04-04 11:14:59 +08:00
ibuler 97fb2a4fe6 [Fixture] 修改index页面 2017-04-03 00:27:18 +08:00
ibuler 709552f14c [Fixture] 添加首页 2017-04-02 18:09:40 +08:00
ibuler 66a2262ee9 [Fixture] 增加 asset groups assets api 2017-04-01 00:41:16 +08:00
ibuler 067426d5e0 [Fixture] 完成用户向导页 2017-03-31 23:46:00 +08:00
ibuler 135899608e Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver 2017-03-31 18:48:11 +08:00
ibuler 7720e9f3fd [Change] 修改图片 2017-03-31 18:47:50 +08:00
ibuler 61a481f427 [Fixture] 添加用户连接终端 2017-03-31 11:25:25 +08:00
ibuler 3fa5ce5404 [Fixture] 添加用户信息更改 2017-03-30 16:28:00 +08:00
ibuler 0983f294b7 [Fixture] 添加用户profile 2017-03-30 00:51:36 +08:00
ibuler 4e7b665ea8 [Change] 添加翻译，并添加用户登陆页面 2017-03-29 15:26:32 +08:00
右书僮 b34c5dde40 Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver 
# Conflicts:
#	apps/assets/templates/assets/asset_list.html
 2017-03-27 08:03:23 +08:00
右书僮 9de2ff2052 修复idc_list删除时重新加载table 2017-03-27 07:58:35 +08:00
ibuler a4ad9b49b9 Merge branch 'audits' 2017-03-26 19:41:17 +08:00
ibuler 90055f7680 [Bugfix] 添加翻译 2017-03-26 19:41:10 +08:00
ibuler 49f6ed524d Merge with master 2017-03-26 11:54:46 +08:00
ibuler 1f9dbb6bdc [Change] 修复验证码模糊度 2017-03-24 23:13:17 +08:00
ibuler 10eb13920b [Delete] 删除资产tag 2017-03-24 14:48:18 +08:00
ibuler a57dac0706 [Fixture] 拆分proxy log 为在线和离线 2017-03-24 14:23:51 +08:00
右书僮 e0179ea332 删除资产HTML页面中SystemUser相关内容(视图中的相关API暂时未动) 2017-03-24 11:13:40 +08:00
右书僮 c931d3179b 修复资产组更新中 用户己选择的资产项不全问题 2017-03-24 11:02:55 +08:00
右书僮 c5666f1357 fix some files 2017-03-24 10:37:05 +08:00
ibuler b60e5a7ee3 [Change] 修改一些view 2017-03-24 00:27:33 +08:00
ibuler c940a4c0fb [Fixture] 增加 task list 删除按钮 2017-03-23 00:15:25 +08:00
ibuler 3f72ce4b1f [Update] 更新生成fake数据脚本 2017-03-22 23:36:43 +08:00
ibuler 2ae57a7970 [Delete] 删除 system user一些属性 2017-03-22 22:15:15 +08:00
ibuler 610c9c5149 Pull it 2017-03-22 22:05:24 +08:00
ibuler caec9709ef [Fixture] 添加task list 搜索，重试 2017-03-22 21:57:05 +08:00
ibuler a4504dc0c7 [Change] 拆分tasks 2017-03-16 00:43:43 +08:00
ibuler 0fbd9843bd [Change] 修改runner, inventory位置 2017-03-16 00:19:47 +08:00
ibuler 240c7db416 [Fixture] 添加 rerun function 2017-03-14 14:15:13 +08:00
ibuler 915873135e [Fixture] 添加runner run record 2017-03-14 00:58:25 +08:00
ibuler a822f667af [Fixture] 完成用户推送task 2017-03-09 14:55:33 +08:00
ibuler c234b5b2d5 Update AdHocRunner 2017-03-06 23:34:54 +08:00
xiaokong1937@gmail.com 694899799b trivial changes 2017-03-06 21:05:00 +08:00
ibuler eb5a9dd20f Remote ansible_api file 2017-03-05 23:30:14 +08:00
ibuler 6015f2423b [Fixture] 添加PlaybookRunner 2017-03-05 20:53:24 +08:00
ibuler 01e50d592e 完成AdHoc JMSHost JMSInventory 2017-03-05 11:38:02 +08:00
ibuler ab62bfca7e [Bugfix] 修改一些bug 2017-03-04 16:38:26 +08:00
ibuler 9c2c38c74a [Bugfix] 修复导入自定义过滤器问题 2017-03-03 15:15:10 +08:00
ibuler 695dc96ce8 Merge branch 'audits' 2017-03-03 10:24:34 +08:00
ibuler 9518672ad2 Add 2017-03-02 18:29:29 +08:00
ibuler b055144908 Merge with audits 2017-03-01 15:35:11 +08:00
ibuler 7825c107ab [Bugfix] model FieldError 2017-03-01 15:30:19 +08:00
右书僮 dd5dd9d7e1 fixed html files 2017-02-25 23:20:20 +08:00
Webb 63fd3cfff2 fixed asset_group delete html 2017-02-25 20:18:13 +08:00
Webb a6825ac91e fixed asset_list html and asset_update 2017-02-25 17:25:27 +08:00
Webb 8ee9d02ffc fixed html 2017-02-24 21:29:11 +08:00
ibuler 008be6a8e3 [Fixtrue] 完成terminal detail 和批量结束会话 2017-02-12 16:51:32 +08:00
ibuler 1f544b98ab [Stash] 删除结束会话之前 2017-02-11 19:49:15 +08:00