github
/
jumpserver
mirror of https://github.com/jumpserver/jumpserver
1
0
Fork 0
Code Issues Releases Wiki Activity
1,396 Commits
67 Branches
248 Tags
110 MiB
Commit Graph

186 Commits (16f5906979a15bfc7f72c8dc827369c05c014944)

Author SHA1 Message Date
guanghongwei aa7e8c0ed4 ޸tag perm_total -> perm_count 2015-01-24 14:49:38 +08:00
guanghongwei 96738976fb ޸jpermistion --> jperm 2015-01-24 14:46:35 +08:00
guanghongwei 1ea63bf3d0 ޸Ȩweb 2015-01-24 14:36:58 +08:00
ibuler cc72d59965 修改bug 2015-01-22 22:26:13 +08:00
ibuler 59d034ce6e 添加查看权限用户 2015-01-21 23:22:21 +08:00
root 244d0d2ba4 Merge branch 'wangyong' of gitcafe.com:ibuler/jumpserver into guanghongwei 
Conflicts:
	jumpserver/templatetags/mytags.py
	juser/views.py
 2015-01-21 23:05:42 +08:00
ibuler c569afb5da 修改bug 2015-01-21 22:23:57 +08:00
ibuler b01964618d 获得role tag 2015-01-21 22:23:05 +08:00
halcyon 7863a6853c 资产管理页面基本完成，尚有部分小bug 2015-01-19 10:09:16 +08:00
ibuler 46720dcf0f 修改bug 2015-01-14 23:58:25 +08:00
ibuler f592e46442 添加用户列表 2015-01-14 23:51:30 +08:00
ibuler 9304a911ea 添加自定义tag 2015-01-10 23:31:32 +08:00
guanghongwei 8c9e763f74 Ĭֵ 2015-01-10 16:24:44 +08:00
guanghongwei 97dcb4ca91 Locals 2015-01-10 15:54:09 +08:00
halcyon 0ed0853489 完善资产添加和查看资产页面 2015-01-07 18:35:09 +08:00
ibuler 296302a236 添加/base/ 2015-01-05 22:37:03 +08:00
ibuler f497003948 修改content 2015-01-05 22:35:25 +08:00
ibuler 02ef9c687c Merge remote-tracking branch 'origin/master' 
Conflicts:
	jumpserver/urls.py
	templates/nav.html
 2015-01-05 21:25:14 +08:00
ibuler a184ae9888 添加测试 useradd 2015-01-05 21:20:09 +08:00
halcyon 7a86ba0b51 资产管理页面开始，增加添加资产页面，修改base页面等 2015-01-05 18:21:34 +08:00
ibuler 8682d7c6ec 基于文平修改 2015-01-03 22:42:46 +08:00
ibuler dde0b75d17 使用 陈文平的html 2015-01-03 22:24:34 +08:00
ibuler 6d32e6a1a7 添加Demo皮肤设置 2015-01-02 17:43:28 +08:00
ibuler 542873159b 添加Demo皮肤设置 2015-01-02 17:40:34 +08:00
ibuler 19a9e5aa2c 添加Demo皮肤设置 2015-01-02 17:26:11 +08:00
ibuler 9c1e313472 添加Demo皮肤设置 2015-01-02 17:24:56 +08:00
ibuler 8f95f11f35 添加Demo皮肤设置 2015-01-02 17:14:57 +08:00
ibuler 7bfad09c49 修改bug 2014-12-28 21:49:35 +08:00
ibuler 2860f4a343 添加测试页面 2014-12-28 21:48:26 +08:00
ibuler bcf3281a10 添加log models 
添加 docs目录
 2014-12-26 22:54:37 +08:00
ibuler d7b2631410 修改名称 2014-12-24 22:21:46 +08:00
ibuler e66b1b4192 修改bug 2014-12-24 22:20:38 +08:00
ibuler 0e76d52322 修改bug 2014-12-22 23:44:48 +08:00
ibuler ef0c9fdd16 添加model 2014-12-22 23:14:29 +08:00
guanghongwei 99f95af74e modified settings.py set option 2014-12-22 18:34:08 +08:00
root 0b2a77fce4 Init project add LICENSE file 2014-12-21 22:13:04 +08:00