Commit Graph

36 Commits (9dc7e953c9b9d5e92a308265d1be484ff2839bff)

Author SHA1 Message Date
ibuler 984a04972f 修改错误 2015-01-22 22:14:21 +08:00
ibuler cc425116a1 修改页面展示 2015-01-22 22:12:41 +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
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 2200783de7 添加用户列表 2015-01-14 23:30:20 +08:00
ibuler 8a1e5376f7 修改添加用户bug 2015-01-14 23:08:29 +08:00
halcyon 1925cf4033 增加js判断 2015-01-14 19:19:56 +08:00
ibuler 7435d602dd 修改添加用户bug 2015-01-13 23:15:40 +08:00
ibuler 2b6c2cd6fc 修改bug 2015-01-13 22:57:27 +08:00
ibuler 84a48d3aec 修改bug 2015-01-13 22:44:58 +08:00
ibuler 14da0f18ab 添加用户完成 2015-01-13 22:14:50 +08:00
ibuler bc5b32bcea 添加useradd的函数 2015-01-12 23:52:41 +08:00
ibuler 9304a911ea 添加自定义tag 2015-01-10 23:31:32 +08:00
guanghongwei fbde8d42fe ޸bug 2015-01-10 16:48:34 +08:00
guanghongwei 8c9e763f74 Ĭֵ 2015-01-10 16:24:44 +08:00
guanghongwei 97dcb4ca91 Locals 2015-01-10 15:54:09 +08:00
guanghongwei 95fb1bfd1c ޸bug 2015-01-10 15:24:16 +08:00
guanghongwei 8b91d5774f ޸bug 2015-01-10 15:15:49 +08:00
guanghongwei b3444d2398 ޸bug 2015-01-10 14:57:27 +08:00
guanghongwei f7a54e13c3 ݿû 2015-01-10 14:52:35 +08:00
guanghongwei 65b29cb68d ޸ 2015-01-10 13:50:59 +08:00
guanghongwei 609b0160f7 ޸user_add.html 2015-01-10 13:10:44 +08:00
guanghongwei 0c30e8fd53 ѡ 2015-01-10 12:30:21 +08:00
ibuler 4af80d2b61 查看iCheck 2015-01-09 22:51:46 +08:00
ibuler fb525728c0 添加查看属组.html 2015-01-09 22:10:38 +08:00
ibuler 9e32964382 修改bug and 睡觉 2015-01-08 00:07:00 +08:00
ibuler f524d2605a 修改 group_add bug 2015-01-08 00:01:41 +08:00
ibuler fac7fe3281 添加 group add view 2015-01-07 23:56:36 +08:00
ibuler fde3d19a9d 添加分组template 2015-01-07 23:20:48 +08:00
ibuler 64c155bede 修改添加用户 2015-01-05 23:55:05 +08:00
ibuler c8828f40ba 测试修改Path 2015-01-05 23:52:25 +08:00
ibuler a184ae9888 添加测试 useradd 2015-01-05 21:20:09 +08:00
ibuler a6642ab004 修改base.html 2015-01-03 20:42:20 +08:00
root 6a2e6709b9 add new app juser,jasset 2014-12-22 17:18:51 +08:00