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

234 Commits (ebb30424fa88fc3b9a7c4be5790322ed279e7471)

Author SHA1 Message Date
ibuler d3e9c8c9c0 Replace ssh server dir 2016-09-25 00:21:32 +08:00
ibuler cfef374454 Update ssh server 2016-09-25 00:11:31 +08:00
ibuler 0d4ca9717e Merge branch 'master' into connect 2016-09-24 22:18:07 +08:00
ibuler 7ab47916f2 add __init__.py 2016-09-24 22:12:49 +08:00
ibuler 283c53fddf Update gitignore 2016-09-24 22:11:53 +08:00
ibuler da56310db9 update .gitignore 2016-09-24 22:09:20 +08:00
ibuler 4925f3227a update .gitignore 2016-09-24 21:57:24 +08:00
ibuler ab18fe466b stash 2016-09-24 21:47:10 +08:00
ibuler 88bb620af2 Modify ignore 2016-09-24 11:50:25 +08:00
ibuler 1f3d763490 Add requirement 2016-09-24 11:44:59 +08:00
江世峰 184ac728db Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 
update:add_assets-group
 2016-09-23 20:23:02 +08:00
江世峰 5bf414ffb5 update add_assets-group 2016-09-23 20:22:45 +08:00
xiaoyu 22163173fe user bulk delete view 2016-09-23 16:30:59 +08:00
江世峰 18341717a1 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver 
"assets-group"
 2016-09-22 18:31:15 +08:00
江世峰 d2e989403f update assets-group 2016-09-22 18:31:04 +08:00
xiaoyu af713672fb user list page bulk action 2016-09-22 16:06:46 +08:00
xiaoyu 515406c05d temp: deactive test 2016-09-21 16:43:41 +08:00
xiaoyu 61d1d9ec90 temp 2016-09-21 15:48:21 +08:00
ibuler c7f3aaa654 Change appname webterminal to terminal 2016-09-20 23:34:37 +08:00
ibuler 220892824c Finish some bug 2016-09-20 01:13:50 +08:00
ibuler ce5950ca73 Merge with asset 2016-09-20 00:43:30 +08:00
ibuler 24e31a69cb finish asset 2016-09-20 00:39:33 +08:00
xiaokong1937@gmail.com 65461a09a7 user-group edit implement 2016-09-19 21:08:08 +08:00
江世峰 6c7e51041f update assets_group 2016-09-19 18:01:13 +08:00
江世峰 98757aa428 update assets_group 2016-09-19 17:25:41 +08:00
xiaoyu 9a81057d95 fix a typo 2016-09-19 15:51:28 +08:00
xiaoyu f00da20764 user-group delete implement 2016-09-19 15:47:58 +08:00
ibuler d323c9df88 Modify asset create 2016-09-19 00:07:52 +08:00
xiaokong1937@gmail.com 4e2a41f4cf user-group draft 2016-09-18 21:00:07 +08:00
xiaoyu 8a5a4f3362 fix #14 2016-09-18 14:28:34 +08:00
xiaoyu 8cdc4674d7 update toastr js and close #8 2016-09-18 10:32:23 +08:00
ibuler acfe8950b8 MOdify asset create 2016-09-18 00:10:08 +08:00
ibuler 502c7e756b Modify asset 2016-09-17 23:43:41 +08:00
ibuler 7fd224e690 Merge with user-perm 2016-09-17 19:15:14 +08:00
ibuler dc4d388d9a Merge with master 2016-09-17 18:53:11 +08:00
ibuler df281defd8 Finish user detail asset grant .. 2016-09-17 18:51:19 +08:00
ibuler 7d3474aeea Add user permission user list 2016-09-17 15:20:33 +08:00
wangyong 343f139904 alter asset add and detail 2016-09-17 14:52:14 +08:00
wangyong b95c1deee1 alter asset add and detail 2016-09-17 14:50:14 +08:00
ibuler b5abb17568 Jiu zhe yang ba 2016-09-17 13:04:26 +08:00
ibuler ab2eeb0da3 Finish user asset form 2016-09-17 01:04:52 +08:00
ibuler e232962649 Update some template 2016-09-16 20:53:10 +08:00
wangyong 42012d7bfe merge master 2016-09-16 17:32:35 +08:00
ibuler 06b2c623cb Modify some bug 2016-09-16 17:23:47 +08:00
wangyong 792908eb35 asset add 2016-09-16 17:23:23 +08:00
ibuler a091036744 Add user permission select 2016-09-16 16:09:11 +08:00
ibuler d9812e2bdb Remove action from asset permission 2016-09-16 09:55:26 +08:00
ibuler 74b8ee8c10 Pre delete action 2016-09-16 09:38:07 +08:00
xiaokong1937@gmail.com db5d04c37f fix #13 2016-09-16 08:45:29 +08:00
xiaokong1937@gmail.com 7984806b38 change user ssh reset type from private key to public key 2016-09-15 16:54:00 +08:00