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

2899 Commits (d247e49b709d2f8027ecae300495a7ae4e3d2836)

Author SHA1 Message Date
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
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 17181db8a5 [Feature] 支持es存储 2018-01-21 17:27:27 +08:00
ibuler 41f1c3f7f7 [Feature] terminal config load 2018-01-21 15:12:59 +08:00
liuzheng712 c4406c2a33
Merge branch 'master' of github.com:jumpserver/jumpserver into dev 2018-01-21 11:33:44 +08:00
ibuler 7f18821990 [Update] remote default PAGE_SIZE stting 2018-01-20 23:02:17 +08:00
ibuler 8fe3caf2ea [Update] 修改install.md 2018-01-20 22:54:15 +08:00
ibuler 15119bec3c Merge remote-tracking branch 'github/dev' into dev 2018-01-20 22:26:41 +08:00
ibuler 57e508f331 [update] 修改用户创建时 姓名和用户名的位置 2018-01-20 22:26:21 +08:00
ibuler b936d54a48 [Feature] 添加es支持 2018-01-20 22:22:09 +08:00
老广 5c8dd5676c
Merge to master (#944) 
* [Update] 修改 success message, 添加资产组时可以添加资产

* [Update] system user form add label

* [Update] set default cluster

* [Update] 修改一些翻译

* [Bugfix] 修复重置密码bug

* [Bugfix] 默认default cluster

* [Bugfix] 用户添加报错

* 修改tab样式

* [Bugfix] 修复了一些显示上的bug

* 修复全选按钮在搜索后仍然选择全部的问题

* [Bugfix] 修复以下bug
1. 查看执行历史异常
2. 用户授权资产页显示message

* [Update] api 返回platform, 并增加web terminal nav

* [Feature] 添加setting页面

* [Feature] 添加basic settings

* [Update] 修改翻译

* [Update] 修改config

* [Update] 启动加载common setting

* [Bugfix] 修复cluster创建的bug

* [Bugfix] 修复title显示Jumpserver

* [Bugfix] setting tables not found

* [Bugfix] settings add option

* [Feature] 添加后端paging

* [Bugfix] 资产列表选择别的页会报错

* [Update] check all 只选择当前页面

* [Bugfix] user login ip

* [Bugfix] for login ip

* [Bugfix] 修复资产列表显示bug

* [Remove] labels

* [Bugfix] task运行失败，因为tasks没有设置

* [Bugfix] 读取不到prefix

* [Change] 修改部分翻译

* [Update] 启用ldap移动位置

* [Update] 修改翻译

* Update README.md
 2018-01-20 21:01:55 +08:00
老广 689558b8c7
Update README.md 2018-01-18 18:12:39 +08:00
ibuler 67001dd99f [Feature] 支持es存储命令 2018-01-18 09:56:13 +08:00
ibuler 3c3e9a4113 [Update] 修改翻译 2018-01-17 17:26:25 +08:00
ibuler d08a1c3ddb [Update] 启用ldap移动位置 2018-01-17 17:22:04 +08:00
ibuler a77acb7dfb [Change] 修改部分翻译 2018-01-17 17:18:13 +08:00
ibuler ba5ab21b37 For storage 2018-01-17 17:17:18 +08:00
ibuler ce9ff67b24 [Bugfix] 读取不到prefix 2018-01-17 16:18:33 +08:00
ibuler 5bbad01909 [Feature] 增加标签 2018-01-16 16:32:06 +08:00
ibuler 01895bafc0 [Bugfix] task运行失败，因为tasks没有设置 2018-01-16 11:40:18 +08:00
ibuler f1ec53d1bc [Remove] labels 2018-01-16 11:26:30 +08:00
ibuler d3109a03b2 [Bugfix] 修复资产列表显示bug 2018-01-16 11:20:26 +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 dad21cadb3 [Update] check all 只选择当前页面 2018-01-15 18:32:07 +08:00
ibuler 7e2d627d3f [Bugfix] 资产列表选择别的页会报错 2018-01-15 18:14:58 +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 8b9e45ad31 [Bugfix] settings add option 2018-01-15 16:00:26 +08:00
ibuler 89e013e2e2 [Bugfix] setting tables not found 2018-01-15 14:17:56 +08:00