6986 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
ibuler	622953a7b0	feat: merge	2020-06-03 21:10:00 +08:00
Bai	70088578ae	[Update] 修改用户首次登陆完善个人信息表单中mfa字段的操作2	2020-06-03 21:07:20 +08:00
ibuler	fbd926405b	feat: 修改permission	2020-06-03 21:04:33 +08:00
Bai	0ec21f72e9	[Update] 修改用户首次登陆完善个人信息表单中mfa字段的操作	2020-06-03 21:01:45 +08:00
ibuler	333cdfcb4c	feat: 修改路由过滤方式	2020-06-03 20:36:46 +08:00
BaiJiangJie	e00a74472c	Merge pull request #82 from jumpserver/dev_flc ... [Update] 添加用户首次登录页面重定向判断逻辑	2020-06-03 20:21:08 +08:00
Bai	4516f450fe	[Update] 添加用户首次登录页面重定向判断逻辑	2020-06-03 19:57:04 +08:00
OrangeM21	fe91f27815	Merge remote-tracking branch 'origin/dev' into dev	2020-06-03 19:26:23 +08:00
OrangeM21	d9a87281d8	[fix]修复Logo问题	2020-06-03 19:26:06 +08:00
Eric	486f7e2675	offline session actions button	2020-06-03 19:00:31 +08:00
OrangeM21	ad1bfe46f1	[fix]优化Ztree	2020-06-03 18:54:41 +08:00
OrangeM21	f8acc688f6	Merge remote-tracking branch 'origin/dev' into dev	2020-06-03 18:50:47 +08:00
OrangeM21	bae5181015	[fix]修复cookie设置登录问题	2020-06-03 18:50:33 +08:00
Eric	f5f02baf44	online session actions	2020-06-03 18:47:11 +08:00
BaiJiangJie	bb3d8dc062	Merge pull request #81 from jumpserver/dev_fl ... Dev First login page	2020-06-03 18:39:19 +08:00
Bai	27c096ccca	[Update] 添加用户首次登录页面 3	2020-06-03 18:30:42 +08:00
Bai	e1430eb64b	[Update] 添加用户首次登录页面 2	2020-06-03 18:17:32 +08:00
Bai	f13661e9d3	[Update] 添加用户首次登录页面	2020-06-03 18:16:42 +08:00
老广	b6ea773c14	Merge pull request #80 from jumpserver/fix_date ... Fix date	2020-06-03 05:09:07 -05:00
ibuler	9e33a4426e	feat: 需要时间组件的添加日期	2020-06-03 18:07:51 +08:00
ibuler	d9e465fd10	fix: 修改datetimerange component	2020-06-03 17:32:59 +08:00
老广	1eb433713d	Merge pull request #79 from jumpserver/fix_date ... fix: 修复用户切换和时间日期	2020-06-03 04:05:07 -05:00
ibuler	f39445a95b	feat: 统一currentRole 从vuex	2020-06-03 17:04:08 +08:00
ibuler	760c928901	fix: 修复用户切换和时间日期	2020-06-03 16:58:35 +08:00
Eric	7511eac601	password field 隐藏显示	2020-06-03 16:56:29 +08:00
OrangeM21	55d744e30f	[update]优化用户体验	2020-06-03 16:28:07 +08:00
OrangeM21	aaba2454fc	[fix]撤销上次提交	2020-06-03 16:15:30 +08:00
OrangeM21	93c25da315	[fix]修复图片logo显示错误的问题	2020-06-03 15:52:15 +08:00
OrangeM21	c996c5d818	[fix]修复图片logo显示错误的问题	2020-06-03 15:45:18 +08:00
ibuler	3fae84cb5a	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-03 15:12:01 +08:00
Eric	9dce0990a9	interface setting and terminal settings	2020-06-03 14:23:31 +08:00
OrangeM21	e838fbf972	Merge remote-tracking branch 'origin/dev' into dev	2020-06-03 14:11:44 +08:00
OrangeM21	da08ba634b	[fix]过滤特定路由	2020-06-03 14:11:30 +08:00
Bai	c517eb8f59	[Update] 修改ProfileInfo MFA url	2020-06-03 12:53:32 +08:00
ibuler	08bdfd7475	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-03 12:39:52 +08:00
ibuler	5de0951d8d	fix: 修复个人信息页面重定向问题	2020-06-03 12:39:25 +08:00
OrangeM21	4f55fad598	[fix]修复个人详情页面重定向问题	2020-06-03 11:34:26 +08:00
ibuler	ce84d51d88	Merge branch 'dev' of github.com:jumpserver/lina into dev	2020-06-02 20:33:59 +08:00
ibuler	70d4f6a71f	fix: 修复组织如果不对的问题，feat: 添加 submitting button	2020-06-02 20:29:51 +08:00
OrangeM21	ca2db6de4a	[fix]修复路径引用问题	2020-06-02 20:18:32 +08:00
OrangeM21	d99a322a50	[fix]修复路径引用问题	2020-06-02 20:03:23 +08:00
OrangeM21	0f88038f78	Merge branch 'dev' of https://github.com/jumpserver/lina into dev	2020-06-02 18:40:40 +08:00
OrangeM21	3fc3bdf612	[fix]修复Xpack收集用户功能有右键菜单	2020-06-02 18:40:22 +08:00
xinwen	4c7d785d4d	[Fix] 收集用户任务列表页不跳转详情页	2020-06-02 18:27:25 +08:00
OrangeM21	a7de450f36	[fix]系统用户和管理用户的Actions	2020-06-02 18:02:53 +08:00
OrangeM21	931c8be8a7	[fix]修改创建系统用户组件翻译传值	2020-06-02 16:49:40 +08:00
ibuler	2ec7f4eceb	feat: auto date search添加boolean的搜索	2020-06-02 16:41:51 +08:00
OrangeM21	0d71d02c60	Merge remote-tracking branch 'origin/dev' into dev	2020-06-02 16:23:14 +08:00
OrangeM21	5c84c55c46	[fix]修改组件样式,更新时可以传值	2020-06-02 16:22:48 +08:00
ibuler	c4c64c1e90	merge: with dev	2020-06-02 16:13:29 +08:00