Commit Graph

2810 Commits

Author SHA1 Message Date
liuzheng712
3c32048aa8
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev 2018-03-07 21:55:33 +08:00
liuzheng712
166a3fff5c
fix(config = settings.TERMINAL_REPLAY_STORAGE.items()): 2018-03-07 21:54:58 +08:00
ibuler
476a00d270 Merge branch 'docs' into dev 2018-03-07 21:41:08 +08:00
ibuler
2e51a28deb Merge remote-tracking branch 'origin/dev' into dev 2018-03-07 21:39:04 +08:00
ibuler
0bd33ec823 [Update] 修改readme 2018-03-07 21:38:34 +08:00
liuzheng712
813e10ed11
fix: remove gssapi==1.2.4 2018-03-07 21:35:18 +08:00
ibuler
8b4d7c0dd7 Merge remote-tracking branch 'origin/dev' into dev 2018-03-07 21:33:26 +08:00
ibuler
395dc2e505 [Update] 更新README 2018-03-07 21:32:49 +08:00
liuzheng712
2406a7590b
feat: update the requirements 2018-03-07 21:28:06 +08:00
ibuler
f86322fa15 [Update] 修改安装分支 2018-03-07 21:26:19 +08:00
ibuler
88c10e851b [Update] 修改推送任务 2018-03-07 21:24:13 +08:00
ibuler
1fa3e98eb0 Merge remote-tracking branch 'github/docs' into docs 2018-03-07 19:13:54 +08:00
ibuler
42af939501 [Update] 修改gua的安装 2018-03-07 19:12:44 +08:00
ibuler
2def25cae6 [Update] 修改文档地址 2018-03-07 19:08:42 +08:00
ibuler
d3fa3d63e7 [Update] 修改Model 2018-03-07 19:05:43 +08:00
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
fit2cloud-fengyi
e734fa3b0d 快速启动修改 2018-03-07 14:47:14 +08:00
fit2cloud-fengyi
50b0e024e5 系统设置 2018-03-07 13:07:18 +08:00
fit2cloud-fengyi
f7d1a8b35f 系统设置 2018-03-07 13:03:07 +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
shenchenyang
2559899b97 会话管理,权限管理,作业中心文档 2018-03-07 11:17:55 +08:00
fit2cloud-fengyi
86cf7bd6b5 标签管理 2018-03-07 10:35:58 +08:00
ibuler
150855183a [Update] 修改版本 2018-03-06 21:12:51 +08:00
ibuler
0aa4755565 [Update] 修改链接 2018-03-06 21:09:40 +08:00
ibuler
7488d8834e [Igore] force 2018-03-06 18:54:58 +08:00
ibuler
022f6625b1 Merge remote-tracking branch 'github/docs' into docs 2018-03-06 18:54:03 +08:00
fit2cloud-fengyi
115c7c4d50 add ignore 2018-03-06 18:52:09 +08:00
fit2cloud-fengyi
094e862abf fix bug 2018-03-06 18:49:36 +08:00
ibuler
55436ddff1 Merge remote-tracking branch 'github/docs' into docs 2018-03-06 18:41:57 +08:00
ibuler
df1c85494b [Update] 修改文档 2018-03-06 18:41:31 +08:00
fit2cloud-fengyi
8e09151a02 Merge branch 'docs' of https://github.com/jumpserver/jumpserver into docs 2018-03-06 18:30:42 +08:00
fit2cloud-fengyi
18841d6c21 add ignore 2018-03-06 18:29:24 +08:00
ibuler
3fe5dadebc [Update] 修改介绍 2018-03-06 18:27:28 +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
fit2cloud-fengyi
84c4e69062 截图 2018-03-06 16:54:00 +08:00
fit2cloud-fengyi
ed7f7392db 添加贡献者 2018-03-06 15:42:46 +08:00
fit2cloud-fengyi
457886cb6c Merge branch 'docs' of https://github.com/jumpserver/jumpserver into docs 2018-03-06 15:16:57 +08:00
fit2cloud-fengyi
f724f46e00 细节改动 2018-03-06 15:16:42 +08:00
shenchenyang
6a8d75f00e 作业中心文档 2018-03-06 12:18:08 +08:00
shenchenyang
65619fabc5 权限管理文档命名修改 2018-03-06 11:54:50 +08:00
shenchenyang
370534e28f Merge branch 'docs' of https://github.com/jumpserver/jumpserver into docs 2018-03-06 11:50:20 +08:00
shenchenyang
cefdcb242c 权限管理文档 2018-03-06 11:49:42 +08:00