61 Commits

Author	SHA1	Message	Date
ibuler	6b86b8b485	[Bugfix] 修复资产数量不对的bug	2018-08-10 14:46:04 +08:00
ibuler	f4c86718dc	[Update] Merge dev	2018-07-27 12:12:32 +08:00
ibuler	7e65e44a3c	[Update] 兼容guacamole手动模式上传system user是uuid	2018-07-26 18:12:25 +08:00
ibuler	2ecfecb06f	[Update] Merge with dev	2018-07-25 18:18:18 +08:00
ibuler	2abb9efe96	[Update] Org功能修改	2018-07-25 17:21:13 +08:00
老广	c816875f28	[Update] 修改permission (#1574)	2018-07-22 23:55:13 -05:00
老广	2cb5876d1a	Merge branch 'master' into dev	2018-07-17 04:25:37 -05:00
ibuler	5648dcd7e7	[Update] 修改用户view	2018-07-15 00:55:05 +08:00
ibuler	28e47f33c1	[Update] 修改一些逻辑	2018-07-14 00:47:21 +08:00
ibuler	eb95a0a912	[Bugfix] 修改下载录像没有目录的bug	2018-06-27 10:34:16 +08:00
ibuler	7276bd0b2a	[Update] 更新获取session log的方法，以后统一到media/replay中	2018-06-26 22:13:39 +08:00
oldseven	4f28f85410	#1368	2018-05-29 09:51:55 +08:00
ibuler	5a7192e035	[Update] 修改心跳bug	2018-05-24 13:30:15 +08:00
ibuler	d615eb80b5	[Update] 优化使用storage sdk	2018-05-22 18:22:06 +08:00
ibuler	cb4afabc91	[Bugfix] 修复创建node节点的问题，修复windows session的问题	2018-05-15 14:44:02 +08:00
ibuler	d2b0aba620	[Update] 修改replay api	2018-05-07 19:28:01 +08:00
liuzheng712	536be1175a	feat: replay api update ... make a v2 session replay api, get the json response	2018-04-24 08:53:30 +08:00
ibuler	02ca8c3139	[Update] 更新session api	2018-04-23 11:32:46 +08:00
ibuler	967800391e	[Update] 更新api	2018-04-12 17:31:37 +08:00
ibuler	e4823a21e3	[Update] 优化部分代码	2018-03-12 18:29:06 +08:00
liuzheng712	b2ae0e8f44	fix: download update	2018-03-12 17:53:22 +08:00
liuzheng	b92ccdd05e	fix: update the jms-storage==0.0.11	2018-03-12 10:30:49 +08:00
liuzheng712	3c6c05f83e	fix: update	2018-03-07 22:15:17 +08:00
liuzheng712	51d7e51119	fix: AttributeError: 'SessionReplayViewSet' object has no attribute 'ACCESS_KEY'	2018-03-07 22:05:50 +08:00
liuzheng712	166a3fff5c	fix(config = settings.TERMINAL_REPLAY_STORAGE.items()):	2018-03-07 21:54:58 +08:00
liuzheng712	9aed73d644	feat: update	2018-03-07 17:18:56 +08:00
liuzheng712	d1a2fe145d	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	2018-03-07 17:18:06 +08:00
liuzheng712	83f83d9b07	feat: s3 replay file get	2018-03-07 17:17:31 +08:00
ibuler	af2db2d870	[Update] 增加批量终端session api	2018-03-07 11:28:42 +08:00
ibuler	f1c386714d	[Update]一些修改	2018-02-25 22:36:42 +08:00
ibuler	cc4eca2563	[Update] add debug log	2018-01-29 11:53:49 +08:00
ibuler	17181db8a5	[Feature] 支持es存储	2018-01-21 17:27:27 +08:00
ibuler	41f1c3f7f7	[Feature] terminal config load	2018-01-21 15:12:59 +08:00
ibuler	b936d54a48	[Feature] 添加es支持	2018-01-20 22:22:09 +08:00
ibuler	29061aa088	[Bugfix] user login ip	2018-01-16 09:58:33 +08:00
ibuler	9a6bc9fec5	[Update] session添加登陆ip	2018-01-05 18:37:36 +08:00
ibuler	720dc9ab05	[Bugfix] 修复以下bug ... - session时区 - 切换管理和用户页面cookie问题 - 创建权限时验证 - 一些翻译	2018-01-02 19:36:13 +08:00
ibuler	f4beccddae	[Update] 修改注册流程	2017-12-25 12:22:49 +08:00
ibuler	a308000d2e	[Bugfix] 修改users模块一些bug	2017-12-18 18:38:30 +08:00
ibuler	a5f9735906	[Update] 更新index view	2017-12-04 20:15:47 +08:00
ibuler	71a3079221	[Feature] 离线session完成	2017-12-04 16:41:00 +08:00
ibuler	9b6696bb6e	[Feture] session detail页面，包含命令列表	2017-12-04 00:21:26 +08:00
ibuler	01558c985a	[Feture] 添加session 列表，并支持kill session	2017-12-03 20:42:36 +08:00
ibuler	bf8fa95597	[Update] 修改session	2017-12-01 21:22:32 +08:00
ibuler	f74422e4bb	[Bugfix] 更改application models后导致 terminalstatus报错	2017-12-01 17:35:28 +08:00
ibuler	61a8d95f46	[Change] Rename applications -> terminal	2017-12-01 17:28:47 +08:00
ibuler	775cd523eb	Update app terminal name to applications	2016-12-25 23:10:53 +08:00
ibuler	a8fa4d2f0c	update terminal regist	2016-12-25 17:44:39 +08:00
ibuler	2707012325	Finish access key auth	2016-12-25 13:15:28 +08:00
ibuler	5b4ce709af	Add private token and change user group	2016-12-22 00:36:31 +08:00