github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
2,705 Commits
64 Branches
246 Tags
105 MiB
Commit Graph

2705 Commits (bd4768c14795db59df3a868371b43228ad84f9eb)

Author SHA1 Message Date
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
ibuler 017c3ae36a [Update] 修改ztrr 2018-02-01 01:03:31 +08:00
ibuler c4b52cb2a3 [Update] 去掉资产组添加 2018-02-01 00:33:00 +08:00
ibuler 5f2ca58d62 [Bugfix] 修改label api bug 2018-01-31 18:59:43 +08:00
ibuler 1c7212014b [Bugfix] 修改创建label时报错的bug 2018-01-31 18:48:07 +08:00
ibuler 97dd411ab8 [Bugfix] 修复组详情bug 2018-01-31 17:06:04 +08:00
ibuler d2ad10af9a [Bugfix] 修复组详情bug 2018-01-31 17:04:15 +08:00
ibuler 2f06a2b1d3 [Feature] tree增删功能 2018-01-31 17:01:21 +08:00
ibuler 1ac30ed09c [Feature] 使用ztree 2018-01-31 12:46:33 +08:00
ibuler 3603b33a42 [Feature] 添加资产树 2018-01-31 10:46:26 +08:00
ibuler 460fa8e8a9 [Feature] tree 2018-01-30 19:57:47 +08:00
ibuler 9e09a962af [Feature] 支持popover 2018-01-30 18:07:51 +08:00
ibuler 3e62a7f5b7 [Update] 修改认证 2018-01-30 16:12:33 +08:00
ibuler b4f833740e [Bugfix] 资产批量便捷 2018-01-30 14:54:27 +08:00
ibuler 1fbf4ac08c [Update] 删除部分资产属性 2018-01-30 14:46:02 +08:00
ibuler da4c5f48a1 [Update] 修改获取资产信息产生的异常 2018-01-30 12:09:33 +08:00
ibuler 1192e8cdad [Bugfix] 修复系统用户上传秘钥的bug 2018-01-30 11:56:41 +08:00
ibuler bad397e2e6 [Update] 修复获取资产信息异常bug 2018-01-30 10:38:40 +08:00
ibuler 0f15a94b08 Merge remote-tracking branch 'origin/dev' into dev 2018-01-29 17:04:09 +08:00
ibuler 012614562f [Update] 修改小bug 2018-01-29 16:57:50 +08:00
ibuler 8b626ea9d4 [Update] 修改部分翻译 2018-01-29 16:27:21 +08:00
ibuler 58d22b72ec [Feature] Label 删除修改 2018-01-29 16:25:30 +08:00
ibuler 6d552f4680 [Feature] 添加链接token 2018-01-29 16:18:30 +08:00
liuzheng e821d2995d
refactor: rename folder i18n 2018-01-29 11:54:38 +08:00
ibuler cc4eca2563 [Update] add debug log 2018-01-29 11:53:49 +08:00
liuzheng 04c344e2a0
Update project_structure.md 2018-01-29 11:50:41 +08:00
liuzheng 7f777a4472
Merge pull request #968 from chenchen1750/patch-1 
[Bugfix] 修改项目结构描述
 2018-01-29 11:49:06 +08:00
chenchen1750 1f792a9e3c
[Bugfix] 修改项目结构描述 
修正"项目多语言目录"
 2018-01-29 11:07:01 +08:00
ibuler 6d4e9c7d30 [Bugfix] 资产model 太长 2018-01-26 17:17:37 +08:00
ibuler 9433d6177a [Bugfix] 修改翻译 2018-01-26 16:50:59 +08:00
ibuler 723805d395 [Bugfix] 修复bsd获取cpu数量bug 2018-01-26 16:28:40 +08:00
ibuler c553872f90 Merge remote-tracking branch 'github/dev' into dev 2018-01-26 16:22:06 +08:00
ibuler 41756b06e1 [Bugfix] 修复获取kvmcpu的bug 2018-01-26 16:21:14 +08:00
ibuler 9e36a2cbb1 [Update] ansible disk bug 2018-01-26 16:06:36 +08:00