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

328 Commits (b6f82ca020cf18c7cfe7e73904d58daefdd1183d)

Author SHA1 Message Date
ibuler 80fde52dc5 Merge pull request #38 from wptad/master 
fix wss issue when using https  #37 支持 wss 和 https
 2016-01-13 12:32:16 +08:00
ibuler ff5b339ce8 Update asset_cu_list.html 2016-01-09 21:51:07 +08:00
ibuler 70c86d2a44 修改windows下 web terminal窗口高度 2016-01-09 21:50:22 +08:00
ibuler 097d77755a Merge branch 'dev' 2016-01-08 11:48:57 +08:00
Tad Wang d9455e3f9b fix wss issue when using https #37 2016-01-07 15:59:57 +08:00
yumaojun f6a228008b 回收sudo用户， 添加sudo别名添加规则检查 2016-01-07 15:15:44 +08:00
ibuler d9b4f5504c Merge branch 'dev' 2016-01-05 19:29:56 +08:00
yumaojun 01cf2d4e7b 删除role时提醒那些 主机上的系统用户会被删除， （需求：http://bbs.jumpserver.org/read/325.html） 2016-01-05 17:22:25 +08:00
ibuler e9212d5ce6 fix普通用户大小修改 2016-01-04 17:15:33 +08:00
yumaojun ed6559bbe9 修改前端禁止root的正则表达式，做精确匹配 2016-01-04 13:17:58 +08:00
yumaojun 0821e7cf41 Merge branch 'dev' of https://git.coding.net/jumpserver/jumpserver into dev 2016-01-04 13:13:35 +08:00
yumaojun 38f72a85e4 修改前端禁止root的正则表达式，做精确匹配 2016-01-04 13:13:13 +08:00
ibuler d9d009ab1f Merge branch 'dev' of git.coding.net:jumpserver/jumpserver into dev 2016-01-04 12:08:02 +08:00
yumaojun 34e8b32180 添加系统用户删除 提醒 2016-01-04 11:47:50 +08:00
yumaojun c6626e83f2 禁止添加root用户作为系统用户 2016-01-04 11:43:17 +08:00
ibuler 7bef517518 支持修改窗口大小 2016-01-01 22:38:50 +08:00
ibuler b673fec532 添加失败点击提示 2015-12-31 19:12:17 +08:00
ibuler d1ac7ca647 Merge branch 'master' into dev 2015-12-31 10:20:08 +08:00
wangyong f6c26a201e 修改硬盘不显示问题 2015-12-30 22:35:32 +08:00
ibuler 7be7772af6 修复授权修改显示ip 2015-12-30 15:38:28 +08:00
ibuler 86cc963673 更换alert我layer 2015-12-30 12:11:39 +08:00
yumaojun d040e2719f 修复Role 删除时 秘钥问题等异常引起的Bug 2015-12-26 10:12:00 +08:00
yumaojun d604639b96 修复添加role 时　因私钥格式不对而引起的bug(2) 2015-12-22 23:05:38 +08:00
yumaojun 3248ee1a3d 修复添加role 时　因私钥格式不对而引起的bug 2015-12-22 22:39:59 +08:00
ibuler 08cbaa1622 fix sudo bug 2015-12-20 00:30:31 +08:00
ibuler 39b7a7290f merge with dev 2015-12-19 17:30:21 +08:00
ibuler 7b792907d3 merge with dev 2015-12-19 17:27:12 +08:00
ibuler c103738302 merge with dev 2015-12-19 17:26:34 +08:00
ibuler 32ab051bbc modify cmd_group num bug 2015-07-03 21:27:20 +08:00
ibuler 1662269153 websocket auth add 2015-05-28 17:00:03 +08:00
ibuler ce99bf2266 placeholder 2015-05-25 18:35:32 +08:00
ibuler 1952d1ca23 modify sudo show 2015-05-25 18:27:57 +08:00
ibuler 6d34bd45d2 modify nav_bar_header.html 2015-04-24 20:42:15 +08:00
ibuler 992947ac99 modify service.sh bug 2015-04-24 20:39:44 +08:00
ibuler ba55cdde87 modify service.sh bug 2015-04-24 19:12:14 +08:00
ibuler 0beb683c40 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-23 11:23:05 +08:00
root b134c90bfd 解决阻断报错问题 2015-04-23 11:20:12 +08:00
ibuler 311b65da00 ޸bug 2015-04-22 18:57:55 +08:00
ibuler e2ac212fc3 resolve confilict 2015-04-20 20:56:26 +08:00
ibuler 09d3763a02 fix a bug 2015-04-20 20:54:10 +08:00
ibuler 0a8198b2ca ޸Ƴbug 2015-04-20 15:57:10 +08:00
ibuler d84ff97019 ޸Ƴbug 2015-04-20 15:56:49 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +08:00
ibuler 8b50e5252f merge with wangyong 2015-04-19 18:45:07 +08:00
halcyon 86e334e4fa last bug? 2015-04-19 18:36:41 +08:00
ibuler d5fba23d73 ȨҳûҳӵȨб 2015-04-19 00:23:35 +08:00
ibuler e96053ba20 ޸ 2015-04-18 19:15:53 +08:00
ibuler 6d6e9d97b5 ޸ 2015-04-18 18:04:01 +08:00
ibuler 9ab855fd92 merge 2015-04-18 17:00:03 +08:00
ibuler c1d8de4558 ϲ 2015-04-18 16:58:16 +08:00