Commit Graph

2679 Commits (460fa8e8a9dc710ff09cd4a561902069681ca423)

Author SHA1 Message Date
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
ibuler f0b9a11482 [Update] ansible disk bug 2018-01-26 16:06:23 +08:00
ibuler f6d21585ab [Bugfix] 修复资产搜索bug 2018-01-26 15:53:43 +08:00
ibuler b0fab2453a [Merge] 合并标签功能 2018-01-26 15:49:09 +08:00
ibuler b2d6645f46 [Feature] 添加资产详情标签 2018-01-26 15:32:23 +08:00
ibuler cb902362b5 [Feature] 资产列表标签搜索 2018-01-26 14:47:10 +08:00
ibuler 0a2b6494cc [Update] 修改签名md5算法 2018-01-25 16:38:40 +08:00
ibuler 0c935e8922 Merge branch 'dev' of bitbucket.org:jumpserver/core into dev 2018-01-25 16:15:54 +08:00
ibuler 17f91f7f53 [Update] 修改位置 2018-01-25 15:43:52 +08:00
ibuler d74c2e8466 [Model] 修改create_by字段 2018-01-25 12:17:26 +08:00
ibuler 070c3d73cc [Bugfix] git status 2018-01-25 12:16:26 +08:00
ibuler 7433327d75 [Feature] 标签管理功能 2018-01-23 19:37:22 +08:00
ibuler a976475617 [Update] 修改禁止排序的颜色 2018-01-23 17:11:26 +08:00
ibuler f37b331630 Merge with dev 2018-01-23 15:13:24 +08:00
老广 4b0ea63e0a
Update ISSUE_TEMPLATE.md 2018-01-23 15:02:34 +08:00
ibuler 9dbf498322 [Update] 修改copyright 2018-01-23 12:40:22 +08:00
ibuler 8e6efac6db [Update] 修改copyrite 2018-01-23 12:39:19 +08:00
ibuler 579e74dd5d [Bugfix] 修复一些bug 2018-01-23 12:22:25 +08:00
ibuler cad07434ff add logo test 2018-01-23 11:11:20 +08:00
ibuler f40fbaf602 [Feature] 添加修改用户密码api 2018-01-23 10:36:20 +08:00
ibuler a43d29d446 [Update] 修改django-celery-beat的版本 2018-01-22 23:57:08 +08:00
ibuler 2f136800c7 [Update] 修改默认头像和logo 2018-01-22 23:47:41 +08:00
ibuler dd6e9444e1 [Bugfix] 倒序显示 2018-01-22 18:48:16 +08:00
ibuler 7670f521a2 [Fix] 修改Logger 2018-01-22 18:37:28 +08:00
ibuler cafb0e02a3 [Update] 修改dictfiled 2018-01-22 17:21:03 +08:00
ibuler 9d399c475c [Update] 修改requirements 2018-01-22 12:49:55 +08:00
ibuler 8766a936f3 [Update] 修改requirement 2018-01-22 12:01:32 +08:00