447 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	afb923737c	Merge with audits	2016-11-06 11:52:25 +08:00
ibuler	79c8f2275c	Update perm api	2016-11-05 23:34:45 +08:00
ibuler	5b0f897118	Update proxy log and command log view	2016-11-05 12:45:59 +08:00
ibuler	41337d28c3	add proxy log search	2016-11-05 01:15:25 +08:00
ibuler	1d29c52a43	Update datatable	2016-11-04 19:25:10 +08:00
ibuler	53e97dac40	stash it	2016-11-04 18:33:16 +08:00
ibuler	f278b735cc	Modify settings	2016-11-04 00:41:21 +08:00
ibuler	2a65e81316	detail page add update	2016-11-03 23:16:16 +08:00
ibuler	f437d3f883	update	2016-11-03 19:42:47 +08:00
ibuler	61eadf6891	Modify asset detail	2016-11-03 00:09:38 +08:00
ibuler	3448f3eb0a	Modify init data	2016-11-02 23:00:47 +08:00
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	b36d70987d	Finish token access api	2016-10-31 18:58:30 +08:00
ibuler	315af35296	Finish token access api	2016-10-31 18:58:23 +08:00
江世峰	6b6fdcd5fd	asset:add assets_bulk_update	2016-10-28 21:24:01 +08:00
江世峰	3d4f79ca59	asset:add assets_bulk_update	2016-10-28 21:19:37 +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	69c6f81c31	Add fake to	2016-10-28 00:21:11 +08:00
ibuler	9e3d740b43	Add fake to	2016-10-28 00:17:10 +08:00
ibuler	5cdc80ec11	Add init data	2016-10-27 23:59:54 +08:00
ibuler	217586b536	Add fake	2016-10-27 23:55:19 +08:00
ibuler	2abec15691	Rm ws4redis	2016-10-27 23:50:44 +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