Commit Graph

  • 6b377ec5ef [Update] 修改启动脚本 ibuler 2019-10-08 18:17:48 +08:00
  • aebb98189c Merge pull request #3311 from jumpserver/dev_email BaiJiangJie 2019-10-08 17:27:49 +08:00
  • c9ca81e80f [Update] 邮件设置添加测试邮件收件人配置项 BaiJiangJie 2019-10-08 17:14:33 +08:00
  • 90ec6a2962 [Bugfix] 修复创建资产节点的Bug (#3308) BaiJiangJie 2019-10-08 11:57:22 +08:00
  • 7502a372b5 Merge pull request #3299 from jumpserver/master_readme BaiJiangJie 2019-09-29 12:15:19 +08:00
  • d366b711da [Update] 删除 README 访问量统计图标信息 BaiJiangJie 2019-09-29 12:14:11 +08:00
  • 16d2b0f1f3 Merge pull request #3298 from jumpserver/dev_readme BaiJiangJie 2019-09-29 12:13:03 +08:00
  • 87e485bfe2 [Update] 删除 README 访问量统计图标信息 BaiJiangJie 2019-09-29 12:11:52 +08:00
  • 2f48595cd8 Merge pull request #3295 from jumpserver/dev_ldap_sync_timing BaiJiangJie 2019-09-27 18:31:40 +08:00
  • fa1a167f8e [Feature] 添加同步 LDAP/AD 用户的定时任务3 BaiJiangJie 2019-09-27 18:30:13 +08:00
  • 8b7c5b1545 [Feature] 添加同步 LDAP/AD 用户的定时任务2(添加同步参数配置项) BaiJiangJie 2019-09-27 18:19:19 +08:00
  • 44f8b978f9 [Update] 添加failover ws ibuler 2019-09-27 17:48:54 +08:00
  • 8081a864da Merge branch 'dev' into dev_ldap_sync_timing BaiJiangJie 2019-09-27 16:56:52 +08:00
  • 674731f7d9 Merge pull request #3294 from jumpserver/dev BaiJiangJie 2019-09-27 16:25:58 +08:00
  • 1a82b8586d [Update] 修改 access key文档地址引用 ibuler 2019-09-27 15:40:56 +08:00
  • 892e0562b7 Merge pull request #3293 from jumpserver/bugfix BaiJiangJie 2019-09-27 14:38:51 +08:00
  • 9e12f3cd17 [Update] 表单中用户使用异步 ibuler 2019-09-27 14:18:51 +08:00
  • 4b7cd79682 [Feature] 添加同步 LDAP/AD 用户的定时任务1 BaiJiangJie 2019-09-27 14:04:10 +08:00
  • ed5b2f8bf8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2019-09-27 10:36:25 +08:00
  • d85c893e3a [update] 修改默认监听的端口 ibuler 2019-09-27 10:36:06 +08:00
  • 2c46707c2b [Update] 修改websocket监听端口 ibuler 2019-09-27 10:20:20 +08:00
  • 2ff295e3b2 Merge pull request #3292 from jumpserver/dev_bai BaiJiangJie 2019-09-26 19:23:12 +08:00
  • c96d165d3f Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2019-09-26 19:22:32 +08:00
  • cff009e758 Support ws (#3291) 老广 2019-09-26 19:22:17 +08:00
  • e3c68071b9 [Update] Merge local branch dev to dev_bai BaiJiangJie 2019-09-26 19:21:15 +08:00
  • ffc8ddd92e Merge pull request #3289 from jumpserver/v52_ldap_page BaiJiangJie 2019-09-26 19:15:28 +08:00
  • 587e3fdd74 [Update] LDAP 搜索分页配置默认值修改为1000 BaiJiangJie 2019-09-26 19:02:26 +08:00
  • e4ecb19e38 [Update] LDAP 测试连接性也使用分页配置 BaiJiangJie 2019-09-26 18:58:39 +08:00
  • 25fcbf37c3 [Update] LDAP 导入搜索添加分页配置 BaiJiangJie 2019-09-26 18:55:20 +08:00
  • 408b27c561 [Update] Add krb-devel ibuler 2019-09-26 16:35:56 +08:00
  • e35ba52236 [Update] 修改jms-storage依赖版本 ibuler 2019-09-26 15:50:41 +08:00
  • b75c525df7 [Update] 添加到 gcc到依赖,避免忘记安装 ibuler 2019-09-26 15:42:46 +08:00
  • 77682611c1 [Update] 添加到wget gcc到依赖,避免忘记安装 ibuler 2019-09-26 15:42:13 +08:00
  • 865cc30d16 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2019-09-26 15:09:21 +08:00
  • c75fd3c108 Bugfix (#3286) 老广 2019-09-26 15:09:10 +08:00
  • 8387c8dbe4 Merge pull request #3285 from jumpserver/dev 老广 2019-09-26 10:33:15 +08:00
  • 4b322fe9f6 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2019-09-26 10:32:49 +08:00
  • f87db2f4fc Bugfix (#3284) 老广 2019-09-26 10:32:39 +08:00
  • 78aba7ae87 [Update] 用户资产页面链接是 新窗口打开 ibuler 2019-09-25 18:08:58 +08:00
  • 91f64eccda Merge pull request #3283 from jumpserver/dev 老广 2019-09-25 17:23:00 +08:00
  • 3c12c33911 [Update] 修改当仅是当前组织审计员时,隐藏终断会话按钮 (#3275) 八千流 2019-09-25 16:58:41 +08:00
  • 118fc8c42f Dev beta (#3281) 老广 2019-09-25 16:31:58 +08:00
  • 9f56ac8a21 [Update] 修改可能导致的树创建问题 (#3280) 老广 2019-09-25 16:31:18 +08:00
  • a8c2a348aa Merge pull request #3279 from jumpserver/dev_asset BaiJiangJie 2019-09-25 15:31:21 +08:00
  • d7bc8516ff [Update] 修改资产主机名允许输入中文3 BaiJiangJie 2019-09-25 15:29:59 +08:00
  • 26ef7b7be3 [Update] 修改资产主机名允许输入中文 (#3278) BaiJiangJie 2019-09-25 15:14:43 +08:00
  • d3d72f85fd [Update] 修改启动的参数,修改inventory参数名称 (#3276) 老广 2019-09-25 14:40:19 +08:00
  • 40ce9256fc Merge pull request #3274 from jumpserver/v52 BaiJiangJie 2019-09-25 12:38:08 +08:00
  • a6d87f6de4 Merge pull request #3273 from jumpserver/v52_ldap BaiJiangJie 2019-09-25 12:37:27 +08:00
  • b2836b9f4f [Bugfix] 修复 LDAP 用户导入会重复显示的问题(场景:AD 用户在多个 OU 下面) BaiJiangJie 2019-09-25 12:34:12 +08:00
  • 09565375b5 Merge pull request #3260 from jumpserver/dev BaiJiangJie 2019-09-24 18:42:16 +08:00
  • 864bcb27ca Merge pull request #3270 from jumpserver/dev_v52 BaiJiangJie 2019-09-24 18:19:26 +08:00
  • 47abac000e [Merge] with v52 ibuler 2019-09-24 18:17:44 +08:00
  • 326f2160d5 Merge pull request #3268 from jumpserver/v52_bugfix BaiJiangJie 2019-09-24 18:11:52 +08:00
  • 0a13b4bb99 [Update] 修复密码匣子的bug ibuler 2019-09-24 18:06:50 +08:00
  • 02087e00fa Merge pull request #3267 from jumpserver/dev_ra BaiJiangJie 2019-09-24 16:38:36 +08:00
  • e805e9cede [Update] 优化用户授权的 RemoteApp API 过滤逻辑 BaiJiangJie 2019-09-24 16:36:46 +08:00
  • 3f9e2f0af7 [Bugfix] 用户远程应用页面,连接远程应用传递 type 参数 BaiJiangJie 2019-09-24 16:16:52 +08:00
  • ffb4a26215 Merge pull request #3266 from jumpserver/bugfix BaiJiangJie 2019-09-24 15:31:03 +08:00
  • 5055a9f352 [Update] 修改获取资产的逻辑 ibuler 2019-09-24 15:18:12 +08:00
  • 28afd1f6f9 [Update] 修改正则表达式 ibuler 2019-09-24 15:00:32 +08:00
  • 11f710b30a Merge pull request #3265 from jumpserver/dev_v BaiJiangJie 2019-09-24 13:13:58 +08:00
  • b8b4cc2621 [Update] 修改获取 jumpserver.js 的递增值 BaiJiangJie 2019-09-24 13:12:39 +08:00
  • 0078089cdf [Update] 修改版本号 1.5.3 BaiJiangJie 2019-09-24 13:05:43 +08:00
  • 715c9a1242 Merge pull request #3264 from jumpserver/dev_bai BaiJiangJie 2019-09-24 11:40:56 +08:00
  • d5af966623 [Update] Merge branch 'master' into dev_bai BaiJiangJie 2019-09-24 11:39:43 +08:00
  • cbfcc75c82 Merge pull request #3263 from jumpserver/dev_bugfix BaiJiangJie 2019-09-24 11:36:41 +08:00
  • 08a19550b2 [Bugfix] 修复资产授权规则去重 BaiJiangJie 2019-09-24 11:35:57 +08:00
  • ec0cf38c3c Merge pull request #3262 from jumpserver/dev_trans BaiJiangJie 2019-09-24 11:14:27 +08:00
  • 62e21d9fc0 [Update] 添加翻译 BaiJiangJie 2019-09-24 11:13:37 +08:00
  • e7cafe86d1 [Update] 添加 js 翻译 BaiJiangJie 2019-09-24 11:10:02 +08:00
  • df429d56d5 V52 (#3158) (#3261) BaiJiangJie 2019-09-24 10:57:27 +08:00
  • 39dfbc734e [Bugfix] 修复页面中点击删除按钮时,提示 name 信息为 undefined 的问题 (#3259) BaiJiangJie 2019-09-23 20:36:49 +08:00
  • 9428c186b3 Merge pull request #3258 from jumpserver/dev_ak BaiJiangJie 2019-09-23 20:13:06 +08:00
  • 6db57424aa [Bugfix] 修改 API key table 的前端变量名 ak_table BaiJiangJie 2019-09-23 20:11:48 +08:00
  • 7dc8b128d6 [Bugfix] 修复 API Key table 加载时报错(在日志审计模块中) BaiJiangJie 2019-09-23 20:05:01 +08:00
  • 0ed08c2f4c [Update] 修改 API Key 页面显示布局 BaiJiangJie 2019-09-23 19:43:39 +08:00
  • afdf0062eb Merge pull request #3257 from jumpserver/dev_perms BaiJiangJie 2019-09-23 18:37:10 +08:00
  • fad842a8a0 [Update] 添加资产授权规则 generate_fake 方法 BaiJiangJie 2019-09-23 18:36:02 +08:00
  • 02944d407c Merge pull request #3256 from jumpserver/dev_i18n BaiJiangJie 2019-09-23 16:50:03 +08:00
  • ddb34a0f59 [Update] 添加翻译 BaiJiangJie 2019-09-23 16:48:59 +08:00
  • 1603d0f146 Merge pull request #3254 from jumpserver/dev_hostname BaiJiangJie 2019-09-23 16:40:06 +08:00
  • 1cba714b00 [Update] 资产主机名提示、限制不被允许的特殊字符 BaiJiangJie 2019-09-23 16:37:08 +08:00
  • ef122ec169 Merge pull request #3253 from jumpserver/dev_session BaiJiangJie 2019-09-23 15:35:56 +08:00
  • b5f94d84f7 [Update] Session protocol 添加 telnet 选项 BaiJiangJie 2019-09-23 15:31:09 +08:00
  • 471ed51360 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev ibuler 2019-09-23 14:42:03 +08:00
  • 86c5a0ba8b [Update] 去掉一些filter ibuler 2019-09-23 14:41:34 +08:00
  • 6f4d7dd6c6 Merge pull request #3251 from jumpserver/dev_bugfix BaiJiangJie 2019-09-23 10:46:31 +08:00
  • 76e2f750ce [Bugfix] 修复改密计划菜单不高亮的问题 BaiJiangJie 2019-09-23 10:45:28 +08:00
  • f15dc881b6 [Update] 修改requirements ibuler 2019-09-20 21:05:11 +08:00
  • fa7150850f Merge pull request #3243 from jumpserver/gather_asset_user BaiJiangJie 2019-09-20 12:41:04 +08:00
  • 6fc666e60d [Update] 优化获取系统用户 ibuler 2019-09-19 22:12:53 +08:00
  • 89fa0658e1 [Update] 修改任务执行 ibuler 2019-09-19 21:21:05 +08:00
  • 847e37e641 [Update] 修改一些bug ibuler 2019-09-19 17:27:49 +08:00
  • b7021b5ecb [Update] 支持收集资产上的用户 ibuler 2019-09-19 14:48:25 +08:00
  • 5464c884db [Update] 修改swagger ibuler 2019-09-18 22:06:46 +08:00
  • dea9151abd Merge pull request #3242 from jumpserver/v52_config BaiJiangJie 2019-09-18 20:23:24 +08:00
  • 737f0bc512 Merge pull request #3241 from jumpserver/dev_config BaiJiangJie 2019-09-18 20:22:35 +08:00
  • 36d8eebecf [Update] OpenID 认证共享session配置默认值修改为 True 2 BaiJiangJie 2019-09-18 20:20:52 +08:00
  • ecd3317428 [Update] OpenID 认证共享session配置默认值修改为 True BaiJiangJie 2019-09-18 20:19:30 +08:00