5172 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	e1ab453780	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	2020-06-10 12:58:43 +08:00
ibuler	1a6597b572	feat: 修改command filter数据结构	2020-06-10 12:58:18 +08:00
xinwen	865522953a	[Feature] 作业中心/任务列表/任务详情 最后运行成功或失败的主机 (#4090)	2020-06-09 20:26:23 +08:00
ibuler	4d4a107101	feat: 修改oid获取顺序，添加从cookie中获取	2020-06-09 16:43:07 +08:00
ibuler	82f70cb0dc	feat: ticket添加翻译	2020-06-09 16:10:31 +08:00
ibuler	820186c6d0	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	2020-06-09 15:16:01 +08:00
ibuler	4468e2d379	feat: 限制gateway 仅有ssh协议	2020-06-09 15:08:15 +08:00
Eric_Lee	bd802e6a50	add logo urls (#4088)	2020-06-09 14:06:11 +08:00
ibuler	9362c272cb	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	2020-06-09 10:19:07 +08:00
ibuler	ee4534ac4b	feat: public setting添加key	2020-06-09 10:17:16 +08:00
xinwen	7ef09a4ca1	[Update] UserSerializer 添加 login_confirm_settings (#4086)	2020-06-08 17:16:30 +08:00
ibuler	31daaed4cd	feat: 添加auth confirm 到public setting	2020-06-08 16:48:10 +08:00
ibuler	71202e83f5	feat: 修改用户的api	2020-06-05 20:15:23 +08:00
ibuler	b1640e5592	fix: 修改common resource api的权限，否则auditor无法使用	2020-06-05 14:43:40 +08:00
ibuler	076b7babcb	修改批量命令的api	2020-06-05 14:20:34 +08:00
ibuler	8569910658	feat: command exexution audit log的搜索	2020-06-05 14:07:23 +08:00
xinwen	34c556d375	[Fix] spm (#4082)	2020-06-05 10:42:03 +08:00
ibuler	a43d6ad34d	feat: 资产添加admin_user_display	2020-06-04 20:26:42 +08:00
ibuler	ca6825008b	Merge branch 'dev' of github.com:jumpserver/jumpserver into dev	2020-06-04 20:00:48 +08:00
ibuler	9c6f118dbd	feat: 添加批量命令的relation	2020-06-04 20:00:39 +08:00
Bai	5730e60089	[Update] 修改用户profile序列类	2020-06-04 17:24:31 +08:00
Bai	afc7f3bb9c	[Update] 修改用户public_key生成密钥的view	2020-06-04 17:05:36 +08:00
Bai	c411b0a38e	Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev	2020-06-04 17:02:52 +08:00
Bai	403b6fc563	[Update] 修改用户更新Public_key的条件判断	2020-06-04 17:02:43 +08:00
xinwen	55ae8bb5e6	[Fix] 系统设置/邮件设置/测试链接失败 (#4081)	2020-06-04 16:47:43 +08:00
Eric_Lee	dbcf785e42	add flower view (#4078)	2020-06-04 15:10:02 +08:00
ibuler	e6cd126045	feat: 修改api的权限	2020-06-04 14:55:33 +08:00
Bai	420f3c0c4c	[Update] 添加celery task log view	2020-06-04 14:30:44 +08:00
Bai	9b2c5cb305	[Update] 修改用户profile序列类3	2020-06-03 21:00:37 +08:00
Bai	907f0068db	[Update] 修改用户profile序列类2	2020-06-03 20:21:28 +08:00
Bai	a16b3260ba	Merge branch 'dev' of https://github.com/jumpserver/jumpserver into dev	2020-06-03 18:20:43 +08:00
Bai	1845821f6c	[Update] 修改用户profile序列类	2020-06-03 18:20:33 +08:00
ibuler	27d906a877	feat: 去掉js i18n catalog	2020-06-03 16:26:10 +08:00
xinwen	431ba36a26	[Fix] 会话管理/命令记录 时间过滤 bug (#4070)	2020-06-03 15:05:55 +08:00
Eric_Lee	229c782157	change PAGE_SIZE_CHOICE to string value (#4069)	2020-06-03 14:06:44 +08:00
ibuler	5bacab7475	fix: 重置密钥到auth中	2020-06-03 12:44:45 +08:00
ibuler	999286a089	fix: 修复用户公钥错误引起的profile bug	2020-06-03 12:32:52 +08:00
ibuler	68ccaf0cb3	feat: 去掉第一次登录的那个导航	2020-06-03 12:26:53 +08:00
ibuler	8d58d58519	feat: 修改profile view	2020-06-03 11:58:16 +08:00
ibuler	8efc0331de	feat: 删掉所有view, templates, forms	2020-06-03 11:43:43 +08:00
ibuler	7c479c2479	feat: 修改docs的url	2020-06-03 11:17:00 +08:00
ibuler	96551856a2	[Update] 部分view放到auth中	2020-06-03 11:06:44 +08:00
ibuler	b1f5cc7728	[Update] 禁用view	2020-06-03 10:38:44 +08:00
ibuler	1a84661ca9	feat: 修改filterset_fields => filter_fields，option方法不支持filterset	2020-06-02 20:02:22 +08:00
ibuler	c87b9f203f	feat: 修改依赖库版本	2020-06-02 15:51:24 +08:00
老广	9442acfb74	Celery version (#4064) ... * [Update] 升级celery版本 * [Update] 修改redis-cache 版本	2020-06-02 15:44:45 +08:00
ibuler	50bea55732	merge: with dev	2020-06-02 15:43:42 +08:00
ibuler	a4ece2b271	feat: audits中添加id字段	2020-06-02 15:41:27 +08:00
xinwen	b460e4abaa	[Fix] 日志审计 日期过滤与排序bug (#4063)	2020-06-02 15:40:07 +08:00
BaiJiangJie	087ba9ae95	Merge pull request #4059 from jumpserver/lina ... Lina	2020-06-01 14:05:22 +08:00