github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
452 Commits
77 Branches
251 Tags
127 MiB
Commit Graph

287 Commits (a203b89ad469e13797004e67248937571bbd70d0)

Author SHA1 Message Date
ibuler 0a8198b2ca 修改移除bug 2015-04-20 15:57:10 +08:00
ibuler d84ff97019 修改移除bug 2015-04-20 15:56:49 +08:00
ibuler 8b50e5252f merge with wangyong 2015-04-19 18:45:07 +08:00
halcyon 86e334e4fa last bug? 2015-04-19 18:36:41 +08:00
ibuler d5fba23d73 添加授权详情页，并添加用户详情页链接到授权列表 2015-04-19 00:23:35 +08:00
ibuler e96053ba20 简单修改 2015-04-18 19:15:53 +08:00
ibuler 6d6e9d97b5 修改 2015-04-18 18:04:01 +08:00
ibuler 9ab855fd92 merge 2015-04-18 17:00:03 +08:00
ibuler c1d8de4558 合并简单 2015-04-18 16:58:16 +08:00
halcyon f19b274fcc bug 2015-04-18 16:58:15 +08:00
ibuler 0873211d13 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-04-18 14:02:57 +08:00
ibuler bcc5774365 添加成功页面 2015-04-18 13:52:28 +08:00
halcyon 84929840d0 bug 2015-04-18 13:51:47 +08:00
ibuler d6171f7fe7 merge 2015-04-18 12:37:55 +08:00
halcyon 75e1ea7f7d bug 2015-04-18 12:30:45 +08:00
ibuler 4f1b4f1947 修改bug 2015-04-17 22:22:21 +08:00
halcyon a269c43d1c 浼樺寲 2015-04-16 19:03:02 +08:00
halcyon 29d196410e Merge branch 'master' into wangyong 2015-04-16 14:34:49 +08:00
ibuler e2e131146d Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-16 14:33:55 +08:00
ibuler 60cb5561f0 修改move 2015-04-16 14:32:51 +08:00
halcyon 55c5230eb2 hehe 2015-04-16 14:32:48 +08:00
guanghongwei c08cee8052 添加用户后发送密码 2015-04-15 17:32:30 +08:00
guanghongwei 3424bef5d0 修改bug 2015-04-15 12:07:59 +08:00
halcyon e72e30bc4e bug 2015-04-14 21:06:19 +08:00
halcyon 3bfe0e3c16 bugs 2015-04-14 17:25:56 +08:00
halcyon 4abf25ef13 hehe 2015-04-13 21:25:43 +08:00
halcyon e385f3e09d Merge branch 'master' into wangyong 2015-04-11 19:57:20 +08:00
halcyon a4bd352486 idc 2015-04-11 19:56:53 +08:00
guanghongwei 6a565d0a45 reslove 2015-04-11 17:49:41 +08:00
root 2e254af935 hehe 2015-04-11 17:45:49 +08:00
guanghongwei 12df8cf060 简单修改 2015-04-11 17:45:33 +08:00
guanghongwei 3c1af0e266 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-11 12:53:22 +08:00
guanghongwei 3b00cfa97d 修改该bug 2015-04-11 12:52:17 +08:00
halcyon 9cfe6c569d hehe 2015-04-11 12:52:00 +08:00
guanghongwei 78f00e5c5f 上传文件 2015-04-09 23:49:21 +08:00
guanghongwei 419ee2660a Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	jumpserver/urls.py
	jumpserver/views.py
 2015-04-09 11:32:32 +08:00
guanghongwei ff77cc28fa 添加上传 2015-04-09 11:27:36 +08:00
halcyon d28d72c42d bugs 2015-04-09 11:09:18 +08:00
guanghongwei b840db12a6 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 
Conflicts:
	jasset/views.py
	jumpserver/views.py
 2015-04-08 17:38:30 +08:00
guanghongwei 2035a49c40 修改密钥密码后重新生成key, 普通用户首页 2015-04-08 17:32:56 +08:00
halcyon ef63fce7c4 淇敼bug锛屽疄鏃舵悳绱㈠畬鎴 2015-04-07 19:15:45 +08:00
guanghongwei bd0fd90e2d 用户详情和普通用户 2015-04-06 23:04:31 +08:00
halcyon 7de943c6e4 绠＄悊鍛樹华琛ㄧ洏鍩烘湰瀹屾垚 2015-04-05 22:52:37 +08:00
guanghongwei 7e53228359 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-04-04 12:48:56 +08:00
guanghongwei afcc784797 修改用户详情 2015-04-04 12:48:26 +08:00
halcyon 6e976b0583 0406 2015-04-04 12:47:07 +08:00
guanghongwei 8f66de365e merge with wangyong 2015-04-02 20:40:54 +08:00
halcyon b35f1e6174 鏉冮檺鐢宠 2015-04-02 18:32:43 +08:00
guanghongwei a998de5973 修改用户详情 2015-04-01 22:54:10 +08:00
halcyon e1b9134d7f 0402 2015-04-01 18:58:10 +08:00