Commit Graph

2748 Commits (18841d6c217010ae94e636b4c84fc2de5948eb96)

Author SHA1 Message Date
fit2cloud-fengyi 18841d6c21 add ignore 2018-03-06 18:29:24 +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
fit2cloud-fengyi 31ba73e2fa 管理用户 2018-03-06 11:00:19 +08:00
fit2cloud-fengyi 4778ac1392 用户管理模块更新 2018-03-05 17:12:02 +08:00
fit2cloud-fengyi 58189df280 用户管理模块更新 2018-03-05 17:09:53 +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
fit2cloud-fengyi 42cb54dd2a 用户管理模块更新 2018-03-05 13:10:51 +08:00
fit2cloud-fengyi d07b427037 用户管理模块更新 2018-03-05 13:10:02 +08:00
ibuler efcf31b2a9 [Delete] 删除build 页面 2018-03-05 13:09:00 +08:00
fit2cloud-fengyi 1c204675e5 用户列表 2018-03-05 12:20:40 +08:00
fit2cloud-fengyi 767d94875c 添加普通用户使用内容 2018-03-04 09:57:11 +08:00
ibuler 634b36c74b [Update] 修改文档 2018-03-01 00:13:53 +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
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
ibuler c68da5898a [Update] 修改初始 2018-02-26 12:31:33 +08:00
ibuler 1f3b11a223 Merge remote-tracking branch 'github/dev' into dev 2018-02-26 11:38:20 +08:00
ibuler f1c386714d [Update]一些修改 2018-02-25 22:36:42 +08:00
calmzhu 5193ba2e39 Update run server.py (#915)
Fix  for not callable error when  config.py not exists
2018-02-25 20:09:15 +08:00
bagechashu eb18648a66 ubuntu16.04 deb_requirements.txt update (#1007) 2018-02-25 20:07:26 +08:00
ibuler f0dd7d54c8 [Update] 修改资产model 2018-02-25 18:40:15 +08:00
ibuler 08edda35e1 [Update] 完成资产书 2018-02-25 18:08:00 +08:00
ibuler c8728cace4 [Update] 完成树形改造 2018-02-09 15:24:44 +08:00
ibuler c7296c2498 [Update] 修改系统用户推送,拆分assets的部分模块 2018-02-09 11:12:40 +08:00
ibuler f82d939d15 [Update] 使用资产树,去掉集群和资产组 2018-02-08 11:34:21 +08:00
ibuler 3bb6e08985 [Feature] 更改perms api 2018-02-07 23:25:15 +08:00
ibuler 6104acae8f [Update] 资产列表选中和移除资产 2018-02-07 13:39:45 +08:00
ibuler bd4768c147 [Update] 拆分asset api module 2018-02-06 18:32:02 +08:00
ibuler d047ff3b3a Merge branch 'dev' into tree 2018-02-06 13:02:30 +08:00
liuzheng712 6edd3f6cf8
feat: rdp support 2018-02-05 21:54:57 +08:00
ibuler bdf506a555 Merge remote-tracking branch 'github/dev' into dev 2018-02-02 19:04:36 +08:00
ibuler 114289edaf [Bugfix] 修改创建系统用户的bug 2018-02-02 19:04:09 +08:00
ibuler 274cb74097 [Update] 修改授权 2018-02-02 18:52:09 +08:00
ibuler 2d3967872b [Feature] 完成资产授权和资产添加 2018-02-02 17:06:08 +08:00