205 Commits

Author	SHA1	Message	Date
ibuler	4aef5b8229	[Bugfix] export asset pof error when none of assets	2017-09-25 22:15:22 +08:00
ibuler	e6537699fd	[Bugfix] Update asset create template bug	2017-09-13 10:09:17 +08:00
ibuler	d73d6e943b	update user model charfield max length more than 767 bug	2017-08-31 16:04:57 +08:00
ibuler	cd1d690fd3	[Bugfix] 修复一些bug	2017-07-28 21:52:43 +08:00
ibuler	5ffd1f99fd	[Bugfix] 修复更新bug	2017-07-24 22:42:01 +08:00
ibuler	cc1a339142	[bugfix] system user update bug	2017-07-24 21:59:55 +08:00
ibuler	477d23ea37	fix some bug	2017-07-20 07:55:24 +08:00
Eli	7c154abf70	fix bug: variable i should be the host name (#538) ... fix bug: variable i is not the host name, because summary['failed'] is something like [("hostname1", "error message 1"),("hostname1", "error message 1")]	2017-07-13 14:00:17 +08:00
Eli	370cdc275a	添加一个资产，然后推送系统用户时出现（Asset实例无法序列化） (#477) ... * error while push systemuser. error while create assets with adminuser(ssh key) * fix errors in case of config.py dose not exist. * change sign_t return from bytes to str. (#480) * fix id_dsa check error (#458) * fix id_dsa check error * fix 邮件修改密码 token错误 * fix 3c8aec9 add ) * Dockerfile 优化 (#453)	2017-07-10 11:01:20 +08:00
ibuler	4e67749eef	[Docs] 添加api dockers	2017-07-10 10:26:17 +08:00
ibuler	29095a869c	[Demo] update demo mode code	2017-06-19 17:59:13 +08:00
Caijun	b502b06e82	Support i18n for asset platform field (#494)	2017-06-13 16:38:33 +08:00
njqaaa	dd6c82b168	fix left's users logout (#446) ... * fix left's users logout * fix issues 445	2017-05-25 14:12:16 +08:00
ibuler	1719eee264	[Bugfix] 修复py3 bytes bug	2017-05-24 20:12:50 +08:00
ibuler	41633be1aa	[Bugfix] 修复无法删除资产组	2017-05-22 20:30:31 +08:00
ibuler	d2620a655c	[Bugfix] 修复模板bug, 修复getattr bug	2017-05-22 20:18:13 +08:00
GuangHongwei	458989328e	[Bugfix] 修改bug，使用py3编程	2017-05-15 23:39:54 +08:00
ibuler	2ec0ab871a	Fix form bug	2017-04-12 18:06:32 +08:00
ibuler	695e4da85e	[Fixture] 完成批量更新	2017-04-12 11:50:15 +08:00
ibuler	2aa9aafdf6	[Change] Bulk update asset	2017-04-11 17:29:53 +08:00
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	c11374ae39	[Bugfix] 修改翻译	2017-04-07 16:59:09 +08:00
ibuler	92ebe85a3f	[Fixture] 详情页添加system user 推送	2017-04-05 19:09:51 +08:00
ibuler	be09db059d	Update some bug	2017-04-04 21:47:58 +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
ibuler	135899608e	Merge branch 'master' of code.jumpserver.org:Jumpserver/jumpserver	2017-03-31 18:48:11 +08:00
ibuler	61a481f427	[Fixture] 添加用户连接终端	2017-03-31 11:25:25 +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	49f6ed524d	Merge with master	2017-03-26 11:54:46 +08:00
ibuler	10eb13920b	[Delete] 删除资产tag	2017-03-24 14:48:18 +08:00
右书僮	e0179ea332	删除资产HTML页面中SystemUser相关内容(视图中的相关API暂时未动)	2017-03-24 11:13:40 +08:00
右书僮	c931d3179b	修复资产组更新中 用户己选择的资产项不全问题	2017-03-24 11:02:55 +08:00
右书僮	c5666f1357	fix some files	2017-03-24 10:37:05 +08:00
ibuler	b60e5a7ee3	[Change] 修改一些view	2017-03-24 00:27:33 +08:00
ibuler	c940a4c0fb	[Fixture] 增加 task list 删除按钮	2017-03-23 00:15:25 +08:00
ibuler	3f72ce4b1f	[Update] 更新生成fake数据脚本	2017-03-22 23:36:43 +08:00
ibuler	2ae57a7970	[Delete] 删除 system user一些属性	2017-03-22 22:15:15 +08:00
ibuler	610c9c5149	Pull it	2017-03-22 22:05:24 +08:00
ibuler	caec9709ef	[Fixture] 添加task list 搜索，重试	2017-03-22 21:57:05 +08:00
ibuler	0fbd9843bd	[Change] 修改runner, inventory位置	2017-03-16 00:19:47 +08:00