Commit Graph

481 Commits (9233fef63fae38da0d126c4a5f1148ff670c8bee)

Author SHA1 Message Date
ibuler@qq.com ebe8ce7109 some 2015-11-02 11:18:06 +08:00
halcyon 46b1aca5f1 model 2015-10-31 09:23:10 +08:00
ibuler@qq.com 0e24ebdb26 merge with dev 2015-10-29 11:11:05 +08:00
广宏伟 d5bd2143e2 命令搜素完成 2015-10-28 22:32:16 +08:00
liuzheng712 ac5ac5e06b change role finished , but need more think 2015-10-28 21:03:54 +08:00
ibuler@qq.com 53e4dc7acb search detail 2015-10-28 19:24:02 +08:00
liuzheng712 ca271900e6 remove request.session user_id and role_id, about role_id need more think, now is dirty 2015-10-27 23:57:37 +08:00
ibuler@qq.com 76ad67307b search ok 2015-10-27 23:18:26 +08:00
ibuler@qq.com ffab7ae697 some 2015-10-27 20:25:18 +08:00
liuzheng712 8e9f22537f reuse asset_list for host_list 2015-10-27 17:40:53 +08:00
广宏伟 9366003f7b jlog 2015-10-26 22:17:16 +08:00
ibuler@qq.com 72a18d6abf use map 2015-10-24 23:52:06 +08:00
ibuler@qq.com 79e81340dc modify log 2015-10-21 22:39:53 +08:00
ibuler@qq.com 50d2bfb272 someday 2015-10-12 09:58:38 +08:00
ibuler@qq.com 06eedff49f fix common 2015-10-07 20:14:07 +08:00
ibuler@qq.com afbbad1604 授权管理 2015-10-07 17:16:20 +08:00
ibuler@qq.com e99b33c51e 修改使用新表结构 2015-10-06 23:47:53 +08:00
Administrator 43fe985143 添加组授权 2015-10-06 18:51:49 +08:00
Administrator 699046dad5 修改settings 2015-10-05 23:48:03 +08:00
guanghongwei 9f7b066ca6 shouquanxiugai 2015-10-04 21:50:29 +08:00
liuzheng712 79c79432f5 usermodle 2015-09-15 23:38:06 +08:00
ibuler d32ea9f9a1 授权管理 2015-09-11 00:04:07 +08:00
ibuler 907c2c7e97 资产修改基本完成 2015-09-10 22:51:42 +08:00
ibuler 8bf9103fcf 修改资产管理 2015-09-09 00:19:17 +08:00
ibuler 4eb78e151e 用户模块修改告一段落 2015-09-06 21:37:22 +08:00
ibuler 3efd810fe1 修改修改用户bug 2015-09-02 21:42:31 +08:00
ibuler c21cdc2131 添加忘记密码 2015-08-31 23:04:53 +08:00
ibuler 44c69ded78 干掉ldap前 2015-08-30 14:03:10 +08:00
root 1e170714c0 修改用户添加视图 2015-08-29 00:09:36 +08:00
ibuler 10d96a9767 修改用户组视图 2015-08-28 00:33:54 +08:00
ibuler 33c624c76f 删除部门后 2015-08-27 00:08:20 +08:00
ibuler 913f93b91f 删除部门前 2015-08-26 23:31:32 +08:00
ibuler 1662269153 websocket auth add 2015-05-28 17:00:03 +08:00
ibuler ce99bf2266 placeholder 2015-05-25 18:35:32 +08:00
ibuler 1952d1ca23 modify sudo show 2015-05-25 18:27:57 +08:00
ibuler 6d34bd45d2 modify nav_bar_header.html 2015-04-24 20:42:15 +08:00
ibuler 992947ac99 modify service.sh bug 2015-04-24 20:39:44 +08:00
ibuler ba55cdde87 modify service.sh bug 2015-04-24 19:12:14 +08:00
ibuler 0beb683c40 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-04-23 11:23:05 +08:00
root b134c90bfd 解决阻断报错问题 2015-04-23 11:20:12 +08:00
ibuler 311b65da00 ޸bug 2015-04-22 18:57:55 +08:00
ibuler e2ac212fc3 resolve confilict 2015-04-20 20:56:26 +08:00
ibuler 09d3763a02 fix a bug 2015-04-20 20:54:10 +08:00
ibuler 0a8198b2ca ޸Ƴbug 2015-04-20 15:57:10 +08:00
ibuler d84ff97019 ޸Ƴbug 2015-04-20 15:56:49 +08:00
ibuler 412dadce76 version 2.0.0 beta 2015-04-20 10:12:11 +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
guanghongwei 2e5b22417d л 2015-03-30 21:31:02 +08:00
guanghongwei 340aaf42de ˢ 2015-03-27 16:34:00 +08:00
halcyon 359f70b9f9 apply 2015-03-26 18:42:52 +08:00
halcyon 408e4a54d8 bugs 2015-03-25 19:02:14 +08:00
guanghongwei 59414dadfc ˢsudosudoûȨ 2015-03-25 18:45:55 +08:00
halcyon e3b2be0261 bugs 2015-03-24 18:34:00 +08:00
halcyon 6816f941d9 Merge branch 'guanghongwei' into wangyong 2015-03-24 17:05:17 +08:00
halcyon 1dddd98741 bug 2015-03-24 17:04:25 +08:00
guanghongwei 0c31968e3c 2015-03-23 22:57:19 +08:00
guanghongwei 2f7e7b0072 ޸nav.html 2015-03-21 15:08:16 +08:00
guanghongwei d8a6eba2f3 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
	connect.py
	jumpserver.conf
	jumpserver/api.py
2015-03-21 13:10:38 +08:00
halcyon df2c2fc7d5 zhoumo 2015-03-21 12:58:29 +08:00
guanghongwei e717fad762 ȵ 2015-03-19 23:57:08 +08:00
halcyon fef224459c 鉴权 2015-03-19 18:32:10 +08:00
halcyon 9348a0deb7 鉴权 2015-03-18 18:05:46 +08:00
halcyon 92ccd3dc78 jlog 2015-03-17 16:25:32 +08:00
halcyon 9e1dd270ae bugs 2015-03-17 13:56:43 +08:00
guanghongwei 386d6a1cb2 2015-03-16 22:38:42 +08:00
guanghongwei a2ede31ae6 Ȩʼ 2015-03-15 23:23:20 +08:00
guanghongwei f3ae7f00a0 ʱ 2015-03-14 23:57:53 +08:00
guanghongwei 56df1f6963 merge 2015-03-14 17:57:26 +08:00
halcyon 78dc6e5154 bugs 2015-03-14 17:54:27 +08:00
guanghongwei 026836ebc5 2015-03-14 17:54:17 +08:00
guanghongwei d926cbdef2 merge with wangyong 2015-03-14 13:20:53 +08:00
guanghongwei d1f19a5cad ޸IJʾ 2015-03-14 13:15:33 +08:00
halcyon ce6494ba64 bugs 2015-03-14 13:13:46 +08:00
guanghongwei b2c72221f7 2015-03-13 23:46:38 +08:00
guanghongwei a7800b9a7a Ȩ޹ 2015-03-13 00:09:18 +08:00
halcyon 691271c74f bugs 2015-03-12 18:54:26 +08:00
guanghongwei 475501595e ҳ 2015-03-12 18:43:17 +08:00
halcyon fd490bd685 bugs 2015-03-12 11:03:53 +08:00
guanghongwei 546393d9c3 Ȩ޸ 2015-03-11 23:46:35 +08:00
guanghongwei 80d4272ee5 Merge remote-tracking branch 'origin/guanghongwei' into guanghongwei
Conflicts:
	jperm/models.py
2015-03-11 18:00:55 +08:00
guanghongwei ae0c28ef8f 2015-03-11 17:59:15 +08:00
guanghongwei 5c54128f8d ޸ĺܶ, 2015-03-11 10:18:20 +08:00
halcyon 10bcae7cf0 dashboard 2015-03-10 18:27:47 +08:00
guanghongwei d72d55c965 没怎么修改 2015-03-08 22:48:50 +08:00
guanghongwei 6c10b06d5a Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-03-07 18:38:29 +08:00
halcyon 95bb96ebbf 各种bug修改 2015-03-07 18:37:23 +08:00
guanghongwei 8f163eb634 统一分页 2015-03-07 18:25:31 +08:00
guanghongwei de358099cf Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver 2015-03-07 18:07:04 +08:00
guanghongwei cbf8dac5cc 修改显示分页 2015-03-07 18:06:50 +08:00
halcyon e81eefcf62 修改各种bug 2015-03-07 18:06:26 +08:00
guanghongwei c0eec734a1 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 2015-03-07 17:51:08 +08:00
halcyon 6c9c560b86 修改各种bug 2015-03-07 17:50:17 +08:00
guanghongwei c9928fc1f9 Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver
Conflicts:
	docs/AddUserAsset.py
2015-03-07 17:39:10 +08:00
halcyon 5bf66ca92e 修改各种bug 2015-03-07 17:37:40 +08:00
guanghongwei 9a638bc856 修改一些bug 2015-03-07 17:37:26 +08:00
guanghongwei 67f9aad1b9 Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
	docs/AddUserAsset.py
2015-03-07 15:33:06 +08:00
halcyon 60729c49df bug 2015-03-07 15:29:49 +08:00
guanghongwei ac92498832 修改 权限修改为 submit 2015-03-07 15:28:49 +08:00
guanghongwei a94c050fd9 完工,睡觉 2015-03-07 00:12:38 +08:00
guanghongwei 07b0e2980e 今天到此为止 2015-03-06 00:24:17 +08:00
halcyon d0600662ba dashboard and bugs 2015-03-05 18:46:12 +08:00
guanghongwei 8bc40dbea1 基本完成用户管理 2015-03-05 00:20:24 +08:00
root e086a03692 bug 2015-03-04 23:14:07 +08:00
halcyon bbe5b588c0 修改bug 2015-03-04 18:33:38 +08:00
guanghongwei d32026013f ޸ĺܶ 2015-03-04 18:20:03 +08:00
guanghongwei 50fcac67c3 修改 删除等 2015-03-03 22:44:00 +08:00
guanghongwei fc007e96d7 ޸ĺܶ 2015-03-03 18:42:06 +08:00
guanghongwei ad2a4d2d5d 修改 用户添加 和 组添加 2015-03-02 23:32:34 +08:00
guanghongwei d90b59191f ع1 2015-03-02 18:27:48 +08:00
guanghongwei 458ca42f22 未完成 2015-03-01 23:34:00 +08:00
guanghongwei a50d3ba692 头像大小导致 nav颜色中间差 2015-03-01 22:46:19 +08:00
guanghongwei fb1c17dc51 修改bug 2015-03-01 15:01:15 +08:00
guanghongwei 32ab6311ae 合并分支 2015-03-01 12:23:26 +08:00
halcyon 3c70512d8e dashboard 2015-03-01 12:09:33 +08:00
guanghongwei 1c96443e73 修改头像 2015-02-28 23:22:52 +08:00
guanghongwei 9bab7bf1e7 Merge branch 'guanghongwei' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
	jperm/views.py
	jumpserver/views.py
2015-02-28 21:26:23 +08:00
root cf8af114fe dashboard 2015-02-27 23:18:40 +08:00
guanghongwei f0cd064195 修改 用户左侧显示 2015-02-27 22:14:09 +08:00
halcyon 9d44bc1593 dashboard con 2015-02-27 18:48:24 +08:00
root 67c1f12086 dashboard 2015-02-26 18:02:39 +08:00
guanghongwei 56f8f5d09b ޸ķҳ 2015-02-15 10:06:02 +08:00
guanghongwei b7acef8cb0 授权收尾工作 2015-02-13 00:00:07 +08:00
root a746cab21c bug 2015-02-12 23:17:07 +08:00
halcyon b1e6699330 每日一更? 2015-02-12 18:54:40 +08:00
guanghongwei 4190b19450 修改授权详情 2015-02-11 23:32:24 +08:00
guanghongwei f050866d94 Ȩ 2015-02-11 18:38:56 +08:00
halcyon db86daf86d dashboard等 2015-02-11 17:53:17 +08:00
guanghongwei 97038aab37 sudoȨ 2015-02-10 21:52:59 +08:00
halcyon a42d053cbb 新弹窗等 2015-02-10 18:57:43 +08:00
guanghongwei 50208c0088 sudoȨ 2015-02-10 18:53:01 +08:00
guanghongwei 8a5e494cfe 添加sudo权限删除,修改和详情 2015-02-10 00:21:08 +08:00
halcyon 5f2e2a808e 添加搜索功能 2015-02-09 19:03:18 +08:00
halcyon c84f124511 bug 2015-02-09 19:02:25 +08:00
guanghongwei d7de3edcf4 sudo޸Ȩ 2015-02-09 18:50:21 +08:00
guanghongwei b9e2c9aa95 修改sudo授权 2015-02-09 08:40:54 +08:00
guanghongwei 75979e3999 修改sudo授权 2015-02-07 00:07:07 +08:00
halcyon 433974d77d 改bug 2015-02-05 18:53:57 +08:00
guanghongwei 121b76284a Merge branches 'guanghongwei' and 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei
Conflicts:
	static/js/base.js
	templates/head_script.html
2015-02-03 23:15:22 +08:00
guanghongwei 46cc593a9e Ȩ֧ 2015-02-03 23:03:51 +08:00
halcyon de58e92df9 添加组修改,组内删除主机并不删除真实机 2015-02-03 22:45:51 +08:00
guanghongwei 70fe42f359 ޸scriptλ 2015-02-01 23:33:38 +08:00
guanghongwei 3d1df73a99 merge with wangyong 2015-02-01 23:12:57 +08:00
guanghongwei 0336bfa906 group_addʹajax 2015-02-01 23:03:28 +08:00
halcyon 6c70d5bf03 批量添加删除功能实现,修改资产添加修改等 2015-02-01 23:00:23 +08:00
guanghongwei 7adbf52aeb ޸jsλ 2015-01-31 13:45:58 +08:00
root 2a645747de Merge in 20150131 2015-01-31 13:03:58 +08:00
halcyon a8991bfb14 资产修改功能强化,日志功能添加 2015-01-31 12:55:10 +08:00
guanghongwei c1fb72f393 ޸ĵ½˳ 2015-01-30 23:30:16 +08:00
guanghongwei 35d9be5c10 connect.py޸ 2015-01-30 16:53:06 +08:00
guanghongwei c1686d52e9 Ȩ༭Ͳ鿴޸ 2015-01-30 16:39:34 +08:00
guanghongwei c09d1d25b2 Ȩ༭޸ok 2015-01-30 14:54:45 +08:00
guanghongwei d25a3ce17c û޸ 2015-01-30 11:18:30 +08:00
guanghongwei b4006d3d36 perm edit޸ 2015-01-29 00:53:15 +08:00