github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
5,484 Commits
95 Branches
262 Tags
144 MiB
Commit Graph

359 Commits (475c0e4187b51d7a9d8d0c4584d14204e7e02f99)

Author SHA1 Message Date
ibuler f4c86718dc [Update] Merge dev 2018-07-27 12:12:32 +08:00
ibuler 2ecfecb06f [Update] Merge with dev 2018-07-25 18:18:18 +08:00
BaiJiangJie ac238aa36e [Update] 修改用户登录失败限制次数，3->7 (#1586) 
* [Update] 修改用户登录失败限制次数，3->7

* [Update] 修改用户登录失败限制次数，3->7 - 续
 2018-07-25 04:51:09 -05:00
ibuler 2abb9efe96 [Update] Org功能修改 2018-07-25 17:21:13 +08:00
老广 36f1165d1b
Tmp org (#1583) 
* [Update] 修改一些内容

* [Update] 修改datatable 支持process

* [Bugfix] 修复asset queryset 没有valid方法的bug
 2018-07-25 02:05:28 -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
BaiJiangJie 83f220d7de [Feature] 添加命令记录下载功能 (#1559) 
* [Feature] 添加命令记录下载功能

* [Update] 文案修改，导出记录、提交，取消全部命令导出

* [Update] 命令导出，修复时间问题
 2018-07-19 05:36:52 -05:00
ibuler 28e47f33c1 [Update] 修改一些逻辑 2018-07-14 00:47:21 +08:00
ibuler 7412bdcba7 [Update] 完成基本框架 2018-07-13 15:05:46 +08:00
BaiJiangJie 512fc8f8f0 [Update] 优化登录失败次数限制的逻辑，并添加系统安全设置选项 2018-07-05 16:23:33 +08:00
BaiJiangJie c6a8967376 [Update] 删除多余代码 2018-06-07 12:52:40 +08:00
BaiJiangJie fcd17460d7 [Update] 增加密码校验规则中密码最小长度限制6位 2018-06-05 17:56:58 +08:00
BaiJiangJie 4c4430661b [Merge] Merge branch dev of github.com:jumpserver/jumpserver into github_dev 2018-06-05 17:31:55 +08:00
BaiJiangJie ee35ca3643 [Feature] 增加功能，安全设置（全局MFA设置，密码强度校验） 2018-06-05 17:26:31 +08:00
ibuler 482d1bb27f [Update] 修改permisstion util 2018-06-01 16:22:52 +08:00
ibuler 69e5ab438a [Bugfix] 解决发送邮件重启的问题 2018-05-29 18:58:56 +08:00
BaiJiangJie 486793ddcd [Bugfix] 修复取消LDAP认证不成功bug 2018-05-24 12:41:48 +08:00
ibuler 8e74a04282 [Update] 修改一些bug 2018-05-09 17:35:46 +08:00
ibuler 4ed9e11090 [Update] 修改用户名校验规则 2018-05-04 14:58:52 +08:00
老广 6f494ef09c
校验用户名长度和特殊字符 (#1271) 
* [Bugfix] 修复系统用户用户名校验问题

* [Update] 增加长度限制
 2018-04-27 11:27:16 +08:00
ibuler 763cf0d981 [Bugfix] 修复解密None的bug 2018-04-19 16:35:38 +08:00
ibuler 48e8785725 [Update] 修改users otp secret key 2018-04-18 12:46:25 +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 d0ede246e7 [Update] 修改授权 2018-04-08 00:16:37 +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
ibuler df80e8047a [Update] 修改日志 2018-04-01 23:45:37 +08:00
ibuler 7f4f67aa8d [Update] 支持网域 2018-03-23 19:46:46 +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 40d2934de0 [Bugfix] 修复首页无法显示数据的bug 2018-03-07 16:04:13 +08:00
ibuler d284c2175d [Update] 修改一些小问题 2018-03-02 15:39:01 +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
liuzheng 459d0668a8
feat: replay setting page and api 2018-02-26 16:19:29 +08:00
ibuler d047ff3b3a Merge branch 'dev' into tree 2018-02-06 13:02:30 +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 45f6a62989 [Update] 修改一处翻译 2018-02-01 12:37:45 +08:00
ibuler 21a7202587 [Bugfix] 修复ldap认证bug 2018-02-01 12:33:05 +08:00
ibuler b0fab2453a [Merge] 合并标签功能 2018-01-26 15:49:09 +08:00
ibuler 0a2b6494cc [Update] 修改签名md5算法 2018-01-25 16:38:40 +08:00
ibuler 7433327d75 [Feature] 标签管理功能 2018-01-23 19:37:22 +08:00
ibuler cafb0e02a3 [Update] 修改dictfiled 2018-01-22 17:21:03 +08:00
ibuler 0a931bbf77 [Feature] es support 2018-01-22 11:38:40 +08:00
ibuler 17181db8a5 [Feature] 支持es存储 2018-01-21 17:27:27 +08:00
ibuler b936d54a48 [Feature] 添加es支持 2018-01-20 22:22:09 +08:00
ibuler d08a1c3ddb [Update] 启用ldap移动位置 2018-01-17 17:22:04 +08:00
ibuler ba5ab21b37 For storage 2018-01-17 17:17:18 +08:00
ibuler cc18ad9a7f Merge branch 'paging' into dev 2018-01-15 17:41:57 +08:00
ibuler b2f97a263d [Feature] 添加后端paging 2018-01-15 17:41:49 +08:00
ibuler 89e013e2e2 [Bugfix] setting tables not found 2018-01-15 14:17:56 +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 7316661eb5 [Update] 启动加载common setting 2018-01-12 16:37:55 +08:00
ibuler d48f8dceb5 [Update] 修改翻译 2018-01-12 15:55:08 +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 72a82c41ee [Update] 修改 success message, 添加资产组时可以添加资产 2018-01-09 23:07:53 +08:00
ibuler c0829194dc [Update] 修改一些bug, 增加执行task的按钮 2018-01-08 19:16:28 +08:00
ibuler 4dbf332a56 [Bugfix] 修复刷新硬件的bug 2018-01-02 14:29:37 +08:00
ibuler 3b6403b2f2 [Update] 修改一些翻译 2018-01-01 15:08:33 +08:00
ibuler 0916757eb8 [Bugfix] 修复一些bug 2017-12-31 21:51:25 +08:00
ibuler e0a3fafbd5 [Bugfix] 详见trello 2017-12-30 02:29:29 +08:00
ibuler 0848893f1e [Bugfix] 修复时间日期搜索的bug，select2模块自适应长度 2017-12-27 01:29:23 +08:00
ibuler a39e0a1db9 [Docker] For docker update 2017-12-26 01:54:10 +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 30efec1b09 [Update] 修改 task 运行机制 2017-12-22 21:42:12 +08:00
ibuler 4893c4664d [Update] 修改task定时运行机制 2017-12-22 02:08:29 +08:00
ibuler 76df1de634 [Bugfix] 修复一些明显的bug 2017-12-21 11:31:13 +08:00
ibuler b4e1ac1953 [Bugfix] 修复资产模块中一些bug 2017-12-18 22:48:19 +08:00
ibuler 11fa3e08e9 [Bugfix] 修改ts_to_date bug 2017-12-15 17:08:22 +08:00
ibuler 2d0be8f996 [git status 2017-12-15 17:07:52 +08:00
ibuler b97d5b0960 [Feature] assets task 修改 2017-12-15 15:50:15 +08:00
ibuler 08e1788426 [Feature] 打算拆分下载和上传为独立模块，时间有限暂时放弃 2017-12-14 21:27:14 +08:00
ibuler 17ddb3bbbd [Feture] 使用信号解耦 2017-12-13 17:21:08 +08:00
ibuler 99b4c66b5e [Feature] 添加signals 解耦代码 2017-12-12 12:19:45 +08:00
ibuler 0c9e24dc59 [Feture] 添加ops 页面 2017-12-11 00:29:25 +08:00
ibuler 2b3551f1fc [Feature] 修改ansible和ops 2017-12-07 13:01:33 +08:00
ibuler a5f9735906 [Update] 更新index view 2017-12-04 20:15:47 +08:00
ibuler 9b6696bb6e [Feture] session detail页面，包含命令列表 2017-12-04 00:21:26 +08:00
ibuler 61a8d95f46 [Change] Rename applications -> terminal 2017-12-01 17:28:47 +08:00
ibuler 7f9ce57318 修改 terminal上报接口和api 2017-11-14 09:44:16 +08:00
ibuler 034f0a02b1 Update terminal api 2017-10-31 11:34:20 +08:00
ibuler 477d23ea37 fix some bug 2017-07-20 07:55:24 +08:00
Fengxu Lin 26a169d938 fix bug in pagination_range function (#511) 
start and end may be float when current_num >= 3 and display % 2 == 1
 2017-07-10 10:39:18 +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
bdlzhx b680a42425 change sign_t return from bytes to str. (#480) 2017-06-06 11:22:29 +08:00
crisewng 18169251fa [Bugfix] 修复管理用户上传私钥兼容问题 (#451) 2017-05-25 11:14:21 +08:00
ibuler 1719eee264 [Bugfix] 修复py3 bytes bug 2017-05-24 20:12:50 +08:00
ibuler 31025b8c52 [bugfix] 修复重置密码bug 2017-05-22 19:51:54 +08:00
GuangHongwei 458989328e [Bugfix] 修改bug，使用py3编程 2017-05-15 23:39:54 +08:00
ibuler a320b9e05e [Bugfix] 兼容py3 2017-04-07 19:11:27 +08:00
ibuler 92ebe85a3f [Fixture] 详情页添加system user 推送 2017-04-05 19:09:51 +08:00
ibuler 067426d5e0 [Fixture] 完成用户向导页 2017-03-31 23:46:00 +08:00
ibuler b60e5a7ee3 [Change] 修改一些view 2017-03-24 00:27:33 +08:00
ibuler a4504dc0c7 [Change] 拆分tasks 2017-03-16 00:43:43 +08:00
ibuler 0fbd9843bd [Change] 修改runner, inventory位置 2017-03-16 00:19:47 +08:00
ibuler a822f667af [Fixture] 完成用户推送task 2017-03-09 14:55:33 +08:00
ibuler 7825c107ab [Bugfix] model FieldError 2017-03-01 15:30:19 +08:00
ibuler a79c3dd156 [Fixture] 添加command log backends, 未来支持es 2017-02-06 23:13:27 +08:00
ibuler 25cb47d2f5 [Change] 拆分user view为多个view 2017-01-17 16:34:47 +08:00
ibuler 2707012325 Finish access key auth 2016-12-25 13:15:28 +08:00
ibuler c5ab49c515 Finish access key auth 2016-12-25 13:15:19 +08:00
ibuler 6e843533cb Base finish user 2016-11-25 11:00:51 +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 db8b0022fc Update usergroup detail 2016-11-15 19:33:04 +08:00
ibuler 419876b575 Update heatbeat 2016-11-13 22:34:38 +08:00
ibuler 2635217421 Update celery 2016-11-11 09:48:47 +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 a75e1db970 Add form validate 2016-11-07 00:39:26 +08:00
ibuler 968b1b4cb6 Stash 2016-11-06 21:29:04 +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 5d3f9b4a03 Add command list 2016-10-26 19:10:14 +08:00
ibuler 17ade287ab Add proxy log api 2016-10-18 19:28:36 +08:00
ibuler a62a2178d0 Add user backend 2016-10-15 00:49:59 +08:00
ibuler f038423ce2 Add isdangerous 2016-10-14 20:18:34 +08:00
江世峰 73f5891f87 asset:update assets_list by tag 2016-10-12 18:57:51 +08:00
ibuler 45df58114c Merge branch 'connect' 2016-10-02 21:45:44 +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
ibuler acf51238d0 Modify ssh server bug for using public key 2016-09-29 18:01:26 +08:00
ibuler ce5950ca73 Merge with asset 2016-09-20 00:43:30 +08:00
xiaoyu f00da20764 user-group delete implement 2016-09-19 15:47:58 +08:00
ibuler d323c9df88 Modify asset create 2016-09-19 00:07:52 +08:00
ibuler 7d3474aeea Add user permission user list 2016-09-17 15:20:33 +08:00
ibuler 037d9323a4 Modify and code review 2016-09-15 11:19:36 +08:00
ibuler a4dc27f073 Finish permissin detail asset list and user list 2016-09-14 23:29:39 +08:00
ibuler 5bca783e12 permission user search 2016-09-14 01:08:26 +08:00
ibuler 627a5825f4 Add user perm 2016-09-10 21:08:10 +08:00
ibuler 6f4a832389 Add admin user list view 2016-09-08 00:40:59 +08:00
ibuler 7350e150c8 Merge branch 'master' into cmdb 2016-09-04 16:39:27 +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 10d51ada37 Update login error message 2016-09-03 00:39:06 +08:00
ibuler 3a9cf6c360 Add forget password and reset password 2016-09-01 23:09:58 +08:00
ibuler 5940cec0e6 Add user and send mail 2016-09-01 01:12:02 +08:00
ibuler b31f8d5867 Add user generate reset password token 2016-08-31 19:28:06 +08:00
ibuler 5350f83275 Add celery usage more 2016-08-31 16:48:12 +08:00
广宏伟 dd80b94b43 Update README.md 2016-08-31 16:43:44 +08:00
广宏伟 4cbadbd941 Update README.rst 2016-08-31 16:43:18 +08:00
广宏伟 e61341df79 Update README.md to README.rst 2016-08-31 16:33:05 +08:00
ibuler f7ab26a5da Add celery broker 2016-08-31 15:54:04 +08:00
ibuler ffed46175d update .gitignore 2016-08-30 17:26:33 +08:00
yumaojun03 363ddb70e2 add celery support (not use django-celery) 2016-08-25 19:52:03 +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 98d6043f2d merged 2016-08-16 23:25:30 +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