Commit Graph

307 Commits (05a5e9cc69a683a5f0973f7f4df959768a1cf296)

Author SHA1 Message Date
ibuler 05a5e9cc69 Finish some bug 2016-11-02 19:44:11 +08:00
ibuler 34a0a37b63 Add token 2016-11-01 19:31:35 +08:00
ibuler 1159d9494c Update signer 2016-11-01 17:21:16 +08:00
ibuler f1dfba6a93 Update some asset issues 2016-10-31 19:31:56 +08:00
ibuler 315af35296 Finish token access api 2016-10-31 18:58:23 +08:00
ibuler 92251f2a45 Merge with master 2016-10-28 15:09:38 +08:00
ibuler 374dfbdac2 Force merge 2016-10-28 11:36:37 +08:00
ibuler 534321d1aa Merge with master 2016-10-28 11:34:07 +08:00
ibuler 688bfa556c Merge with audits 2016-10-27 23:04:02 +08:00
ibuler 589d0d0fac Finish command log list 2016-10-27 22:58:19 +08:00
ibuler 3c00c578c3 Update some vie 2016-10-27 19:35:02 +08:00
ibuler c0de35a683 Add layer and layer open command log 2016-10-27 00:52:44 +08:00
ibuler d19b47a427 add command log modal 2016-10-27 00:03:05 +08:00
ibuler 573b3a8743 Update log_command modal 2016-10-26 19:31:54 +08:00
ibuler 5d3f9b4a03 Add command list 2016-10-26 19:10:14 +08:00
ibuler c2aab50c7b Add proxy log list 2016-10-25 23:23:01 +08:00
江世峰 f88c149076 asset:add assets_bulk 2016-10-25 02:16:20 +08:00
ibuler 6a510dad6c Update some bug 2016-10-24 19:32:53 +08:00
江世峰 cdb1602e06 asset:add assets_bulk 2016-10-22 20:21:36 +08:00
江世峰 80baecc8be Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
Merge
2016-10-21 21:15:04 +08:00
江世峰 73f0199dc0 asset:add assets_bulk 2016-10-21 21:14:49 +08:00
ibuler 6b161d5971 Update import 2016-10-20 19:01:57 +08:00
ibuler 67ecc108bd Command parser 2016-10-20 00:26:53 +08:00
ibuler df380c343e Update api 2016-10-19 19:30:55 +08:00
ibuler 6164896793 Update some thing 2016-10-19 18:33:14 +08:00
ibuler 45dcb26123 Merge branch 'audits' 2016-10-19 15:14:07 +08:00
ibuler bb9a067293 Finish command log 2016-10-19 01:05:28 +08:00
ibuler 961abad14b Add heatbeat 2016-10-18 23:49:04 +08:00
ibuler 17ade287ab Add proxy log api 2016-10-18 19:28:36 +08:00
ibuler 7513474366 Finish terminal app 2016-10-17 17:28:07 +08:00
ibuler 303659cb0e Change app name apps => terrminal 2016-10-17 15:24:41 +08:00
江世峰 4e1f9c97a5 asset:update assets_list by tag 2016-10-16 22:35:25 +08:00
ibuler 4531157c72 may be some wrong 2016-10-16 22:12:13 +08:00
ibuler 26a8bce2c3 Change auto_now to auto_now_add 2016-10-15 23:34:02 +08:00
ibuler 3383b2b535 Add terminal mode 2016-10-15 18:28:49 +08:00
ibuler 9960a6cd21 Plan create a new app: terminal 2016-10-15 17:14:56 +08:00
ibuler 0446f449e9 Add auth and permission backends 2016-10-15 16:04:54 +08:00
ibuler a62a2178d0 Add user backend 2016-10-15 00:49:59 +08:00
ibuler f038423ce2 Add isdangerous 2016-10-14 20:18:34 +08:00
江世峰 a3683f184e Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver
Merge
2016-10-14 19:29:15 +08:00
江世峰 abe09e2a85 asset:update assets_list by tag 2016-10-14 19:28:58 +08:00
ibuler 3efad338eb Merge branch 'connect' 2016-10-13 14:49:04 +08:00
江世峰 73f5891f87 asset:update assets_list by tag 2016-10-12 18:57:51 +08:00
ibuler 081af2f953 Add proxy log api for create or update 2016-10-10 00:39:24 +08:00
ibuler 0c8922e30f Modify some bug 2016-10-09 19:27:49 +08:00
ibuler 0954f6d7e8 Add audits api 2016-10-09 00:12:18 +08:00
江世峰 b99b88a30f asset:update tag 2016-10-08 18:33:00 +08:00
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