365 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	534321d1aa	Merge with master	2016-10-28 11:34:07 +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
ibuler	6a510dad6c	Update some bug	2016-10-24 19:32:53 +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
ibuler	29b3ef70ef	Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver	2016-10-12 19:43:43 +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
广宏伟	82610163cb	Update README.md	2016-10-09 18:14:19 +08:00
ibuler	ba82c395f2	Move terminal to a new project	2016-10-09 15:14:41 +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
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