Commit Graph

2767 Commits (5cc43f6907816f95ae1efbabffdc40c8d4759bf9)

Author SHA1 Message Date
ibuler 5cc43f6907 Merge remote-tracking branch 'github/dev' into dev 2018-03-07 18:10:33 +08:00
ibuler d852f0182b [Update] 修改bug 2018-03-07 17:48:19 +08:00
liuzheng712 9aed73d644
feat: update 2018-03-07 17:18:56 +08:00
liuzheng712 d1a2fe145d
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev 2018-03-07 17:18:06 +08:00
liuzheng712 83f83d9b07
feat: s3 replay file get 2018-03-07 17:17:31 +08:00
ibuler c4afd04cbc Merge remote-tracking branch 'github/dev' into dev 2018-03-07 16:13:52 +08:00
ibuler 40d2934de0 [Bugfix] 修复首页无法显示数据的bug 2018-03-07 16:04:13 +08:00
ibuler cd9000e7e9 [Update] 修改Node value唯一 2018-03-07 12:13:03 +08:00
ibuler af2db2d870 [Update] 增加批量终端session api 2018-03-07 11:28:42 +08:00
ibuler 0aa4755565 [Update] 修改链接 2018-03-06 21:09:40 +08:00
ibuler d3e77b09ef [Merge] with doc 2018-03-06 18:04:03 +08:00
ibuler 25ebb5c442 [Update] 修改一些bug 2018-03-06 17:05:36 +08:00
ibuler 86c0a2d28b [Update] 修改部分翻译和文档 2018-03-05 17:14:42 +08:00
ibuler bc230e0ea5 [Update] 更新文档地址 2018-03-05 15:25:49 +08:00
ibuler 21328382fc [Update] bugfix 2018-03-05 15:05:48 +08:00
ibuler eca5966257 [Update] 修改conf 2018-03-05 15:04:11 +08:00
ibuler efcf31b2a9 [Delete] 删除build 页面 2018-03-05 13:09:00 +08:00
ibuler e123599735 [Update] 修改一些bug和文案 2018-03-05 12:59:14 +08:00
fit2cloud-fengyi 1c204675e5 用户列表 2018-03-05 12:20:40 +08:00
老广 e449a07a3f
Update README.md 2018-03-05 10:11:13 +08:00
老广 d4f61b9e69
Update README.md 2018-03-05 10:08:04 +08:00
老广 4451d68d62
Update README.md 2018-03-05 10:07:34 +08:00
ibuler bd4f96134f [Update] 修改一些文案 2018-03-04 13:01:33 +08:00
fit2cloud-fengyi 767d94875c 添加普通用户使用内容 2018-03-04 09:57:11 +08:00
ibuler d284c2175d [Update] 修改一些小问题 2018-03-02 15:39:01 +08:00
ibuler f7ab13952e [Bugfix] 修复bug,修改celery beat版本依赖 2018-03-02 09:36:17 +08:00
ibuler 5dcdeddf22 Merge remote-tracking branch 'github/dev' into dev 2018-03-01 13:39:52 +08:00
ibuler 1018deda96 [Update] 支持拖拽更新 2018-03-01 12:40:41 +08:00
ibuler 5a0068d86a [Update] 修改文案 2018-03-01 10:45:51 +08:00
ibuler 31629fc975 [Bugfix] 修复资产禁用还可以登录 2018-03-01 10:44:55 +08:00
ibuler 634b36c74b [Update] 修改文档 2018-03-01 00:13:53 +08:00
ibuler 521a5c57a2 [Update] 统一copyright 2018-02-28 11:23:04 +08:00
ibuler 1e5b9fb3ef [Update] terminal可以更改名称 2018-02-28 10:39:38 +08:00
ibuler f886e7c2f5 [Update] 修改授权api, windows资产只有rdp协议,linux只有ssh协议 2018-02-27 19:39:27 +08:00
ibuler 91863107d7 [Bugfix] 修复管理用户无法查看的bug 2018-02-27 15:32:30 +08:00
ibuler 870b863136 [Update] 修改设置的一些require 2018-02-27 15:04:05 +08:00
ibuler 9292e48554 [Bugfix] 用户csv导入编码问题 2018-02-27 12:18:36 +08:00
ibuler 13abd4c751 [Docs] 初始化doc 2018-02-27 10:27:28 +08:00
ibuler 8e2891d7d7 [Update] 修改文案 2018-02-27 10:27:08 +08:00
ibuler 315159e4b6 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev 2018-02-26 18:12:20 +08:00
liuzheng712 fc61dea9b5
fix: app get replay storage 2018-02-26 18:11:46 +08:00
ibuler 08ccac3f66 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev 2018-02-26 18:06:09 +08:00
liuzheng712 ea27d05c58
feat: update app setting 2018-02-26 18:05:41 +08:00
q4speed 05255f850f Merge remote-tracking branch 'origin/dev' into dev 2018-02-26 17:28:18 +08:00
q4speed c96a107e0a 对齐菜单文字。修改英文 2018-02-26 17:28:03 +08:00
ibuler e2cb128794 [Update] 修改翻译 2018-02-26 16:57:34 +08:00
ibuler 24fdff0120 Merge remote-tracking branch 'github/dev' into dev 2018-02-26 16:32:40 +08:00
ibuler 8999458a72 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev 2018-02-26 16:32:20 +08:00
q4speed 66b8e8bcf8 增加隐藏树功能 2018-02-26 16:31:51 +08:00
liuzheng 459d0668a8
feat: replay setting page and api 2018-02-26 16:19:29 +08:00