github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
3,188 Commits
66 Branches
246 Tags
107 MiB
Commit Graph

3188 Commits (9004351ad1f430a9a69e044bc2c5acf9744ea7d3)

Author SHA1 Message Date
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
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
老广 64da400281
Update README.md 2018-02-01 17:57:50 +08:00
老广 9ffe1b5ab5
Update README.md 2018-02-01 17:56:04 +08:00
老广 83ad72e04b
Update README.md 2018-02-01 17:54:26 +08:00
ibuler 653c328e84 [Abandon] ... 2018-02-01 17:14:15 +08:00
ibuler 2bc5e882fd [Update] 更改授权规则前commit 2018-02-01 15:06:44 +08:00
ibuler 45f6a62989 [Update] 修改一处翻译 2018-02-01 12:37:45 +08:00
ibuler 21a7202587 [Bugfix] 修复ldap认证bug 2018-02-01 12:33:05 +08:00
ibuler 02cd3b1a18 Merge remote-tracking branch 'github/dev' into dev 2018-02-01 10:23:32 +08:00
ibuler a10ff5930f [Update] 修改资产创建 2018-02-01 10:22:20 +08:00
老广 2b4880c784
Update README.md 2018-02-01 10:20:33 +08:00