ibuler
|
8c12c382a5
|
[Bugfix] 修复merge带来的问题
|
2018-07-25 18:21:37 +08:00 |
ibuler
|
2ecfecb06f
|
[Update] Merge with dev
|
2018-07-25 18:18:18 +08:00 |
BaiJiangJie
|
e7c530d8e6
|
[Update] 添加授权规则org (#1580)
* [Update] 修复创建授权规则,显示org_name不是有效UUID的bug
* [Update] 更新org之间隔离授权规则,解决QuerySet与Manager问题;修复创建用户,显示org_name不是有效UUID之bug;
|
2018-07-24 22:28:20 -05:00 |
老广
|
b156f4ad16
|
Tmp org (#1579)
* [Update] 添加org api, 升级到django 2.0
* [Update] fix some bug
* [Update] 修改一些bug
|
2018-07-24 22:21:12 -05:00 |
老广
|
c816875f28
|
[Update] 修改permission (#1574)
|
2018-07-22 23:55:13 -05:00 |
老广
|
2208d6d51e
|
[Bugfix] 解决Node.root() 死循环,移动AdminRequired到permission中 (#1571)
|
2018-07-20 05:42:01 -05:00 |
ibuler
|
e3aa18ff2d
|
[Update] 修改get_current_org 为 proxy对象 current_org
|
2018-07-20 17:49:47 +08:00 |
ibuler
|
b5f6f80ae6
|
[Update] 修改Node
|
2018-07-20 13:25:50 +08:00 |
ibuler
|
bbe4080008
|
[Update] 删掉Premiddleware
|
2018-07-20 12:15:45 +08:00 |
ibuler
|
b6523da603
|
[Update] 修改外键为org_id
|
2018-07-20 10:54:16 +08:00 |
ibuler
|
c24f1a0517
|
[Update] 修改约束
|
2018-07-19 19:24:29 +08:00 |
wojiushixiaobai
|
e1fff18ce3
|
替换淘宝IP查询接口
|
2018-07-19 14:14:58 +08:00 |
ibuler
|
c94d018d7e
|
[Bugfix] 修复转义引起的中文乱码问题
|
2018-07-18 15:31:14 +08:00 |
ibuler
|
fd5f562cbf
|
[Update] stash it
|
2018-07-18 12:57:08 +08:00 |
老广
|
1a49cf4d9c
|
Merge pull request #1532 from wojiushixiaobai/dev
[Update]修改url地址
|
2018-07-16 22:24:09 -05:00 |
ibuler
|
4d1da56872
|
[Update] 修改asset api
|
2018-07-16 14:47:06 +08:00 |
BaiJiangJie
|
09e636495e
|
[Update] 模版删除unblock的id属性
|
2018-07-16 12:22:32 +08:00 |
BaiJiangJie
|
812078331e
|
[Update] 添加解除用户登录限制功能
|
2018-07-16 12:13:13 +08:00 |
wojiushixiaobai
|
696589a3cf
|
修改url
|
2018-07-16 12:13:06 +08:00 |
ibuler
|
5648dcd7e7
|
[Update] 修改用户view
|
2018-07-15 00:55:05 +08:00 |
ibuler
|
28e47f33c1
|
[Update] 修改一些逻辑
|
2018-07-14 00:47:21 +08:00 |
BaiJiangJie
|
1182313c1a
|
[Update] 取消系统用户-清除认证信息,取消-网关rdp协议认证信息,添加用户unblock功能
|
2018-07-13 19:30:48 +08:00 |
ibuler
|
7412bdcba7
|
[Update] 完成基本框架
|
2018-07-13 15:05:46 +08:00 |
老广
|
df95c93bb1
|
Merge pull request #1503 from jumpserver/update_loginlog
[Update] 记录用户登录失败日志,限制用户登录失败次数
|
2018-07-10 02:31:39 -05:00 |
ibuler
|
b6cd4a20c5
|
[Bugfix] Data table xss attack
|
2018-07-08 13:02:43 +08:00 |
BaiJiangJie
|
5d800fa629
|
[Update] 修改coco端登录限制次数逻辑
|
2018-07-05 17:07:03 +08:00 |
BaiJiangJie
|
bd14266abd
|
[Update] 修改登录日志模型类的MFA字段默认状态为-
|
2018-07-05 16:45:05 +08:00 |
BaiJiangJie
|
512fc8f8f0
|
[Update] 优化登录失败次数限制的逻辑,并添加系统安全设置选项
|
2018-07-05 16:23:33 +08:00 |
BaiJiangJie
|
ff9b1a887f
|
[Update] 添加用户登录失败次数限制
|
2018-07-04 16:55:11 +08:00 |
BaiJiangJie
|
43370c547a
|
[Update] 登录日志逻辑修改变量名
|
2018-07-04 10:57:37 +08:00 |
BaiJiangJie
|
2eda58eadd
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-07-03 17:48:22 +08:00 |
BaiJiangJie
|
e1be867913
|
[Update] 更新用户登录日志,记录登录失败日志并添加MFA启用状态信息
|
2018-07-03 17:47:12 +08:00 |
ibuler
|
4002289974
|
[Bugfix] 修复详情中删除时的bug
|
2018-07-03 13:23:21 +08:00 |
ibuler
|
0a2ff83ca1
|
Merge remote-tracking branch 'origin/dev' into dev
|
2018-06-26 22:14:21 +08:00 |
ibuler
|
7276bd0b2a
|
[Update] 更新获取session log的方法,以后统一到media/replay中
|
2018-06-26 22:13:39 +08:00 |
ibuler
|
dbc471c195
|
[Bugfix] 修复小错误
|
2018-06-08 18:40:31 +08:00 |
老广
|
8a5e1b8223
|
Merge pull request #1407 from jokimina/dev_for_pr
[Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
|
2018-06-08 05:31:05 -05:00 |
BaiJiangJie
|
221fae5875
|
[Bugfix] 修复用户失效日期截止后还可登录问题
|
2018-06-08 16:34:15 +08:00 |
xiaodong
|
f4084c800a
|
[Bugfix] 更新用户信息时不填密码也会触发密码规则验证,导致无法更新
|
2018-06-08 16:20:28 +08:00 |
BaiJiangJie
|
5f2c31e42c
|
[Update] 重置公钥,添加成功信息(user-pubkey-update)/自动跳转下一步(first-login)
|
2018-06-07 12:29:55 +08:00 |
BaiJiangJie
|
64db02c3f8
|
[Update] 添加用户来源 db/ldap
|
2018-06-06 16:59:32 +08:00 |
BaiJiangJie
|
842841128f
|
Merge branch 'dev' of github.com:jumpserver/jumpserver into github_dev
|
2018-06-06 15:35:40 +08:00 |
BaiJiangJie
|
b026e86741
|
[Update] 修改判断MFA是否全局启用的逻辑,放到User.otp_force_enabled中
|
2018-06-06 15:35:26 +08:00 |
ibuler
|
80d11bbaab
|
[Update] 删除user group继承的抽象类
|
2018-06-06 14:42:06 +08:00 |
BaiJiangJie
|
ee35ca3643
|
[Feature] 增加功能,安全设置(全局MFA设置,密码强度校验)
|
2018-06-05 17:26:31 +08:00 |
BaiJiangJie
|
3a2973023c
|
[Update] 修改资产树和资产列表数量显示(游离资产)
|
2018-05-29 11:17:09 +08:00 |
ibuler
|
ffabef0040
|
Merge branch 'large' into dev
|
2018-05-28 13:20:58 +08:00 |
ibuler
|
0b4df78393
|
[Update] 修改permistion utils优化返回的属性
|
2018-05-28 13:20:26 +08:00 |
ibuler
|
0bc86543b5
|
[Update] 修改用户组详情显示授权资产的bug
|
2018-05-26 21:53:50 +08:00 |
ibuler
|
9b4b9e6900
|
[Update] 发送邮件增加用户名显示
|
2018-05-25 18:13:48 +08:00 |
ibuler
|
4b7af1457d
|
[Update] 系统用户新增清除认证的操作
|
2018-05-17 11:39:04 +08:00 |
BaiJiangjie
|
2583c0b26c
|
[Bugfix] 资产树节点,取消model value unique,并添加唯一性校验,修改新增节点计数器规则
|
2018-05-10 20:48:16 +08:00 |
BaiJiangjie
|
0962a16b22
|
[Bugfix] 修复首次登录条款问题及引导页面MFA配置问题
|
2018-04-26 19:49:09 +08:00 |
BaiJiangjie
|
c37414045b
|
[Bugfix] 修改用户列表导出,默认导出全部用户
|
2018-04-24 15:16:05 +08:00 |
BaiJiangjie
|
784bec42ff
|
[Update] 修改用户登录,首次登录不需要验证码,登录失败时需要验证码校验
|
2018-04-24 13:00:36 +08:00 |
BaiJiangjie
|
b5fc76d6a5
|
[Update] 修改用户首次登录页
|
2018-04-23 21:04:46 +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
|
7a219e1710
|
[Update] OTP文案修改为MFA
|
2018-04-20 11:23:31 +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 |
BaiJiangjie
|
12c8cf6b76
|
[Update] 添加OTP认证功能
|
2018-04-19 11:13:11 +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
|
2398e9acbd
|
更改表截稿
|
2018-04-12 10:16:38 +08:00 |
ibuler
|
8b3b517bab
|
[Update] 修改授权规则详情列表页面
|
2018-04-11 15:24:12 +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
|
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
|
6a88fd2d60
|
[Update] 修改api权限
|
2018-04-04 08:47:02 +08:00 |
BaiJiangjie
|
b63999f385
|
创建用户发送邮件
|
2018-04-03 16:28:58 +08:00 |
BaiJiangjie
|
ec6103448e
|
使终端管理的应用用户不显示在用户组里
|
2018-04-02 12:02:06 +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
|
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
|
f85e5b6f75
|
[Bugfix] 修改添加用户的bug
|
2018-03-27 17:47:53 +08:00 |
ibuler
|
759760e7d9
|
[Update] 服务器可以生成用户密钥
|
2018-03-21 15:22:10 +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
|
fe03011177
|
[Update] 不允许添加应用程序类型的用户
|
2018-03-11 19:46:40 +08:00 |
liuzheng712
|
9162f4a226
|
revert: add the old apps/users/migrations/0002_auto_20171225_1157.py
|
2018-03-08 09:13:40 +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
|
86c0a2d28b
|
[Update] 修改部分翻译和文档
|
2018-03-05 17:14:42 +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
|
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
|
870b863136
|
[Update] 修改设置的一些require
|
2018-02-27 15:04:05 +08:00 |
ibuler
|
9292e48554
|
[Bugfix] 用户csv导入编码问题
|
2018-02-27 12:18:36 +08:00 |
ibuler
|
c68da5898a
|
[Update] 修改初始
|
2018-02-26 12:31:33 +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
|
bd4768c147
|
[Update] 拆分asset api module
|
2018-02-06 18:32:02 +08:00 |
ibuler
|
2d3967872b
|
[Feature] 完成资产授权和资产添加
|
2018-02-02 17:06:08 +08:00 |
ibuler
|
9e09a962af
|
[Feature] 支持popover
|
2018-01-30 18:07:51 +08:00 |
ibuler
|
012614562f
|
[Update] 修改小bug
|
2018-01-29 16:57:50 +08:00 |
ibuler
|
6d552f4680
|
[Feature] 添加链接token
|
2018-01-29 16:18:30 +08:00 |
ibuler
|
f0b9a11482
|
[Update] ansible disk bug
|
2018-01-26 16:06:23 +08:00 |
ibuler
|
b0fab2453a
|
[Merge] 合并标签功能
|
2018-01-26 15:49:09 +08:00 |
ibuler
|
d74c2e8466
|
[Model] 修改create_by字段
|
2018-01-25 12:17: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
|
f40fbaf602
|
[Feature] 添加修改用户密码api
|
2018-01-23 10:36:20 +08:00 |
ibuler
|
968b395bce
|
Merge branch 'es' into dev
|
2018-01-22 11:51:37 +08:00 |
ibuler
|
0a931bbf77
|
[Feature] es support
|
2018-01-22 11:38:40 +08:00 |
ibuler
|
57e508f331
|
[update] 修改用户创建时 姓名和用户名的位置
|
2018-01-20 22:26:21 +08:00 |
ibuler
|
681ddb5af2
|
[Bugfix] for login ip
|
2018-01-16 11:08:05 +08:00 |
ibuler
|
29061aa088
|
[Bugfix] user login ip
|
2018-01-16 09:58:33 +08:00 |
ibuler
|
b2f97a263d
|
[Feature] 添加后端paging
|
2018-01-15 17:41:49 +08:00 |
ibuler
|
59a69f0253
|
[Bugfix] 修复title显示Jumpserver
|
2018-01-15 13:54:19 +08:00 |
ibuler
|
39fff235d1
|
[Bugfix] 修复cluster创建的bug
|
2018-01-14 18:02:11 +08:00 |
ibuler
|
abb1a40a4f
|
[Feature] 添加basic settings
|
2018-01-12 15:43:26 +08:00 |
ibuler
|
121f56f44b
|
[Feature] 添加setting页面
|
2018-01-11 20:10:27 +08:00 |
ibuler
|
3223d3b74d
|
[Bugfix] 修复了一些显示上的bug
|
2018-01-10 17:38:10 +08:00 |
ibuler
|
b2b123b41e
|
[Bugfix] 用户添加报错
|
2018-01-10 15:15:29 +08:00 |
ibuler
|
7e23d2c234
|
[Bugfix] 修复重置密码bug
|
2018-01-10 11:31:25 +08:00 |
ibuler
|
a4d02adb22
|
[Update] system user form add label
|
2018-01-09 23:14:25 +08:00 |
ibuler
|
72a82c41ee
|
[Update] 修改 success message, 添加资产组时可以添加资产
|
2018-01-09 23:07:53 +08:00 |
ibuler
|
450a9495ec
|
[Bug&Update] 以下bug和功能
- 修复新建资产不选管理用户和集群异常bug
- profile下拉增加icon
- 授权api增加os和platform
|
2018-01-09 13:10:28 +08:00 |
ibuler
|
c0829194dc
|
[Update] 修改一些bug, 增加执行task的按钮
|
2018-01-08 19:16:28 +08:00 |
ibuler
|
07a70311df
|
[Bugfix] 修复以下bug
- 删除用户报错,上次更新带来的
- 管理员用户页面会看到所有主机的,而不是授权给自己的
- 授权详情页面 资产显示无效
|
2018-01-08 11:22:19 +08:00 |
ibuler
|
9a6bc9fec5
|
[Update] session添加登陆ip
|
2018-01-05 18:37:36 +08:00 |
ibuler
|
1888c698f1
|
[Bugfix] 修复一些bug
|
2018-01-05 17:57:02 +08:00 |
ibuler
|
28223421b1
|
[Bugfix] 修复一下bug
1. 添加管理用户时同名的异常
2. 添加授权规则的检查
|
2018-01-05 14:36:49 +08:00 |
ibuler
|
3b6403b2f2
|
[Update] 修改一些翻译
|
2018-01-01 15:08:33 +08:00 |
ibuler
|
c48531c586
|
[Update] 添加和修改部分翻译
|
2018-01-01 00:45:12 +08:00 |
ibuler
|
0916757eb8
|
[Bugfix] 修复一些bug
|
2017-12-31 21:51:25 +08:00 |
ibuler
|
0b299344a7
|
[Update] 修改database 表现
|
2017-12-31 12:20:08 +08:00 |
ibuler
|
a755882100
|
[Bugfix] 修复打印中文报错异常
|
2017-12-30 22:26:05 +08:00 |
ibuler
|
e0a3fafbd5
|
[Bugfix] 详见trello
|
2017-12-30 02:29:29 +08:00 |
ibuler
|
158678c2db
|
[Bugfix] 修改bug,显示cluster
|
2017-12-28 18:01:15 +08:00 |
ibuler
|
e20444983d
|
[Bugfix] 修改html bug
|
2017-12-28 12:25:43 +08:00 |
ibuler
|
1c20f519a9
|
[Bugfix] 修改小的bug
|
2017-12-27 11:22:44 +08:00 |
ibuler
|
0848893f1e
|
[Bugfix] 修复时间日期搜索的bug,select2模块自适应长度
|
2017-12-27 01:29:23 +08:00 |
ibuler
|
22b7b84a45
|
[Update] 修改创建默认集群,组等名称为Default
|
2017-12-26 22:14:37 +08:00 |
ibuler
|
6a6d0cf279
|
[Update] Change user model
|
2017-12-26 02:01:19 +08:00 |
ibuler
|
f4beccddae
|
[Update] 修改注册流程
|
2017-12-25 12:22:49 +08:00 |
ibuler
|
d0ef1e715e
|
[Add] Add initial migrations
|
2017-12-24 23:21:05 +08:00 |
ibuler
|
bf9bb1b973
|
[Update] 修改ops task运行
|
2017-12-24 18:53:07 +08:00 |
ibuler
|
47040a61c8
|
[Bugfix] User first login
|
2017-12-21 19:33:16 +08:00 |
ibuler
|
d33ae9d9d9
|
[Update] login add cookie test
|
2017-12-21 19:15:12 +08:00 |
ibuler
|
d51b3eff6a
|
[Update] 修改settings和配置文件
|
2017-12-21 18:54:29 +08:00 |
ibuler
|
e1b23a7cb4
|
[Bugfix] 修复无法记录日志的bug
|
2017-12-21 15:28:21 +08:00 |
ibuler
|
76df1de634
|
[Bugfix] 修复一些明显的bug
|
2017-12-21 11:31:13 +08:00 |
ibuler
|
b0eace6ad8
|
[Bugfix] 基本完成assets模块
|
2017-12-19 12:41:00 +08:00 |
ibuler
|
b4e1ac1953
|
[Bugfix] 修复资产模块中一些bug
|
2017-12-18 22:48:19 +08:00 |
ibuler
|
a308000d2e
|
[Bugfix] 修改users模块一些bug
|
2017-12-18 18:38:30 +08:00 |
ibuler
|
08e1788426
|
[Feature] 打算拆分下载和上传为独立模块,时间有限暂时放弃
|
2017-12-14 21:27:14 +08:00 |
ibuler
|
18fbfb449d
|
[Feature] 修改url pattern 精确匹配uuid
|
2017-12-12 15:45:01 +08:00 |
ibuler
|
cb57002682
|
[Change] 去掉前端html中的hardcode 99991937
|
2017-12-12 14:38:51 +08:00 |
ibuler
|
722863428d
|
[Feature] 添加context_processor
|
2017-12-12 14:28:12 +08:00 |
ibuler
|
99b4c66b5e
|
[Feature] 添加signals 解耦代码
|
2017-12-12 12:19:45 +08:00 |
ibuler
|
cbc000696e
|
[Feature] 修改adminuser systemuser cluster及他们的关系
|
2017-12-11 17:08:43 +08:00 |
ibuler
|
18fd04d63c
|
[Stash] Test case 通不过,import error
|
2017-12-08 10:15:27 +08:00 |
ibuler
|
ec8106e43d
|
[Feature] 完成登陆日志
|
2017-12-05 12:24:31 +08:00 |
ibuler
|
a5f9735906
|
[Update] 更新index view
|
2017-12-04 20:15:47 +08:00 |
ibuler
|
61a8d95f46
|
[Change] Rename applications -> terminal
|
2017-12-01 17:28:47 +08:00 |
ibuler
|
19051d36dc
|
[Update] 修改一些bug
|
2017-12-01 17:00:55 +08:00 |
ibuler
|
26607bc327
|
[Copyright] 修改copyrite
|
2017-11-23 14:35:16 +08:00 |
ibuler
|
e7f38ec894
|
[Change] 全部使用uuid作为主键
|
2017-11-23 14:08:01 +08:00 |
ibuler
|
7f9ce57318
|
修改 terminal上报接口和api
|
2017-11-14 09:44:16 +08:00 |
ibuler
|
3639b190e3
|
Update perm api
|
2017-11-01 23:23:11 +08:00 |
ibuler
|
034f0a02b1
|
Update terminal api
|
2017-10-31 11:34:20 +08:00 |
ibuler
|
0db8482873
|
Update ldap auth
|
2017-10-10 14:18:08 +08:00 |
ibuler
|
8bccaa6ee2
|
Update issue template
|
2017-10-08 19:43:55 +08:00 |
ibuler
|
2ae3bec335
|
[Bugfix] Change user public key length to 5000, fixed #631
|
2017-09-28 21:37:36 +08:00 |
ibuler
|
da5b9be5ca
|
[Bugfix] Update some translation and set warning, partial fix #646
|
2017-09-28 20:52:33 +08:00 |
管宜尧
|
290872dcad
|
bugfix: 解决用户失效时间为空时,无法使用密码进行ssh登录跳板机的问题 (#659)
* bugfix: 解决用户失效时间为空时,无法使用密码进行ssh登录跳板机的问题
bugfix: 解决用户失效时间为空时,无法使用密码进行ssh登录跳板机的问题。
```
AttributeError at /api/users/v1/auth/
'NoneType' object has no attribute 'strftime'
Request Method: POST
Request URL: http://127.0.0.1:8080/api/users/v1/auth/
Django Version: 1.11.4
Python Executable: /opt/py3/bin/python
Python Version: 3.6.1
Python Path: ['/data/deployment/jumpserver/apps', '/usr/local/lib/python36.zip', '/usr/local/lib/python3.6', '/usr/local/lib/python3.6/lib-dynload', '/opt/py3/lib/python3.6/site-packages', '/data/deployment/jumpserver', '/data/deployment/jumpserver/apps']
Server time: Wed, 30 Aug 2017 23:18:47 +0800
Installed Applications:
['users.apps.UsersConfig',
'assets.apps.AssetsConfig',
'perms.apps.PermsConfig',
'ops.apps.OpsConfig',
'audits.apps.AuditsConfig',
'common.apps.CommonConfig',
'applications.apps.ApplicationsConfig',
'rest_framework',
'rest_framework_swagger',
'django_filters',
'bootstrap3',
'captcha',
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.messages',
'django.contrib.staticfiles']
Installed Middleware:
['django.middleware.security.SecurityMiddleware',
'django.contrib.sessions.middleware.SessionMiddleware',
'django.middleware.locale.LocaleMiddleware',
'django.middleware.common.CommonMiddleware',
'django.middleware.csrf.CsrfViewMiddleware',
'django.contrib.auth.middleware.AuthenticationMiddleware',
'django.contrib.messages.middleware.MessageMiddleware',
'django.middleware.clickjacking.XFrameOptionsMiddleware',
'jumpserver.middleware.TimezoneMiddleware',
'jumpserver.middleware.DemoMiddleware']
Traceback:
File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/exception.py" in inner
41. response = get_response(request)
File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/base.py" in _get_response
187. response = self.process_exception_by_middleware(e, request)
File "/opt/py3/lib/python3.6/site-packages/django/core/handlers/base.py" in _get_response
185. response = wrapped_callback(request, *callback_args, **callback_kwargs)
File "/usr/local/lib/python3.6/contextlib.py" in inner
53. return func(*args, **kwds)
File "/opt/py3/lib/python3.6/site-packages/django/views/decorators/csrf.py" in wrapped_view
58. return view_func(*args, **kwargs)
File "/opt/py3/lib/python3.6/site-packages/django/views/generic/base.py" in view
68. return self.dispatch(request, *args, **kwargs)
File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in dispatch
489. response = self.handle_exception(exc)
File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in handle_exception
449. self.raise_uncaught_exception(exc)
File "/opt/py3/lib/python3.6/site-packages/rest_framework/views.py" in dispatch
486. response = handler(request, *args, **kwargs)
File "/data/deployment/jumpserver/apps/users/api.py" in post
166. return Response({'token': token, 'user': user.to_json()})
File "/data/deployment/jumpserver/apps/users/models/user.py" in to_json
207. 'date_expired': self.date_expired.strftime('%Y-%m-%d %H:%M:%S')
Exception Type: AttributeError at /api/users/v1/auth/
Exception Value: 'NoneType' object has no attribute 'strftime'
Request information:
USER: AnonymousUser
GET: No GET data
POST: No POST data
FILES: No FILES data
COOKIES: No cookie data
```
* bugfix: 个人信息页面个人信息pannel错位
bugfix: 个人信息页面个人信息pannel错位
|
2017-09-24 08:40:59 +08:00 |
ibuler
|
cd1d690fd3
|
[Bugfix] 修复一些bug
|
2017-07-28 21:52:43 +08:00 |
中国娃
|
67e953902b
|
Update utils.py (#579)
|
2017-07-28 20:42:16 +08:00 |
ibuler
|
1c78526f86
|
Fix bug
|
2017-07-20 07:58:16 +08:00 |
ibuler
|
d012880a90
|
[Bugfix] 修复bug
|
2017-07-13 11:46:56 +08:00 |
Eli
|
370cdc275a
|
添加一个资产,然后推送系统用户时出现(Asset实例无法序列化) (#477)
* error while push systemuser. error while create assets with adminuser(ssh key)
* fix errors in case of config.py dose not exist.
* change sign_t return from bytes to str. (#480)
* fix id_dsa check error (#458)
* fix id_dsa check error
* fix 邮件修改密码 token错误
* fix 3c8aec9 add )
* Dockerfile 优化 (#453)
|
2017-07-10 11:01:20 +08:00 |
ibuler
|
4e67749eef
|
[Docs] 添加api dockers
|
2017-07-10 10:26:17 +08:00 |
ibuler
|
29095a869c
|
[Demo] update demo mode code
|
2017-06-19 17:59:13 +08:00 |
njqaaa
|
9b14244363
|
fix id_dsa check error (#458)
* fix id_dsa check error
* fix 邮件修改密码 token错误
* fix 3c8aec9 add )
|
2017-06-06 11:23:39 +08:00 |
Caijun
|
cf07a6ebb7
|
Fix judging request.user valid on UserToken API (#476)
|
2017-06-02 17:15:59 +08:00 |
ibuler
|
41633be1aa
|
[Bugfix] 修复无法删除资产组
|
2017-05-22 20:30:31 +08:00 |
ibuler
|
d2620a655c
|
[Bugfix] 修复模板bug, 修复getattr bug
|
2017-05-22 20:18:13 +08:00 |
ibuler
|
edc631ad60
|
[Docker] 添加Docker compose
|
2017-05-20 00:19:10 +08:00 |
GuangHongwei
|
458989328e
|
[Bugfix] 修改bug,使用py3编程
|
2017-05-15 23:39:54 +08:00 |
ibuler
|
2ec0ab871a
|
Fix form bug
|
2017-04-12 18:06:32 +08:00 |
ibuler
|
695e4da85e
|
[Fixture] 完成批量更新
|
2017-04-12 11:50:15 +08:00 |
ibuler
|
071d1922d0
|
stash it
|
2017-04-10 22:55:15 +08:00 |
ibuler
|
95e64d7809
|
[Change] 修改导出和更新逻辑
|
2017-04-09 17:59:14 +08:00 |
ibuler
|
5418d0b44c
|
[Change] Using csv replace xlsx
|
2017-04-09 00:45:28 +08:00 |
ibuler
|
bcc065eb8f
|
[Compat] compat py3 change bootstrap form to bootstrap3
|
2017-04-07 23:52:46 +08:00 |
ibuler
|
a320b9e05e
|
[Bugfix] 兼容py3
|
2017-04-07 19:11:27 +08:00 |
ibuler
|
c11374ae39
|
[Bugfix] 修改翻译
|
2017-04-07 16:59:09 +08:00 |
ibuler
|
92ebe85a3f
|
[Fixture] 详情页添加system user 推送
|
2017-04-05 19:09:51 +08:00 |
ibuler
|
ac3553babb
|
[Fixture] 修改asset detail
|
2017-04-04 11:14:59 +08:00 |
ibuler
|
709552f14c
|
[Fixture] 添加首页
|
2017-04-02 18:09:40 +08:00 |
ibuler
|
66a2262ee9
|
[Fixture] 增加 asset groups assets api
|
2017-04-01 00:41:16 +08:00 |
ibuler
|
067426d5e0
|
[Fixture] 完成用户向导页
|
2017-03-31 23:46:00 +08:00 |
ibuler
|
7720e9f3fd
|
[Change] 修改图片
|
2017-03-31 18:47:50 +08:00 |
ibuler
|
61a481f427
|
[Fixture] 添加用户连接终端
|
2017-03-31 11:25:25 +08:00 |
ibuler
|
3fa5ce5404
|
[Fixture] 添加用户信息更改
|
2017-03-30 16:28:00 +08:00 |
ibuler
|
0983f294b7
|
[Fixture] 添加用户profile
|
2017-03-30 00:51:36 +08:00 |
ibuler
|
4e7b665ea8
|
[Change] 添加翻译,并添加用户登陆页面
|
2017-03-29 15:26:32 +08:00 |
ibuler
|
ab62bfca7e
|
[Bugfix] 修改一些bug
|
2017-03-04 16:38:26 +08:00 |
ibuler
|
695dc96ce8
|
Merge branch 'audits'
|
2017-03-03 10:24:34 +08:00 |
ibuler
|
9518672ad2
|
Add
|
2017-03-02 18:29:29 +08:00 |
ibuler
|
b055144908
|
Merge with audits
|
2017-03-01 15:35:11 +08:00 |
xiaokong1937@gmail.com
|
548d7ef99a
|
fix #13;fix `user` context conflict problem in user-detail page
|
2017-02-09 21:19:49 +08:00 |
ibuler
|
a79c3dd156
|
[Fixture] 添加command log backends, 未来支持es
|
2017-02-06 23:13:27 +08:00 |
xiaokong1937@gmail.com
|
fe01f92545
|
user profile: update ssh pk
|
2017-02-03 13:37:05 +08:00 |
xiaokong1937@gmail.com
|
8a5d0b2d92
|
remove unused templatetags: users_tags and common_tags
|
2017-01-26 20:24:50 +08:00 |
xiaokong1937@gmail.com
|
f3647ea46d
|
user-profile page
|
2017-01-25 21:19:16 +08:00 |
ibuler
|
0869931e67
|
[Bugfix] 修改了一些issue上的bug
|
2017-01-20 20:13:22 +08:00 |
ibuler
|
df94d11f53
|
[Fix] 修改一些api bug
|
2017-01-20 13:59:53 +08:00 |
ibuler
|
ffed28c9c7
|
[Change] 修改perm的代码, 强制79个字符内
|
2017-01-17 17:11:01 +08:00 |
ibuler
|
25cb47d2f5
|
[Change] 拆分user view为多个view
|
2017-01-17 16:34:47 +08:00 |
ibuler
|
8916221bba
|
[Bugfix] 紧急修复url解析失败错误
|
2017-01-10 18:03:00 +08:00 |
ibuler
|
17657deb0e
|
[Bugfix] 和Master分支合并后,修复冲突,DRF 新版本要求 fields和exclude
|
2017-01-08 13:35:59 +08:00 |
ibuler
|
9c6c6d6b4c
|
[Feature] 添加Dockerfile
|
2017-01-07 20:07:33 +08:00 |
ibuler
|
b670259ab6
|
Modify terminal reqject templatte
|
2017-01-03 00:11:44 +08:00 |
ibuler
|
301e02bcd8
|
Update some api
|
2016-12-30 00:19:47 +08:00 |
ibuler
|
70da177ed7
|
Update api
|
2016-12-29 19:17:00 +08:00 |
ibuler
|
92d854b971
|
Update api
|
2016-12-29 00:29:59 +08:00 |
ibuler
|
d80fec6e60
|
Update some api
|
2016-12-28 00:28:52 +08:00 |
ibuler
|
d56f030dc4
|
Finish terminal accept
|
2016-12-27 00:59:52 +08:00 |
ibuler
|
775cd523eb
|
Update app terminal name to applications
|
2016-12-25 23:10:53 +08:00 |
ibuler
|
a8fa4d2f0c
|
update terminal regist
|
2016-12-25 17:44:39 +08:00 |
ibuler
|
2707012325
|
Finish access key auth
|
2016-12-25 13:15:28 +08:00 |
ibuler
|
fe17bec752
|
Add access key auth
|
2016-12-22 01:07:05 +08:00 |
ibuler
|
5b4ce709af
|
Add private token and change user group
|
2016-12-22 00:36:31 +08:00 |
ibuler
|
875aaa0029
|
update user model for create application user
|
2016-12-21 01:17:36 +08:00 |
ibuler
|
649509dec1
|
Change models dir
|
2016-12-21 00:43:52 +08:00 |
ibuler
|
a448fd02e2
|
merged
|
2016-12-20 23:07:33 +08:00 |
ibuler
|
96d32f2e3e
|
prepare merge ops
|
2016-12-20 23:06:27 +08:00 |
ibuler
|
4d71c2d1ff
|
修改token获取,拆分认证文件和权限文件
|
2016-12-20 01:19:50 +08:00 |
ibuler
|
d964221689
|
Update api
|
2016-12-16 19:32:05 +08:00 |
wangjun5
|
87eed2e59b
|
add asset tool
|
2016-12-15 19:55:15 +08:00 |
ibuler
|
3aea994101
|
asset import
|
2016-11-27 14:37:50 +08:00 |
ibuler
|
c1c9c7b68a
|
update asset
|
2016-11-25 22:45:47 +08:00 |
ibuler
|
6e843533cb
|
Base finish user
|
2016-11-25 11:00:51 +08:00 |
ibuler
|
d8a229c09b
|
to Commpany
|
2016-11-25 08:39:24 +08:00 |
ibuler
|
72ad4b44ce
|
update bug
|
2016-11-24 19:36:49 +08:00 |
ibuler
|
c1a74aebc5
|
[BugFix] update some user import bug
|
2016-11-24 17:08:20 +08:00 |
ibuler
|
eae580e51f
|
Update user import and export
|
2016-11-24 15:45:08 +08:00 |
ibuler
|
e28f7a3bec
|
Add export and import
|
2016-11-24 00:48:57 +08:00 |
ibuler
|
be99eb82e8
|
udpate some bug
|
2016-11-23 19:37:47 +08:00 |
ibuler
|
5af97c969b
|
export csv
|
2016-11-23 19:09:11 +08:00 |
ibuler
|
7dfde3a3c5
|
Update
|
2016-11-23 16:17:23 +08:00 |
ibuler
|
180af7e0bd
|
Update csv
|
2016-11-22 00:59:49 +08:00 |
ibuler
|
e89d3b3807
|
Update asset
|
2016-11-17 19:28:45 +08:00 |
ibuler
|
aff37092bf
|
Rename urls
|
2016-11-16 18:12:14 +08:00 |
ibuler
|
5745c8cc4a
|
Finish url namespace change
|
2016-11-16 17:45:46 +08:00 |
ibuler
|
a5e487441f
|
prepare change api name
|
2016-11-16 17:38:03 +08:00 |
ibuler
|
3b30eb3278
|
Weiteng
|
2016-11-15 23:09:36 +08:00 |
ibuler
|
99c36f2a2c
|
Fix bug
|
2016-11-15 19:44:08 +08:00 |
ibuler
|
db8b0022fc
|
Update usergroup detail
|
2016-11-15 19:33:04 +08:00 |
ibuler
|
bd882c8bef
|
User group detail
|
2016-11-15 00:48:48 +08:00 |
ibuler
|
8d358a7a68
|
UPdate some
|
2016-11-14 19:28:21 +08:00 |
ibuler
|
10aa8c40a7
|
Add login log
|
2016-11-10 23:54:21 +08:00 |
ibuler
|
f70abec5ef
|
Finish user detail
|
2016-11-10 22:06:23 +08:00 |
ibuler
|
69f2bf664b
|
Finish user permission revoke
|
2016-11-10 16:59:50 +08:00 |
ibuler
|
47090eb0f7
|
update some user api
|
2016-11-09 23:49:10 +08:00 |
ibuler
|
8d7759d22f
|
change user api
|
2016-11-09 19:29:15 +08:00 |
ibuler
|
ea3f8af161
|
Fix pubkey auth bug
|
2016-11-07 16:59:52 +08:00 |
ibuler
|
a75e1db970
|
Add form validate
|
2016-11-07 00:39:26 +08:00 |
ibuler
|
072da114db
|
Finish system user list
|
2016-11-06 22:45:26 +08:00 |
ibuler
|
968b1b4cb6
|
Stash
|
2016-11-06 21:29:04 +08:00 |
ibuler
|
41337d28c3
|
add proxy log search
|
2016-11-05 01:15:25 +08:00 |
ibuler
|
53e97dac40
|
stash it
|
2016-11-04 18:33:16 +08:00 |
ibuler
|
f437d3f883
|
update
|
2016-11-03 19:42:47 +08:00 |
ibuler
|
3448f3eb0a
|
Modify init data
|
2016-11-02 23:00:47 +08:00 |
ibuler
|
34a0a37b63
|
Add token
|
2016-11-01 19:31:35 +08:00 |
ibuler
|
1159d9494c
|
Update signer
|
2016-11-01 17:21:16 +08:00 |
ibuler
|
f1dfba6a93
|
Update some asset issues
|
2016-10-31 19:31:56 +08:00 |
ibuler
|
315af35296
|
Finish token access api
|
2016-10-31 18:58:23 +08:00 |
ibuler
|
6a510dad6c
|
Update some bug
|
2016-10-24 19:32:53 +08:00 |
ibuler
|
df380c343e
|
Update api
|
2016-10-19 19:30:55 +08:00 |
ibuler
|
6164896793
|
Update some thing
|
2016-10-19 18:33:14 +08:00 |
ibuler
|
303659cb0e
|
Change app name apps => terrminal
|
2016-10-17 15:24:41 +08:00 |
ibuler
|
4531157c72
|
may be some wrong
|
2016-10-16 22:12:13 +08:00 |
ibuler
|
9960a6cd21
|
Plan create a new app: terminal
|
2016-10-15 17:14:56 +08:00 |
ibuler
|
0446f449e9
|
Add auth and permission backends
|
2016-10-15 16:04:54 +08:00 |
ibuler
|
a62a2178d0
|
Add user backend
|
2016-10-15 00:49:59 +08:00 |
ibuler
|
0c8922e30f
|
Modify some bug
|
2016-10-09 19:27:49 +08:00 |
ibuler
|
0954f6d7e8
|
Add audits api
|
2016-10-09 00:12:18 +08:00 |
ibuler
|
59727656c3
|
Update table desgin doc and audit log
|
2016-10-07 23:54:29 +08:00 |
ibuler
|
6b6105491c
|
Add migrations
|
2016-10-02 22:13:08 +08:00 |
ibuler
|
45df58114c
|
Merge branch 'connect'
|
2016-10-02 21:45:44 +08:00 |
ibuler
|
a04d772501
|
Merge with master
|
2016-10-02 21:45:26 +08:00 |
xiaokong1937@gmail.com
|
6856fad0c0
|
integrate the user-group list page with its api;
|
2016-10-02 11:09:27 +08:00 |
xiaokong1937@gmail.com
|
d40aa49d8c
|
user bulk import through Excel and close #20
|
2016-10-01 20:26:43 +08:00 |
xiaokong1937@gmail.com
|
05e961f29f
|
user-group detail: fix #15
|
2016-09-30 20:50:40 +08:00 |
xiaokong1937@gmail.com
|
d8143a67cd
|
user-group-detail: user-adding frontend integration
|
2016-09-29 21:14:55 +08:00 |
ibuler
|
acf51238d0
|
Modify ssh server bug for using public key
|
2016-09-29 18:01:26 +08:00 |
xiaoyu
|
e7fddf80ae
|
user-group-detail: add users support
|
2016-09-29 16:41:55 +08:00 |
xiaokong1937@gmail.com
|
f9b49605e4
|
user-group detail page: users op
|
2016-09-28 21:11:43 +08:00 |
xiaokong1937@gmail.com
|
2522f0d80f
|
trivial changes: refactor the jumpserver DataTable api
|
2016-09-27 21:28:02 +08:00 |
xiaokong1937@gmail.com
|
70a6ddc897
|
fix #27
|
2016-09-27 20:16:46 +08:00 |
xiaokong1937@gmail.com
|
49f007601f
|
add user-list-delete support for user-group detail page
|
2016-09-26 21:22:48 +08:00 |
xiaokong1937@gmail.com
|
74cdd2d0f3
|
user list groups bulk update
|
2016-09-26 19:39:43 +08:00 |
xiaoyu
|
15dcc760b4
|
user list bulk update modal
|
2016-09-26 16:33:10 +08:00 |
xiaoyu
|
d2197d99c2
|
fix #26
|
2016-09-26 11:30:43 +08:00 |
ibuler
|
cfef374454
|
Update ssh server
|
2016-09-25 00:11:31 +08:00 |
ibuler
|
7ab47916f2
|
add __init__.py
|
2016-09-24 22:12:49 +08:00 |
ibuler
|
283c53fddf
|
Update gitignore
|
2016-09-24 22:11:53 +08:00 |
ibuler
|
da56310db9
|
update .gitignore
|
2016-09-24 22:09:20 +08:00 |
ibuler
|
4925f3227a
|
update .gitignore
|
2016-09-24 21:57:24 +08:00 |
ibuler
|
88bb620af2
|
Modify ignore
|
2016-09-24 11:50:25 +08:00 |
xiaoyu
|
22163173fe
|
user bulk delete view
|
2016-09-23 16:30:59 +08:00 |
xiaoyu
|
af713672fb
|
user list page bulk action
|
2016-09-22 16:06:46 +08:00 |
xiaoyu
|
515406c05d
|
temp: deactive test
|
2016-09-21 16:43:41 +08:00 |
xiaoyu
|
61d1d9ec90
|
temp
|
2016-09-21 15:48:21 +08:00 |
ibuler
|
220892824c
|
Finish some bug
|
2016-09-20 01:13:50 +08:00 |
ibuler
|
ce5950ca73
|
Merge with asset
|
2016-09-20 00:43:30 +08:00 |
xiaokong1937@gmail.com
|
65461a09a7
|
user-group edit implement
|
2016-09-19 21:08:08 +08:00 |
xiaoyu
|
9a81057d95
|
fix a typo
|
2016-09-19 15:51:28 +08:00 |
xiaoyu
|
f00da20764
|
user-group delete implement
|
2016-09-19 15:47:58 +08:00 |
xiaokong1937@gmail.com
|
4e2a41f4cf
|
user-group draft
|
2016-09-18 21:00:07 +08:00 |
xiaoyu
|
8a5a4f3362
|
fix #14
|
2016-09-18 14:28:34 +08:00 |
xiaoyu
|
8cdc4674d7
|
update toastr js and close #8
|
2016-09-18 10:32:23 +08:00 |
ibuler
|
502c7e756b
|
Modify asset
|
2016-09-17 23:43:41 +08:00 |
ibuler
|
dc4d388d9a
|
Merge with master
|
2016-09-17 18:53:11 +08:00 |
ibuler
|
df281defd8
|
Finish user detail asset grant ..
|
2016-09-17 18:51:19 +08:00 |
ibuler
|
7d3474aeea
|
Add user permission user list
|
2016-09-17 15:20:33 +08:00 |
ibuler
|
b5abb17568
|
Jiu zhe yang ba
|
2016-09-17 13:04:26 +08:00 |
ibuler
|
ab2eeb0da3
|
Finish user asset form
|
2016-09-17 01:04:52 +08:00 |
ibuler
|
06b2c623cb
|
Modify some bug
|
2016-09-16 17:23:47 +08:00 |
xiaokong1937@gmail.com
|
7984806b38
|
change user ssh reset type from private key to public key
|
2016-09-15 16:54:00 +08:00 |
ibuler
|
037d9323a4
|
Modify and code review
|
2016-09-15 11:19:36 +08:00 |
ibuler
|
f253d2ea69
|
Merge with master
|
2016-09-14 23:31:22 +08:00 |
unknown
|
0f9bdab108
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-14 15:40:47 +08:00 |
unknown
|
8490583d73
|
add assets manage
Sweet Alert
|
2016-09-14 15:19:27 +08:00 |
ibuler
|
5bca783e12
|
permission user search
|
2016-09-14 01:08:26 +08:00 |
xiaokong1937@gmail.com
|
6751c5a63a
|
reset user password and ssh pk implement
|
2016-09-13 21:45:10 +08:00 |
xiaoyu
|
00502ce33d
|
trivial js style changes; bugfix for patch method
|
2016-09-13 16:38:43 +08:00 |
unknown
|
7cff5cbf61
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-12 15:36:13 +08:00 |
unknown
|
12831a7d21
|
text
|
2016-09-12 15:35:50 +08:00 |
ibuler
|
6d736d7309
|
Finish permission create and list
|
2016-09-11 22:45:24 +08:00 |
ibuler
|
324bb68667
|
user-pserm
|
2016-09-11 16:59:19 +08:00 |
ibuler
|
627a5825f4
|
Add user perm
|
2016-09-10 21:08:10 +08:00 |
xiaokong1937@gmail.com
|
899233338d
|
#8 user first login view
|
2016-09-10 13:20:34 +08:00 |
xiaokong1937@gmail.com
|
a7e3f9c465
|
#8 user first login view
|
2016-09-10 13:16:58 +08:00 |
xiaokong1937@gmail.com
|
d8fe59debb
|
temp save for issue 8
|
2016-09-08 21:51:44 +08:00 |
ibuler
|
409fac3ef1
|
Merge branch 'admin-user'
|
2016-09-08 20:39:25 +08:00 |
ibuler
|
239dd0567f
|
Finish admin user view
|
2016-09-08 20:39:06 +08:00 |
xiaokong1937@gmail.com
|
62cac20ba7
|
fix #9
|
2016-09-08 19:30:22 +08:00 |
ibuler
|
ff30435eb4
|
Finish adin user add
|
2016-09-08 18:12:53 +08:00 |
ibuler
|
ccfe9b9d08
|
Merge branch 'admin-user'
|
2016-09-08 00:41:22 +08:00 |
ibuler
|
6f4a832389
|
Add admin user list view
|
2016-09-08 00:40:59 +08:00 |
xiaokong1937@gmail.com
|
8acbcb2ed2
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-07 21:53:33 +08:00 |
xiaokong1937@gmail.com
|
04151b9957
|
user group quickedit frontend and rest API
|
2016-09-07 21:53:27 +08:00 |
ibuler
|
4db352f55b
|
Add idc
|
2016-09-07 20:51:33 +08:00 |
ibuler
|
d8e6433404
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-07 20:06:01 +08:00 |
ibuler
|
d0ba17374e
|
Finish asset group create
|
2016-09-07 20:05:42 +08:00 |
xiaokong1937@gmail.com
|
7f09b486d9
|
user-group edit serializer and url implement
|
2016-09-06 21:44:23 +08:00 |
ibuler
|
30fd51c268
|
Asset group detail
|
2016-09-06 21:39:21 +08:00 |
xiaokong1937@gmail.com
|
556fb4e09f
|
refactor `is_active` trigger view and `enable_otp` trigger view in UserDetail page;trivial changes
|
2016-09-06 21:03:51 +08:00 |
xiaokong1937@gmail.com
|
a3096689b5
|
Merge branch 'xiaoyu'
|
2016-09-06 19:14:16 +08:00 |
ibuler
|
dc01833a5b
|
Forget to forgot
|
2016-09-06 16:55:57 +08:00 |
ibuler
|
170b49428c
|
change date_added -> date_created
|
2016-09-06 16:50:19 +08:00 |
xiaoyu
|
c6f875c517
|
temp commit
|
2016-09-06 16:40:44 +08:00 |
ibuler
|
07dd6d1192
|
Reslove conflict
|
2016-09-06 15:56:03 +08:00 |
ibuler
|
25d9dbe93c
|
Merge with cmdb
|
2016-09-06 15:09:00 +08:00 |
xiaoyu
|
8cc09f0e5a
|
move login and logout view back to CBV
|
2016-09-06 15:03:37 +08:00 |
ibuler
|
02b5483d81
|
Update add->create edit->update and assetgrou->asset-grou etc format
|
2016-09-06 14:38:19 +08:00 |
ibuler
|
3c6f50b788
|
Modify some bug
|
2016-09-05 23:42:10 +08:00 |
ibuler
|
2f5b7ad654
|
Modify asset model
|
2016-09-05 22:57:43 +08:00 |
xiaokong1937@gmail.com
|
6aedfb5219
|
fix small template erros
|
2016-09-05 22:20:50 +08:00 |
xiaokong1937@gmail.com
|
397da7d676
|
Merge branch 'master' of code.simcu.com:jumpserver/jumpserver
|
2016-09-05 21:38:37 +08:00 |
xiaokong1937@gmail.com
|
e75d33439a
|
fix captcha not valid bug of login view; use django's default login and logout view to enhance robustness
|
2016-09-05 21:38:21 +08:00 |
ibuler
|
7241f7509f
|
Update nav
|
2016-09-05 20:27:44 +08:00 |
ibuler
|
8827fd2d74
|
Modify translation
|
2016-09-05 20:17:45 +08:00 |
ibuler
|
508bda37f5
|
Modify form datetime valid error, because form format
|
2016-09-05 19:37:37 +08:00 |
ibuler
|
a0ef3cfc34
|
Update locale dir name to zh
|
2016-09-05 19:17:18 +08:00 |
ibuler
|
4855e86a3f
|
Add asset group view
|
2016-09-04 21:47:10 +08:00 |
ibuler
|
3972bd3ff3
|
Add asset traslation
|
2016-09-04 19:05:47 +08:00 |
wangyong
|
0e8e88fac0
|
add admin|sys user model
|
2016-09-04 17:50:30 +08:00 |
wangyong
|
426c3c4062
|
add asset amdin|sys user model
|
2016-09-04 17:43:03 +08:00 |
ibuler
|
8d0334e003
|
Add translation
|
2016-09-04 17:34:48 +08:00 |
ibuler
|
0ab015abfd
|
Asset add traslation
|
2016-09-04 17:15:26 +08:00 |
ibuler
|
7350e150c8
|
Merge branch 'master' into cmdb
|
2016-09-04 16:39:27 +08:00 |
ibuler
|
61f0205529
|
Modify users url to singular
|
2016-09-04 16:05:58 +08:00 |
ibuler
|
acd98365c1
|
Fix translation
|
2016-09-04 12:31:20 +08:00 |
ibuler
|
f274684473
|
Add translation for support i18n
|
2016-09-04 00:51:36 +08:00 |
wangyong
|
d96ac56460
|
merge master
|
2016-09-03 23:01:36 +08:00 |
wangyong
|
77f3a1f146
|
add asset add
|
2016-09-03 19:05:50 +08:00 |
ibuler
|
ba3f46fbd6
|
i18n
|
2016-09-03 19:02:18 +08:00 |
ibuler
|
0b406b6988
|
Add captch login using
|
2016-09-03 14:37:01 +08:00 |
ibuler
|
6f0cfd23c1
|
Rm logout.html
|
2016-09-03 00:39:52 +08:00 |
ibuler
|
10d51ada37
|
Update login error message
|
2016-09-03 00:39:06 +08:00 |
ibuler
|
90ca5a8bb7
|
start capcha support
|
2016-09-02 22:23:15 +08:00 |
ibuler
|
9803dd9547
|
Add ico, Modify forget_password
|
2016-09-02 18:10:26 +08:00 |
ibuler
|
3a9cf6c360
|
Add forget password and reset password
|
2016-09-01 23:09:58 +08:00 |
ibuler
|
8ff872f41d
|
Add ls config
|
2016-09-01 16:05:14 +08:00 |
ibuler
|
5940cec0e6
|
Add user and send mail
|
2016-09-01 01:12:02 +08:00 |
ibuler
|
5359da3ce2
|
Finish user login
|
2016-08-31 23:42:06 +08:00 |
ibuler
|
c9369db578
|
Add new login page
|
2016-08-31 20:39:25 +08:00 |
ibuler
|
b31f8d5867
|
Add user generate reset password token
|
2016-08-31 19:28:06 +08:00 |
ibuler
|
0d3bde1191
|
User add confirmed
|
2016-08-31 12:14:25 +08:00 |
ibuler
|
c143735393
|
Add ssh-key-gen function
|
2016-08-31 01:00:20 +08:00 |
ibuler
|
43af5383e3
|
Add model user method: get_token set_token
|
2016-08-30 20:30:47 +08:00 |
ibuler
|
ffed46175d
|
update .gitignore
|
2016-08-30 17:26:33 +08:00 |
ibuler
|
31a39be9ea
|
Resolve conflicts
|
2016-08-30 17:22:06 +08:00 |
ibuler
|
2022ca8e10
|
Add test code
|
2016-08-30 17:20:39 +08:00 |
ibuler
|
011c125564
|
Modify user active api And Add Token authorization
|
2016-08-30 00:10:27 +08:00 |
ibuler
|
1a9f90a08e
|
Modify api
|
2016-08-29 21:09:32 +08:00 |
ibuler
|
3eb4897bd3
|
Merge branch 'api' of code.simcu.com:jumpserver/jumpserver into api
|
2016-08-29 19:27:23 +08:00 |
ibuler
|
3c9dbaf860
|
Fix some bug
|
2016-08-28 23:58:22 +08:00 |
ibuler
|
d918d5b466
|
Add Logger setting .
|
2016-08-26 16:56:50 +08:00 |
ibuler
|
d95ffdfbf7
|
Test permmision
|
2016-08-26 00:51:05 +08:00 |
ibuler
|
bb76f6c652
|
Add api authentication
|
2016-08-25 19:29:59 +08:00 |
ibuler
|
641e998504
|
Update context name path1, path2 => app, action
|
2016-08-25 13:56:49 +08:00 |
ibuler
|
0a9e4a5e85
|
Modify urls.conf: Merge to single
|
2016-08-25 13:28:02 +08:00 |
ibuler
|
8aa92bb688
|
Add api: UserApi And UserGroupApi
|
2016-08-24 19:42:16 +08:00 |
ibuler
|
1d5faa3101
|
Delete Model: Role
|
2016-08-24 17:14:21 +08:00 |
ibuler
|
b97b34961c
|
Modify api: complete some setting
|
2016-08-24 12:29:19 +08:00 |
ibuler
|
a43ac90b21
|
Modify CRLF to LF
|
2016-08-24 00:13:58 +08:00 |
ibuler
|
6458231946
|
Add api file
|
2016-08-24 00:11:13 +08:00 |
ibuler
|
a99a6b6946
|
Split tests file in tests module
|
2016-08-23 22:19:39 +08:00 |
ibuler
|
c37dea2079
|
Add user add view Test Case
|
2016-08-23 19:36:15 +08:00 |
ibuler
|
1f3c0d004f
|
Change update batch, add _list_base.html
|
2016-08-23 17:14:08 +08:00 |
ibuler
|
3c3fda8064
|
Change chosen To select2 lib
|
2016-08-23 14:44:06 +08:00 |
ibuler
|
ae9bbb40fd
|
Add flash message template
|
2016-08-23 12:18:19 +08:00 |
ibuler
|
8e5e788bcd
|
Test case added
|
2016-08-23 00:39:07 +08:00 |
ibuler
|
f45690b34f
|
Add test case
|
2016-08-22 19:53:01 +08:00 |
ibuler
|
f0b0e41d33
|
Update user edit
|
2016-08-21 22:37:55 +08:00 |
wangyong
|
3771b2ff70
|
add asset detail and list
|
2016-08-21 22:12:17 +08:00 |
ibuler
|
8b0f31c43a
|
modify list, edit url error
|
2016-08-21 21:32:20 +08:00 |
ibuler
|
8ba7b078fd
|
Finish expaire date
|
2016-08-21 21:31:25 +08:00 |
ibuler
|
57f0b04387
|
Modify project statucure guide and init data
|
2016-08-21 20:59:39 +08:00 |
ibuler
|
85cf2169d4
|
Modify readme
|
2016-08-21 13:59:44 +08:00 |
ibuler
|
0427d406b9
|
Add init data file
|
2016-08-21 01:16:30 +08:00 |
ibuler
|
e355c7b8ef
|
Modify pagination and Role model
|
2016-08-20 18:33:18 +08:00 |
ibuler
|
6e46a17d98
|
Useradd group change
|
2016-08-20 00:42:50 +08:00 |
ibuler
|
e48f36397e
|
Modify url
|
2016-08-20 00:18:44 +08:00 |
ibuler
|
cf15b7eaff
|
Add UserGroup some View
|
2016-08-19 01:39:08 +08:00 |
ibuler
|
651e89994e
|
modify list and sort
|
2016-08-18 22:29:35 +08:00 |
ibuler
|
342298ad3e
|
reslove conflict
|
2016-08-18 14:43:10 +08:00 |
ibuler
|
a76191ffdc
|
Change view detail template
|
2016-08-18 10:20:37 +08:00 |
ibuler
|
279987925a
|
Modify user detail of usergroup
|
2016-08-18 00:47:34 +08:00 |
ibuler
|
824b1c7f6f
|
update user update view
|
2016-08-17 22:17:16 +08:00 |
ibuler
|
bcae7beae6
|
upload avatar
|
2016-08-17 00:36:54 +08:00 |
ibuler
|
9353022627
|
add context
|
2016-08-17 00:23:52 +08:00 |
ibuler
|
35abf16f7d
|
Modify panel color
|
2016-08-17 00:22:33 +08:00 |
ibuler
|
c14eb42186
|
reslove conflict add user detail template
|
2016-08-17 00:14:56 +08:00 |
ibuler
|
98d6043f2d
|
merged
|
2016-08-16 23:25:30 +08:00 |
ibuler
|
7a8d4a3a59
|
Add delete view
|
2016-08-16 22:13:06 +08:00 |
ibuler
|
3bf0d4aabb
|
Add common app
common app used as write public api or templatetags
modify user list view and user edit view
|
2016-08-16 00:09:48 +08:00 |
广宏伟
|
e3223f745a
|
app users
Modify user list view
Modify user add view
|
2016-08-15 21:10:30 +08:00 |
广宏伟
|
86ffcc973c
|
Add user template
|
2016-08-14 19:18:41 +08:00 |
ibuler
|
9493fb07cb
|
Add user list view
|
2016-08-14 17:21:04 +08:00 |
ibuler
|
9303415b89
|
modify some issues
|
2016-08-14 00:40:21 +08:00 |
ibuler
|
234684c875
|
Rename dir name dashboard to apps
It's may be well
|
2016-08-13 21:59:08 +08:00 |