Commit Graph

936 Commits (5a3c11f619ac1ad572601d8e58f66a71644042b2)

Author SHA1 Message Date
halcyon 55c5230eb2 hehe 2015-04-16 14:32:48 +08:00
halcyon da4d6b85fc bugs 2015-04-15 18:47:02 +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 99293cc019 bug 2015-04-14 20:09:11 +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 30fd160079 upload and resove 2015-04-09 13:55:16 +08:00
halcyon 3842f7795b hehe 2015-04-09 11:48:53 +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 2b14fefb5c ޸ҳ 2015-04-08 18:08:39 +08:00
guanghongwei 25ce24a17d Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver
Conflicts:
	jasset/views.py
	jumpserver/views.py
2015-04-08 17:39:00 +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 bb94cfc7a1 完善 2015-04-08 17:31:07 +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
halcyon 17be0bb39e dashboard and api 2015-04-05 17:52:46 +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
蓝枫 544bc10997 Update views.py
修改查看权限列表和添加权限列表不一致的bug
2015-03-31 21:07:50 +08:00
guanghongwei 2e5b22417d л 2015-03-30 21:31:02 +08:00
guanghongwei 38445a1dd2 Ұ 2015-03-27 18:37:10 +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