2355 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	071d1922d0	stash it	2017-04-10 22:55:15 +08:00
ibuler	95e64d7809	[Change] 修改导出和更新逻辑	2017-04-09 17:59:14 +08:00
ibuler	5418d0b44c	[Change] Using csv replace xlsx	2017-04-09 00:45:28 +08:00
ibuler	bcc065eb8f	[Compat] compat py3 change bootstrap form to bootstrap3	2017-04-07 23:52:46 +08:00
ibuler	a320b9e05e	[Bugfix] 兼容py3	2017-04-07 19:11:27 +08:00
ibuler	b913bce398	[Bugfix] 修改翻译bug	2017-04-07 17:09:25 +08:00
ibuler	c11374ae39	[Bugfix] 修改翻译	2017-04-07 16:59:09 +08:00
ibuler	92ebe85a3f	[Fixture] 详情页添加system user 推送	2017-04-05 19:09:51 +08:00
ibuler	25b8108af0	Merge branch 'audits'	2017-04-04 21:52:29 +08:00
ibuler	8a2b008fbf	Merge branch 'a'	2017-04-04 21:52:23 +08:00
ibuler	753440faff	Merge branch 'dev' of github.com:jumpserver/jumpserver into audits	2017-04-04 21:52:04 +08:00
ibuler	be09db059d	Update some bug	2017-04-04 21:47:58 +08:00
假想控	cbb14d140e	Update install.md	2017-04-04 20:46:03 +08:00
假想控	f06cf887e1	Update install.md	2017-04-04 20:16:40 +08:00
假想控	194a698372	Update install.md	2017-04-04 20:15:30 +08:00
ibuler	5a5d5bdd51	[Fixture] 添加更新硬件信息api	2017-04-04 19:16:34 +08:00
ibuler	992af0f1cb	[Fixture] 拆分asset view	2017-04-04 11:37:52 +08:00
ibuler	ac3553babb	[Fixture] 修改asset detail	2017-04-04 11:14:59 +08:00
ibuler	97fb2a4fe6	[Fixture] 修改index页面	2017-04-03 00:27:18 +08:00
ibuler	709552f14c	[Fixture] 添加首页	2017-04-02 18:09:40 +08:00
老广	365750565d	Update requirements.txt	2017-04-01 13:53:34 +08:00
ibuler	66a2262ee9	[Fixture] 增加 asset groups assets api	2017-04-01 00:41:16 +08:00
ibuler	067426d5e0	[Fixture] 完成用户向导页	2017-03-31 23:46:00 +08:00
ibuler	87eb1914fb	Merge branch 'dev' of github.com:jumpserver/jumpserver	2017-03-31 18:50:34 +08:00
ibuler	135899608e	Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver	2017-03-31 18:48:11 +08:00
ibuler	7720e9f3fd	[Change] 修改图片	2017-03-31 18:47:50 +08:00
ibuler	61a481f427	[Fixture] 添加用户连接终端	2017-03-31 11:25:25 +08:00
ibuler	3fa5ce5404	[Fixture] 添加用户信息更改	2017-03-30 16:28:00 +08:00
ibuler	0983f294b7	[Fixture] 添加用户profile	2017-03-30 00:51:36 +08:00
ibuler	4e7b665ea8	[Change] 添加翻译，并添加用户登陆页面	2017-03-29 15:26:32 +08:00
右书僮	b34c5dde40	Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver ... # Conflicts: # apps/assets/templates/assets/asset_list.html	2017-03-27 08:03:23 +08:00
右书僮	9de2ff2052	修复idc_list删除时重新加载table	2017-03-27 07:58:35 +08:00
ibuler	a4ad9b49b9	Merge branch 'audits'	2017-03-26 19:41:17 +08:00
ibuler	90055f7680	[Bugfix] 添加翻译	2017-03-26 19:41:10 +08:00
假想控	2e31cf51f3	Update install.md	2017-03-26 14:56:17 +08:00
假想控	4714d5d42f	Update install.md	2017-03-26 13:55:01 +08:00
假想控	5984b0b579	Update install.md	2017-03-26 13:54:11 +08:00
假想控	d700c448c6	Update install.md	2017-03-26 13:50:10 +08:00
假想控	ef8599b836	Update install.md	2017-03-26 13:46:26 +08:00
假想控	dd5b1097f2	Update install.md	2017-03-26 13:40:27 +08:00
假想控	f7c35fde2d	Update install.md	2017-03-26 13:38:48 +08:00
假想控	4fbb4dfb55	Update install.md	2017-03-26 13:35:26 +08:00
假想控	84af0405d9	Update install.md	2017-03-26 13:32:38 +08:00
假想控	c0e5e5f896	Update install.md	2017-03-26 13:31:38 +08:00
老广	12bc63fbc9	Update install.md	2017-03-26 13:06:34 +08:00
老广	7bbb1d24ac	Update install.md	2017-03-26 13:05:33 +08:00
ibuler	49f6ed524d	Merge with master	2017-03-26 11:54:46 +08:00
ibuler	7ddfa2d25e	[Doc] 添加doc	2017-03-26 11:50:09 +08:00
ibuler	d3cdfc1b9d	Update ignore	2017-03-24 23:14:10 +08:00
ibuler	1f9dbb6bdc	[Change] 修复验证码模糊度	2017-03-24 23:13:17 +08:00