github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
4,196 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

4196 Commits (fff9f319133d3e01858076682bf8860bed138f9c)

Author SHA1 Message Date
ibuler ddf60d2512 [Update] 添加jms日志和修改entrypoint 2019-02-22 16:33:27 +08:00
ibuler 3e6e0153cf [Update] 修改entrypoint并增加debug日志 2019-02-22 16:14:50 +08:00
ibuler 6b984aac53 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-02-22 12:49:03 +08:00
ibuler 6d3ee8116e [Update] 修改版本号 2019-02-22 12:48:43 +08:00
老广 904a0f67dd
Merge pull request #2422 from jumpserver/dev 
Dev
 2019-02-22 10:16:08 +08:00
BaiJiangJie 81e1ce2688 [Update] Interface - 1. settings 添加TERMINAL_HEADER_TITLE (#2421) 2019-02-21 19:36:15 +08:00
ibuler 7c422d2ed6 [Update] Merge 2019-02-21 19:24:52 +08:00
ibuler 2a5129c481 [Update] 修改支持记录cmd filter日志 2019-02-21 19:22:23 +08:00
BaiJiangJie 28cdfca14b [Update] 优化 License (#2420) 
* [Update] License - 1.添加标签过滤器

* [Update] License - 2.添加翻译信息
 2019-02-21 18:49:40 +08:00
ibuler 202aba048b [Update] 修改用户页面授权资产 2019-02-21 17:35:28 +08:00
ibuler 3c2a4703bc [Update] ldap允许空密码 2019-02-21 16:37:36 +08:00
ibuler 4904aac2df [Update] 更新依赖版本 2019-02-21 16:16:08 +08:00
ibuler 303f88d6ee [Update] 更新replay storage 配置 2019-02-21 16:13:08 +08:00
老广 cccc74279d
Dev license (#2409) 
* [Update] 更新用户组

* [Update] license - 更新翻译

* [Feature] interface - 自定义配置logo，修改前端(待续)

* [Update] interface更新前端页面，两个登陆首页的模版设

* [Update]修改新登陆模版全局变量，国际化翻译，登陆逻辑页面切换

* [Update] 优化Interface前端逻辑

* [Update] Interface 修改前端一些小问题

* [Update] License/Interface 生成翻译信息
 2019-02-20 19:20:13 +08:00
老广 16db2abca5
Merge pull request #2419 from jumpserver/dev 
Dev
 2019-02-20 19:02:40 +08:00
ibuler 859f2d9795 [Update] 支持telnet自定义正则 2019-02-20 19:00:01 +08:00
ibuler 4fd9957bec [Update] 修改celery日志显示 2019-02-20 17:51:53 +08:00
老广 0ac6e6ba2c
Merge pull request #2418 from jumpserver/dev 
[Update] 修改gunicorn日志
 2019-02-20 16:16:44 +08:00
ibuler 785cc04126 [Update] 修改gunicorn日志 2019-02-20 16:11:58 +08:00
老广 f269eae774
Merge pull request #2415 from jumpserver/dev 
[Update] 修改导入
 2019-02-20 10:41:59 +08:00
ibuler 6f19fcb702 [Update] 修改tasks 2019-02-20 10:40:43 +08:00
老广 b7b6218306
Merge pull request #2414 from jumpserver/dev 
[Update] gunicorn的日志
 2019-02-19 20:06:37 +08:00
ibuler 5cd809b48a [Update] 修改导入 2019-02-19 20:03:02 +08:00
ibuler 5a1b894138 [Update] gunicorn的日志 2019-02-19 16:59:00 +08:00
老广 4d402617b6
Merge pull request #2410 from jumpserver/dev 
Dev
 2019-02-19 13:04:00 +08:00
ibuler 666ef366e7 [Bugfix] 修复session不显示在线的问题 2019-02-19 12:50:33 +08:00
ibuler 28d029a553 [Update] 修改settings 2019-02-19 12:18:39 +08:00
老广 00763e986a
Merge pull request #2408 from jumpserver/dev 
[Update] 修改token有效期
 2019-02-19 12:00:04 +08:00
ibuler f9a7cca478 [Update] 修改token有效期 2019-02-19 10:29:25 +08:00
老广 d09b34e232
Merge pull request #2404 from jumpserver/dev 
[Update] 修改配置文件判断
 2019-02-18 15:10:36 +08:00
ibuler 2737675c36 [Update] 修改配置文件判断 2019-02-18 15:09:02 +08:00
老广 7591f40b2c
Merge pull request #2402 from jumpserver/dev 
[Update] 创建子节点支持id
 2019-02-18 13:02:15 +08:00
ibuler c4af6fa72d [Update] 创建子节点支持id 2019-02-18 12:59:36 +08:00
老广 19be7ac580
Merge pull request #2394 from jumpserver/dev 
Dev
 2019-02-15 11:16:54 +08:00
ibuler 49404f763d [Update] 修改terminal字体 2019-02-15 11:15:46 +08:00
ibuler 87f2a67789 [Update] 修改录像获取 2019-02-15 11:14:37 +08:00
老广 041edb6177
Merge pull request #2392 from jumpserver/dev 
Dev
 2019-02-15 10:44:32 +08:00
ibuler df2fad76c7 [Update] 修改Dockerfile 优先使用阿里云镜像 2019-02-14 16:23:56 +08:00
ibuler 94020a8fbb [Update] 修改日志存储 2019-02-14 16:15:28 +08:00
ibuler cb1e19d28f [Update] 修改录像路径使用utc 2019-02-14 15:47:55 +08:00
ibuler 0980dffb47 [Update] 修复一下新建两个节点的bug 2019-02-13 19:38:51 +08:00
ibuler 4051225ecb [Bugfix] 修复命令执行bug，修复修改日志级别后无法查看日志 2019-02-13 15:55:11 +08:00
老广 507518da04
Merge pull request #2369 from jumpserver/dev 
[Update] 修改版本号
 2019-01-29 19:33:06 +08:00
ibuler d3bdbc0b81 [Update] 修改版本号 2019-01-29 19:24:28 +08:00
老广 3b56027edc
Merge pull request #2364 from jumpserver/dev 
Dev
 2019-01-29 17:45:31 +08:00
ibuler 8285610097 [Update] 创建Host Key 2019-01-29 14:07:46 +08:00
ibuler 6acac9cb3d Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2019-01-29 12:28:14 +08:00
ibuler 9d78f26807 [Update] 创建Host Key 2019-01-29 12:27:51 +08:00
BaiJiangJie 9d53ba22e1 [Update] 取消ceph录像存储，添加命令执行翻译 (#2365) 2019-01-28 14:59:06 +08:00
ibuler 0d0cf04543 [Update] 修改日志查看 2019-01-28 12:18:53 +08:00