Commit Graph

3303 Commits (90c629c837da4e490335f1311ec23eec5705596e)

Author SHA1 Message Date
ibuler 59727656c3 Update table desgin doc and audit log 2016-10-07 23:54:29 +08:00
江世峰 0c611b6429 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
merage
2016-10-07 23:04:48 +08:00
江世峰 2829445f4f assets:add tag 2016-10-07 23:04:37 +08:00
ibuler 0cda4e0905 Record command history 2016-10-07 08:53:28 +08:00
ibuler aa02c211fe Modify inital data 2016-10-02 22:16:15 +08:00
ibuler 6b6105491c Add migrations 2016-10-02 22:13:08 +08:00
ibuler 45df58114c Merge branch 'connect' 2016-10-02 21:45:44 +08:00
ibuler a04d772501 Merge with master 2016-10-02 21:45:26 +08:00
ibuler 820d608b18 Rm teminal app 2016-10-02 21:43:22 +08:00
ibuler b54c973d82 Update requirement 2016-10-02 21:38:27 +08:00
ibuler 0234ff0252 Pripare web terminal server 2016-10-02 17:09:27 +08:00
xiaokong1937@gmail.com 6856fad0c0 integrate the user-group list page with its api; 2016-10-02 11:09:27 +08:00
xiaokong1937@gmail.com d40aa49d8c user bulk import through Excel and close #20 2016-10-01 20:26:43 +08:00
xiaokong1937@gmail.com 05e961f29f user-group detail: fix #15 2016-09-30 20:50:40 +08:00
江世峰 474f7e0f68 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
merge
2016-09-30 18:26:02 +08:00
江世峰 fd52a85dbb fix #25 2016-09-30 18:25:50 +08:00
ibuler d9866e1f38 Debug to find command 2016-09-30 00:07:55 +08:00
ibuler 0d25a8f5b7 Use thread replace process 2016-09-29 23:52:07 +08:00
ibuler b4c6499139 Try to fix ssh server close client bug 2016-09-29 21:36:15 +08:00
xiaokong1937@gmail.com d8143a67cd user-group-detail: user-adding frontend integration 2016-09-29 21:14:55 +08:00
ibuler e3c620e138 Debug some bug for auth failed and exit 2016-09-29 18:35:52 +08:00
ibuler acf51238d0 Modify ssh server bug for using public key 2016-09-29 18:01:26 +08:00
xiaoyu e7fddf80ae user-group-detail: add users support 2016-09-29 16:41:55 +08:00
xiaokong1937@gmail.com f9b49605e4 user-group detail page: users op 2016-09-28 21:11:43 +08:00
江世峰 0dec647116 Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
rollback user_list.html
2016-09-28 13:45:03 +08:00
江世峰 3201853cdf rollback user_list.html 2016-09-28 13:44:51 +08:00
江世峰 e83ecb1254 assets_group_forbug 2016-09-28 12:05:34 +08:00
xiaokong1937@gmail.com 2522f0d80f trivial changes: refactor the jumpserver DataTable api 2016-09-27 21:28:02 +08:00
xiaokong1937@gmail.com 70a6ddc897 fix #27 2016-09-27 20:16:46 +08:00
ibuler b17a12662c modify change windows size 2016-09-27 00:10:14 +08:00
ibuler be1a374b14 Modify log 2016-09-26 22:16:21 +08:00
xiaokong1937@gmail.com 49f007601f add user-list-delete support for user-group detail page 2016-09-26 21:22:48 +08:00
xiaokong1937@gmail.com 74cdd2d0f3 user list groups bulk update 2016-09-26 19:39:43 +08:00
xiaoyu 15dcc760b4 user list bulk update modal 2016-09-26 16:33:10 +08:00
xiaoyu d2197d99c2 fix #26 2016-09-26 11:30:43 +08:00
ibuler badd319bb4 Modify some bug and add some logging 2016-09-26 00:05:23 +08:00
ibuler e627b14e55 finish ssh server use more class 2016-09-25 23:38:42 +08:00
ibuler 4b7419559c Update ssh_server to some class 2016-09-25 23:11:09 +08:00
ibuler 2c64b78487 Update terminal 2016-09-25 21:21:25 +08:00
ibuler 5e33c2dc6b Update ssh config 2016-09-25 20:41:56 +08:00
ibuler ebb30424fa Use process except thread 2016-09-25 19:53:55 +08:00
ibuler 216163f436 stash 2016-09-25 11:30:02 +08:00
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 c5c11864e0 update 2016-09-24 22:10:17 +08:00
ibuler da56310db9 update .gitignore 2016-09-24 22:09:20 +08:00
ibuler 7935c00338 update .gitignore 2016-09-24 22:02:44 +08:00