github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,739 Commits
71 Branches
249 Tags
114 MiB
Commit Graph

3739 Commits (9aae10697000d60b84ab395f44ceb6f1ded6a60e)

Author SHA1 Message Date
老广 76109f1808
Merge pull request #1938 from jumpserver/dev 
Dev
 2018-10-23 10:10:53 +08:00
ibuler 54b6e06d1f [Update] 暂时不支持上传目录 2018-10-19 16:30:52 +08:00
ibuler 5c30c76ea3 [Update] 修改jms-storage版本 2018-10-19 10:49:13 +08:00
老广 94b5eb8685
Merge pull request #1929 from jumpserver/dev 
Dev
 2018-10-19 09:56:52 +08:00
ibuler c9f4b104c7 Merge remote-tracking branch 'github/dev' into dev 2018-10-19 09:38:18 +08:00
ibuler 3bf1c036c5 [Bugfix] 修改sshpubkey库版本 2018-10-19 09:27:33 +08:00
老广 09fbd3a5ab
Merge pull request #1922 from jumpserver/dev 
Dev
 2018-10-16 17:18:31 +08:00
ibuler ebecd00581 [Update] 修改优先级逻辑 2018-10-16 16:47:47 +08:00
ibuler 143fa060d1 [Update] 修改节点信息 2018-10-16 13:44:26 +08:00
ibuler 2c18a27e3a [Update] 修改节点创建规则 2018-10-16 12:37:42 +08:00
ibuler 910dd4e593 [Update] 修改节点生成规则 2018-10-16 12:03:11 +08:00
ibuler 11aefa479b [Bugfix] 修复common设置问题 2018-10-16 10:56:25 +08:00
ibuler abc56016f2 Merge remote-tracking branch 'github/dev' into dev 2018-10-16 10:19:00 +08:00
老广 f44db2a25b
Merge pull request #1916 from jumpserver/dev_tag_filter 
[Update] 添加（减法）标签过滤器
 2018-10-16 10:16:25 +08:00
BaiJiangJie 3fa6807837 [Update] 添加（减法）标签过滤器 2018-10-16 09:53:30 +08:00
ibuler 2c4195d619 Merge remote-tracking branch 'github/dev' into dev 2018-10-15 17:47:32 +08:00
老广 265ef0c8ac
Merge pull request #1913 from jumpserver/dev_requirements 
[Update] 更新requirements
 2018-10-15 17:47:10 +08:00
BaiJiangJie 0b0b06a5c2 [Update] 更新requirements-aliyun 2018-10-15 17:06:01 +08:00
ibuler d77ba1d5ea Merge remote-tracking branch 'github/dev' into dev 2018-10-15 16:30:08 +08:00
老广 a3bd7cee80
Merge pull request #1912 from jumpserver/dev_cloud_manager 
[Update] 修改文案
 2018-10-15 16:29:50 +08:00
BaiJiangJie 8d73cd43e1 Merge branch 'dev' into dev_cloud_manager 2018-10-15 16:09:55 +08:00
BaiJiangJie 7e3fd73ae5 [Update] 修改文案 2018-10-15 16:05:53 +08:00
ibuler 70960d2ae4 Merge remote-tracking branch 'github/dev' into dev 2018-10-15 11:34:20 +08:00
老广 d2c574fe9d
Merge pull request #1910 from jumpserver/dev_cloud_manager 
[Feature] 添加xpack-云管中心模块
 2018-10-15 11:30:38 +08:00
BaiJiangJie a70fcf057b [Update] 修改js，添加3级菜单active属性 2018-10-15 10:48:24 +08:00
ibuler f37582ec53 [Update] 用户导航加上文件管理 2018-10-15 10:14:20 +08:00
BaiJiangJie 29b87c40fe [Update] 修改云管理模块-文案 2018-10-14 00:03:04 +08:00
BaiJiangJie 1ec77c5bb9 [Update] 添加3级导航菜单-云管理模块 2018-10-12 20:29:04 +08:00
BaiJiangJie 21c71aba93 [Update] Merge branch dev_cloud_manager (baijiangjie_local) to dev 2018-10-12 18:41:01 +08:00
BaiJiangJie f8db9f480e [Update] 添加翻译-云管理模块 2018-10-12 18:26:56 +08:00
老广 0665644fd0
Merge pull request #1905 from jumpserver/dev 
支持命令过滤
 2018-10-12 15:33:52 +08:00
ibuler 7bafa546b5 [Update] 修改版本 2018-10-12 15:05:04 +08:00
ibuler 666815b324 [Update] 修改文案 2018-10-12 15:04:01 +08:00
ibuler 532abb86b5 [Update] 添加文案说明和翻译 2018-10-11 11:10:47 +08:00
ibuler 76d4e4ad55 [Update] 修改翻译 2018-10-10 19:31:28 +08:00
ibuler 70fa43adaa [Update] 修改一些逻辑 2018-10-10 19:29:53 +08:00
ibuler 44bf01d4ed [Update] 支持命令过滤 2018-10-10 15:37:20 +08:00
老广 1341983fd3
Merge pull request #1878 from jumpserver/dev 
[Update] 更改版本号
 2018-10-08 19:13:12 +08:00
ibuler 78936bf9f2 [Update] 更改版本号 2018-10-08 19:03:02 +08:00
老广 9a5d3cb475
Merge pull request #1877 from jumpserver/dev 
支持web sftp
 2018-10-08 18:57:40 +08:00
ibuler 9bddc29da4 [Update] 暂时不存status数据 2018-09-29 10:44:52 +08:00
ibuler d68a4d9cae [Update] 修改背景色 2018-09-29 10:28:12 +08:00
ibuler 5457118fb6 [Update] 修改css 2018-09-21 22:49:38 +08:00
ibuler 7ee68f7eeb [Update] 修改static 2018-09-21 20:35:58 +08:00
ibuler 2063f2f257 [Update] Add file to static 2018-09-21 16:37:33 +08:00
ibuler 2637c608a6 [Update] 修改gunicorn配置 2018-09-14 11:29:26 +08:00
老广 32519ea326
Merge pull request #1819 from jumpserver/dev 
Dev
 2018-09-14 11:08:03 +08:00
ibuler 3ce9d01b6d [Bugfix] 修复coco无法查看资产的bug 2018-09-13 12:16:49 +08:00
ibuler 310bc6ad0b [Update] 修复获取token的bug 2018-09-13 11:41:44 +08:00
ibuler b54afbe7bb [Bugfix] 修复组织管理员无法查看用户授权的bug 2018-09-13 11:17:55 +08:00