224 Commits

Author	SHA1	Message	Date
ibuler	cb57002682	[Change] 去掉前端html中的hardcode 99991937	2017-12-12 14:38:51 +08:00
ibuler	722863428d	[Feature] 添加context_processor	2017-12-12 14:28:12 +08:00
ibuler	99b4c66b5e	[Feature] 添加signals 解耦代码	2017-12-12 12:19:45 +08:00
ibuler	cbc000696e	[Feature] 修改adminuser systemuser cluster及他们的关系	2017-12-11 17:08:43 +08:00
ibuler	0c9e24dc59	[Feture] 添加ops 页面	2017-12-11 00:29:25 +08:00
ibuler	18fd04d63c	[Stash] Test case 通不过，import error	2017-12-08 10:15:27 +08:00
ibuler	27a1849b1d	[Change] 修改idc => cluster	2017-12-07 16:25:50 +08:00
ibuler	2b3551f1fc	[Feature] 修改ansible和ops	2017-12-07 13:01:33 +08:00
ibuler	e57121a780	[Feature] 优化Ops ansible api	2017-12-06 18:31:51 +08:00
ibuler	19051d36dc	[Update] 修改一些bug	2017-12-01 17:00:55 +08:00
ibuler	7910292e0f	[Feature] 修改命令上传api	2017-11-29 19:27:04 +08:00
ibuler	e7f38ec894	[Change] 全部使用uuid作为主键	2017-11-23 14:08:01 +08:00
ibuler	d80cbe270a	[Update] 修改用户获取自己授权资产的api，和查询用户授权资产组等api的Url和结构	2017-11-23 11:26:17 +08:00
ibuler	7f9ce57318	修改 terminal上报接口和api	2017-11-14 09:44:16 +08:00
ibuler	3639b190e3	Update perm api	2017-11-01 23:23:11 +08:00
ibuler	da5b9be5ca	[Bugfix] Update some translation and set warning, partial fix #646	2017-09-28 20:52:33 +08:00
ibuler	5446196471	[Bugfix] #695 Asset detail add or delete system user or group mixed	2017-09-27 07:20:16 +08:00
ibuler	0f9ae9efbb	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	2017-09-25 22:15:42 +08:00
ibuler	4aef5b8229	[Bugfix] export asset pof error when none of assets	2017-09-25 22:15:22 +08:00
Caijun	43a0c4fe51	Fix importing csv bugs (#717) ... * Fix exporting csv bugs 1. auto detect the encoding of csv 2. if id in csv is empty, let it equal 0 3. if hostname exists, give up this asset * Add chardet to requirements.txt	2017-09-24 09:16:47 +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