ibuler
|
5103dab72e
|
[Bugfix] 解决上次引入的bug
|
2018-04-26 20:48:32 +08:00 |
ibuler
|
16aa42a861
|
[Bugfix] 修复授权树列表和资产树列表不同的bug
|
2018-04-26 19:51:32 +08:00 |
BaiJiangjie
|
0962a16b22
|
[Bugfix] 修复首次登录条款问题及引导页面MFA配置问题
|
2018-04-26 19:49:09 +08:00 |
ibuler
|
d5debc375e
|
[Bugfix] 修复命令搜索异常bug
|
2018-04-25 17:48:44 +08:00 |
ibuler
|
40a0c4597b
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-04-25 15:15:36 +08:00 |
BaiJiangjie
|
ea2863a51b
|
[Update] 创建用户、资产成功的提示信息可关闭
|
2018-04-24 22:10:52 +08:00 |
BaiJiangjie
|
102e1ca97c
|
[Bugfix] 创建资产,资产系统置上,RDP:3389
|
2018-04-24 18:29:14 +08:00 |
BaiJiangjie
|
2823d02763
|
[Bugfix] 修复资产列表导入,资产id问题
|
2018-04-24 16:15:04 +08:00 |
BaiJiangjie
|
c37414045b
|
[Bugfix] 修改用户列表导出,默认导出全部用户
|
2018-04-24 15:16:05 +08:00 |
BaiJiangjie
|
784bec42ff
|
[Update] 修改用户登录,首次登录不需要验证码,登录失败时需要验证码校验
|
2018-04-24 13:00:36 +08:00 |
ibuler
|
9a3d0732bc
|
[Update] 更新授权代码
|
2018-04-24 11:07:09 +08:00 |
ibuler
|
20a7247b16
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-04-24 10:52:31 +08:00 |
ibuler
|
df60981eb4
|
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
|
2018-04-24 10:51:30 +08:00 |
老广
|
7aa2bb06e8
|
Merge pull request #1228 from wojiushixiaobai/dev
添加升级脚本
|
2018-04-24 10:41:23 +08:00 |
liuzheng712
|
536be1175a
|
feat: replay api update
make a v2 session replay api, get the json response
|
2018-04-24 08:53:30 +08:00 |
BaiJiangjie
|
b5fc76d6a5
|
[Update] 修改用户首次登录页
|
2018-04-23 21:04:46 +08:00 |
ibuler
|
941dd627e3
|
[Update] 更新session列表
|
2018-04-23 11:44:09 +08:00 |
ibuler
|
8389c85054
|
[Update] 更改sesion表结构
|
2018-04-23 11:40:30 +08:00 |
ibuler
|
02ca8c3139
|
[Update] 更新session api
|
2018-04-23 11:32:46 +08:00 |
wojiushixiaobai
|
5c7acae018
|
更改版本号
|
2018-04-22 20:18:10 +08:00 |
BaiJiangjie
|
5b52b907c0
|
[Update] 创建用户,更新用户,添加MFA设置选项
|
2018-04-20 16:15:45 +08:00 |
BaiJiangjie
|
8447c6f487
|
[Update] 修改coco文案OTP改为MFA
|
2018-04-20 11:51:32 +08:00 |
BaiJiangjie
|
ad6e22cd42
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into dev
|
2018-04-20 11:24:21 +08:00 |
BaiJiangjie
|
7a219e1710
|
[Update] OTP文案修改为MFA
|
2018-04-20 11:23:31 +08:00 |
ibuler
|
0c24310510
|
[Bugfix] 修复用户错误storage的bug
|
2018-04-19 18:26:59 +08:00 |
ibuler
|
9ac7f26c74
|
[Update] 修改用户详情,自己更改自己otp,提示小写
|
2018-04-19 17:55:40 +08:00 |
BaiJiangjie
|
f73fe1f315
|
[Bugfix] 修复用户登录缓存设置问题
|
2018-04-19 17:20:53 +08:00 |
ibuler
|
763cf0d981
|
[Bugfix] 修复解密None的bug
|
2018-04-19 16:35:38 +08:00 |
ibuler
|
95a8bf0988
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-04-19 11:46:07 +08:00 |
ibuler
|
947f7d206a
|
[Bugfix] 修复生成system user的问题
|
2018-04-19 11:16:52 +08:00 |
BaiJiangjie
|
12c8cf6b76
|
[Update] 添加OTP认证功能
|
2018-04-19 11:13:11 +08:00 |
BaiJiangjie
|
33bc73aba7
|
[Update] 添加OTP认证功能
|
2018-04-19 10:49:47 +08:00 |
ibuler
|
035dd16b36
|
[Bugfix] 修复授权详情中选择用户或资产的bug
|
2018-04-19 10:34:17 +08:00 |
BaiJiangjie
|
f450accbf8
|
[Merge] with dev
|
2018-04-18 12:49:17 +08:00 |
BaiJiangjie
|
0bbfc7433d
|
[Feature] 支持otp
|
2018-04-18 12:48:07 +08:00 |
ibuler
|
48e8785725
|
[Update] 修改users otp secret key
|
2018-04-18 12:46:25 +08:00 |
ibuler
|
b90d3306c5
|
[Bugfix] 去掉gateway name连接
|
2018-04-17 12:01:00 +08:00 |
ibuler
|
7f7d634c38
|
Merge remote-tracking branch 'github/master' into dev
|
2018-04-16 17:08:01 +08:00 |
ibuler
|
72cd7a3be2
|
[Bugfix] 修复用户看不到我的资产的bug
|
2018-04-16 17:01:25 +08:00 |
ibuler
|
3ccd54680e
|
[Bugfix] 修改授权详情快速Node更改失效的bug
|
2018-04-14 12:18:15 +08:00 |
ibuler
|
071d14c639
|
[Update] 修改资产获取select
|
2018-04-13 21:26:10 +08:00 |
ibuler
|
823e879432
|
[Update] 更新节点移动交互
|
2018-04-13 15:48:10 +08:00 |
ibuler
|
739932b005
|
[Update] 更新资产导入
|
2018-04-12 18:50:43 +08:00 |
ibuler
|
24f144fdc3
|
[Bugfix] 修复导入资产时url地址问题
|
2018-04-12 18:17:42 +08:00 |
ibuler
|
967800391e
|
[Update] 更新api
|
2018-04-12 17:31:37 +08:00 |
ibuler
|
ee4f5a8194
|
[Bugfix] 修复资产重复的bug
|
2018-04-12 11:07:40 +08:00 |
ibuler
|
2398e9acbd
|
更改表截稿
|
2018-04-12 10:16:38 +08:00 |
ibuler
|
7d14e1f248
|
[Update] 更改版本号
|
2018-04-12 09:49:44 +08:00 |
ibuler
|
8b3b517bab
|
[Update] 修改授权规则详情列表页面
|
2018-04-11 15:24:12 +08:00 |
ibuler
|
7fc2ef00ee
|
[Update] 修改资产api获取的bug
|
2018-04-11 12:45:04 +08:00 |
ibuler
|
3835adafb8
|
[Update] 修改bug
|
2018-04-11 12:13:49 +08:00 |
ibuler
|
bbaa35c773
|
[Update] 修改Perms
|
2018-04-11 11:34:15 +08:00 |
ibuler
|
0fa8287811
|
Merge branch 'dev' into perms
|
2018-04-11 10:25:18 +08:00 |
ibuler
|
78f4e5a89a
|
[Update] 修改用户Opt
|
2018-04-10 21:04:56 +08:00 |
ibuler
|
3193c5549d
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-04-10 21:02:36 +08:00 |
ibuler
|
ed71e7d2d9
|
[Update] 修改用户Opt
|
2018-04-10 21:02:07 +08:00 |
ibuler
|
33c299566a
|
[Update] 修复bug
|
2018-04-10 20:45:01 +08:00 |
ibuler
|
84634eb8c0
|
[Update] 修改Permr认证
|
2018-04-10 20:29:06 +08:00 |
ibuler
|
a4ff2181c5
|
[Update] 修改用户view的api
|
2018-04-10 09:41:06 +08:00 |
ibuler
|
fffa0def9e
|
[Update] 修改api和view
|
2018-04-08 20:02:40 +08:00 |
ibuler
|
d0ede246e7
|
[Update] 修改授权
|
2018-04-08 00:16:37 +08:00 |
BaiJiangJie
|
b8b78ffeb2
|
Merge pull request #1162 from BaiJiangJie/dev
创建用户发送邮件
|
2018-04-06 15:50:50 +08:00 |
ibuler
|
cb8e59edf2
|
[Update] 修改文案
|
2018-04-06 13:23:15 +08:00 |
ibuler
|
1c0d783eec
|
[update] 添加Migrations
|
2018-04-06 11:36:47 +08:00 |
ibuler
|
4fa72400be
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-04-06 11:35:33 +08:00 |
ibuler
|
37c0062fae
|
[Update] 添加审计模块
|
2018-04-06 11:27:52 +08:00 |
BaiJiangjie
|
8504c3d2fd
|
修复资产列表导出问题
|
2018-04-04 19:38:32 +08:00 |
ibuler
|
1d7ba3e204
|
[Bugfix] 修复小bug
|
2018-04-04 13:03:36 +08:00 |
ibuler
|
d966e22cf9
|
[Update] 修改小bug
|
2018-04-04 13:01:57 +08:00 |
ibuler
|
6a88fd2d60
|
[Update] 修改api权限
|
2018-04-04 08:47:02 +08:00 |
BaiJiangjie
|
b63999f385
|
创建用户发送邮件
|
2018-04-03 16:28:58 +08:00 |
ibuler
|
aa8bece724
|
Merge branch 'ansible' into dev
|
2018-04-03 14:49:58 +08:00 |
ibuler
|
168335a381
|
[Update] 更新内容
|
2018-04-03 12:14:58 +08:00 |
ibuler
|
121726b731
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-04-03 10:44:35 +08:00 |
ibuler
|
0b812a03c6
|
[Bugfix] 修复 ApiUpdateAttr的bug
|
2018-04-03 10:36:11 +08:00 |
ibuler
|
79ae6efafb
|
[Bugfix] 修复没有Log path引起的bug
|
2018-04-02 19:14:42 +08:00 |
BaiJiangjie
|
5b65ed8a19
|
修复导入资产列表IP字段前后有空格问题,导入资产列表时doamin保存为对象
|
2018-04-02 18:32:24 +08:00 |
ibuler
|
951ac252fe
|
[Merge] 更新ansible功能
|
2018-04-02 17:45:17 +08:00 |
ibuler
|
24c4e1df50
|
[Update] 资产,系统用户,管理用户等支持查看日志
|
2018-04-02 16:55:39 +08:00 |
ibuler
|
d247e49b70
|
[Update] 修改celery位置
|
2018-04-02 15:54:49 +08:00 |
ibuler
|
a4c843ff13
|
[Update] 迁移celery到ops
|
2018-04-02 13:19:31 +08:00 |
BaiJiangjie
|
ec6103448e
|
使终端管理的应用用户不显示在用户组里
|
2018-04-02 12:02:06 +08:00 |
ibuler
|
df80e8047a
|
[Update] 修改日志
|
2018-04-01 23:45:37 +08:00 |
ibuler
|
09fc2776df
|
[Update] Support history view
|
2018-03-30 22:03:43 +08:00 |
ibuler
|
d32f070b5c
|
[Update] 修改Inverntoy,增加更多属性
|
2018-03-28 19:37:29 +08:00 |
ibuler
|
b959f1f68b
|
Merge branch 'bugfix_ip_lookup' into dev
|
2018-03-28 16:47:44 +08:00 |
ibuler
|
e1cab35db0
|
[Bugfix] 修改获取城市
|
2018-03-28 16:47:36 +08:00 |
ibuler
|
8014cc48b6
|
[Update] 修改settings和缩进
|
2018-03-28 15:47:20 +08:00 |
ibuler
|
829f57e2d7
|
[Bugfix] 修复小bug
|
2018-03-28 14:35:27 +08:00 |
ibuler
|
5f0b4a4b63
|
[Update] 修改一些翻译
|
2018-03-28 11:28:40 +08:00 |
ibuler
|
c5af4d47eb
|
Merge branch 'some_auth_api' into dev
|
2018-03-27 18:37:04 +08:00 |
ibuler
|
c37bfb682a
|
[Update] 添加设置认证api和创建用户时可以不选择组
|
2018-03-27 18:34:41 +08:00 |
ibuler
|
3aaea6cc31
|
Merge branch 'bugfix_useradd' into dev
|
2018-03-27 17:48:35 +08:00 |
ibuler
|
f85e5b6f75
|
[Bugfix] 修改添加用户的bug
|
2018-03-27 17:47:53 +08:00 |
ibuler
|
d598571dc1
|
[Update] 添加一个log
|
2018-03-27 16:51:27 +08:00 |
ibuler
|
e873be95d5
|
[Update] 导入到当前node
|
2018-03-26 16:16:18 +08:00 |
ibuler
|
dbaa4ab502
|
[Update] 修改资产导入的事务问题
|
2018-03-26 15:55:31 +08:00 |
ibuler
|
75319b99ae
|
[Update] 更新ap请求
|
2018-03-25 21:47:29 +08:00 |
ibuler
|
7f4f67aa8d
|
[Update] 支持网域
|
2018-03-23 19:46:46 +08:00 |
ibuler
|
fe1862120f
|
[Update] 删掉集群等等
|
2018-03-21 18:13:16 +08:00 |
ibuler
|
759760e7d9
|
[Update] 服务器可以生成用户密钥
|
2018-03-21 15:22:10 +08:00 |
ibuler
|
2fc9c04228
|
[Bugfix] 修复更新系统用户后关联节点丢失的问题
|
2018-03-19 15:32:02 +08:00 |
ibuler
|
d8e614c54d
|
[Update] 管理脚本
|
2018-03-19 11:26:51 +08:00 |
ibuler
|
f195b309d4
|
[Bugfix] 全选后编辑checkbox问题
|
2018-03-16 10:42:53 +08:00 |
ibuler
|
a58db9826e
|
[Update] 升级版本号
|
2018-03-14 19:57:35 +08:00 |
ibuler
|
15427fb743
|
[Update] 还原ldap配置
|
2018-03-14 19:37:36 +08:00 |
ibuler
|
7874a1539c
|
[Update] 修改配置,默认先从数据库认证
|
2018-03-14 19:33:48 +08:00 |
ibuler
|
7e087ad5c6
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-03-14 18:36:22 +08:00 |
ibuler
|
93895b6b92
|
[Update] 修改一些文案说明和翻译
|
2018-03-14 18:14:37 +08:00 |
q4speed
|
4d7fbcc49b
|
修复文字过长bug
|
2018-03-14 18:01:37 +08:00 |
ibuler
|
e9be4f51e5
|
[Update] 删除资产详情中的windows等测试连接
|
2018-03-14 16:19:59 +08:00 |
ibuler
|
42f297e6c4
|
[Update] 更新一些文案
|
2018-03-14 13:13:32 +08:00 |
ibuler
|
8b63961d4d
|
[Update] 默认开启定时检测,运行失败默认log为warn
|
2018-03-14 12:17:48 +08:00 |
ibuler
|
2e8f5919a8
|
[Update] 默认关闭自动定时推送功能
|
2018-03-13 09:57:38 +08:00 |
ibuler
|
faf6a7b623
|
[Update] 删掉token api调用次数限制
|
2018-03-12 20:29:27 +08:00 |
ibuler
|
8e4ab9f3a9
|
[Update] 支持获取token的用户
|
2018-03-12 19:39:27 +08:00 |
ibuler
|
e4823a21e3
|
[Update] 优化部分代码
|
2018-03-12 18:29:06 +08:00 |
ibuler
|
634af19945
|
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
|
2018-03-12 18:24:14 +08:00 |
liuzheng712
|
b2ae0e8f44
|
fix: download update
|
2018-03-12 17:53:22 +08:00 |
ibuler
|
4a3e5e9b22
|
Merge branch 'dev' of bitbucket.org:jumpserver/core into dev
|
2018-03-12 16:44:10 +08:00 |
ibuler
|
43b4b7c55e
|
[Feature] 资产节点增加批量测试可连接性和更新硬件信息
|
2018-03-12 11:41:12 +08:00 |
liuzheng
|
b92ccdd05e
|
fix: update the jms-storage==0.0.11
|
2018-03-12 10:30:49 +08:00 |
ibuler
|
f59f03adfd
|
[Update] 支持使用环境变量关闭定时任务
|
2018-03-12 10:20:23 +08:00 |
ibuler
|
fe03011177
|
[Update] 不允许添加应用程序类型的用户
|
2018-03-11 19:46:40 +08:00 |
ibuler
|
9ffb079c8f
|
[Update] 增加修改system user auth 的api
|
2018-03-09 12:53:08 +08:00 |
liuzheng712
|
9162f4a226
|
revert: add the old apps/users/migrations/0002_auto_20171225_1157.py
|
2018-03-08 09:13:40 +08:00 |
ibuler
|
51e15b583f
|
Merge remote-tracking branch 'origin/dev' into dev
|
2018-03-07 23:29:17 +08:00 |
ibuler
|
f2251bbb32
|
[Update] index
|
2018-03-07 22:38:37 +08:00 |
liuzheng712
|
3c6c05f83e
|
fix: update
|
2018-03-07 22:15:17 +08:00 |
liuzheng712
|
51d7e51119
|
fix: AttributeError: 'SessionReplayViewSet' object has no attribute 'ACCESS_KEY'
|
2018-03-07 22:05:50 +08:00 |
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
|
88c10e851b
|
[Update] 修改推送任务
|
2018-03-07 21:24:13 +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
|
40d2934de0
|
[Bugfix] 修复首页无法显示数据的bug
|
2018-03-07 16:04:13 +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 |
ibuler
|
0aa4755565
|
[Update] 修改链接
|
2018-03-06 21:09:40 +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 |
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
|
d3e77b09ef
|
[Merge] with doc
|
2018-03-06 18:04:03 +08:00 |
ibuler
|
25ebb5c442
|
[Update] 修改一些bug
|
2018-03-06 17:05:36 +08:00 |
ibuler
|
86c0a2d28b
|
[Update] 修改部分翻译和文档
|
2018-03-05 17:14:42 +08:00 |
ibuler
|
bc230e0ea5
|
[Update] 更新文档地址
|
2018-03-05 15:25:49 +08:00 |
ibuler
|
e123599735
|
[Update] 修改一些bug和文案
|
2018-03-05 12:59:14 +08:00 |
ibuler
|
bd4f96134f
|
[Update] 修改一些文案
|
2018-03-04 13:01:33 +08:00 |
ibuler
|
d284c2175d
|
[Update] 修改一些小问题
|
2018-03-02 15:39:01 +08:00 |
ibuler
|
f7ab13952e
|
[Bugfix] 修复bug,修改celery beat版本依赖
|
2018-03-02 09:36:17 +08:00 |
ibuler
|
5dcdeddf22
|
Merge remote-tracking branch 'github/dev' into dev
|
2018-03-01 13:39:52 +08:00 |
ibuler
|
1018deda96
|
[Update] 支持拖拽更新
|
2018-03-01 12:40:41 +08:00 |
ibuler
|
5a0068d86a
|
[Update] 修改文案
|
2018-03-01 10:45:51 +08:00 |
ibuler
|
31629fc975
|
[Bugfix] 修复资产禁用还可以登录
|
2018-03-01 10:44:55 +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
|
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
|
f1c386714d
|
[Update]一些修改
|
2018-02-25 22:36:42 +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
|
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 |
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
|
a10ff5930f
|
[Update] 修改资产创建
|
2018-02-01 10:22:20 +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 |
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
|
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
|
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 |
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
|
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
|
968b395bce
|
Merge branch 'es' into dev
|
2018-01-22 11:51:37 +08:00 |