Commit Graph

2767 Commits (5cc43f6907816f95ae1efbabffdc40c8d4759bf9)

Author SHA1 Message Date
ibuler 6518ae8fa3 Merge remote-tracking branch 'origin/dev' into dev 2018-01-05 14:57:53 +08:00
ibuler afce4c81a8 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-01-05 14:56:50 +08:00
ibuler 28223421b1 [Bugfix] 修复一下bug
1. 添加管理用户时同名的异常
2. 添加授权规则的检查
2018-01-05 14:36:49 +08:00
ibuler 56fd18241d [Update] 修改一些翻译 2018-01-04 09:29:54 +08:00
i317280 7648207ae4 Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-01-03 17:09:35 +08:00
q4speed 9a2fbba956 修改访问官网链接 2018-01-03 15:07:46 +08:00
ibuler a327c46229 Merge remote-tracking branch 'github/dev' into dev 2018-01-02 19:37:56 +08:00
ibuler 720dc9ab05 [Bugfix] 修复以下bug
- session时区
- 切换管理和用户页面cookie问题
- 创建权限时验证
- 一些翻译
2018-01-02 19:36:13 +08:00
q4speed 25fa392dda 修复图片高度和大小 2018-01-02 17:51:25 +08:00
q4speed ad3297ff2f 显示个人头像 2018-01-02 17:40:49 +08:00
q4speed ab27d1c193 修改菜单折叠起来时Logo 2018-01-02 17:31:20 +08:00
q4speed 8160425672 修改Logo 2018-01-02 17:07:00 +08:00
ibuler 68ccec6b9c [UPdate] 修改cookie设置 2018-01-02 17:02:03 +08:00
q4speed bf34c2e320 Merge remote-tracking branch 'origin/dev' into dev 2018-01-02 16:50:57 +08:00
q4speed 54bcb33a0e 修改Logo 2018-01-02 16:43:47 +08:00
ibuler 6d15f60c5c 更改默认使用Dev配置文件 2018-01-02 15:23:06 +08:00
ibuler 239a829c20 [Bugfix] support xvdx disk 2018-01-02 14:49:52 +08:00
ibuler 4dbf332a56 [Bugfix] 修复刷新硬件的bug 2018-01-02 14:29:37 +08:00
ibuler 539bf7bec8 Update doc 2018-01-02 10:47:32 +08:00
ibuler c6eaf894a4 Update doc 2018-01-02 10:46:20 +08:00
ibuler 5eef584c7d [Bugfix] 解决打印print失败问题,原因在于运行docker没有tty,也可以添加PYTHONIOENCODING环境变量解决 2018-01-01 23:45:27 +08:00
ibuler f4a39aba00 [Debug] 无法print中文 2018-01-01 22:00:08 +08:00
ibuler 3300d20c1c [Update] 修改beat 启动,判断pid文件是否存在 2018-01-01 21:04:43 +08:00
ibuler edcafa7275 [Update] 修改运行 beat方式 2018-01-01 20:54:48 +08:00
ibuler e8a72c8c7d [Update] 修改一些翻译 2018-01-01 19:55:37 +08:00
ibuler 73a99de55c [Update] 修改terminal翻译 2018-01-01 15:39:35 +08:00
ibuler 3b6403b2f2 [Update] 修改一些翻译 2018-01-01 15:08:33 +08:00
ibuler c48531c586 [Update] 添加和修改部分翻译 2018-01-01 00:45:12 +08:00
ibuler 0916757eb8 [Bugfix] 修复一些bug 2017-12-31 21:51:25 +08:00
ibuler 0b299344a7 [Update] 修改database 表现 2017-12-31 12:20:08 +08:00
ibuler 13b610c140 [Change] 仅点击checkbox选中 2017-12-31 11:14:02 +08:00
ibuler 7558c2b3e4 [Debug] debug print error 2017-12-30 23:02:10 +08:00
ibuler ddd18e10e0 [Debug] debug print error 2017-12-30 22:53:59 +08:00
ibuler a755882100 [Bugfix] 修复打印中文报错异常 2017-12-30 22:26:05 +08:00
ibuler 6586bef84c [Modify] Add access log 2017-12-30 20:45:54 +08:00
ibuler e0a3fafbd5 [Bugfix] 详见trello 2017-12-30 02:29:29 +08:00
ibuler 3804ab532d [Update] 修改信号 2017-12-29 23:53:45 +08:00
ibuler 158678c2db [Bugfix] 修改bug,显示cluster 2017-12-28 18:01:15 +08:00
ibuler 2cceb281c2 Merge remote-tracking branch 'github/new_api' into dev 2017-12-28 17:44:59 +08:00
liuzheng712 14de3ba5de Merge branch 'new_api' of github.com:jumpserver/jumpserver into new_api 2017-12-28 17:41:00 +08:00
liuzheng712 ac3ee4c317 feat: luna window 2017-12-28 17:39:24 +08:00
ibuler 69f723c8f5 [Bugfix] requirements 添加openssh-cleints 2017-12-28 16:06:07 +08:00
ibuler b6b0d6a9be [bugfix] Beat start failed, rm pidfile 2017-12-28 14:34:17 +08:00
ibuler f992347fc5 [Update] 修改become信息 2017-12-28 14:25:56 +08:00
ibuler e20444983d [Bugfix] 修改html bug 2017-12-28 12:25:43 +08:00
ibuler 827246ed4c Update ansible remote tmp 2017-12-28 12:03:02 +08:00
ibuler f58c45f7be [Update] 修改run celery 2017-12-28 11:39:12 +08:00
ibuler 84fa7b5f17 [Bugfix] 修改启动脚本,celery beat可能不存在 2017-12-28 10:52:40 +08:00
ibuler 8e9ad7d645 [Update] 修改runserver运行 2017-12-28 01:18:50 +08:00
ibuler 825edadc13 [Update] Add build no 2017-12-28 01:08:39 +08:00