Commit Graph

6554 Commits (0eedda748aba37cc3739c7c5666abb5a6c6c9e05)

Author SHA1 Message Date
guanghongwei ae227aad77 ޸bug 2015-01-10 15:07:56 +08:00
guanghongwei 3a3c5701b7 ޸vbug 2015-01-10 15:04:34 +08:00
guanghongwei 56fe39d346 ޸vbug 2015-01-10 14:58:34 +08:00
guanghongwei b3444d2398 ޸bug 2015-01-10 14:57:27 +08:00
guanghongwei f7a54e13c3 ݿû 2015-01-10 14:52:35 +08:00
guanghongwei 796533b7a9 ޸bug 2015-01-10 14:07:06 +08:00
guanghongwei f9abf7af1d Merge branch 'master' into guanghongwei 2015-01-10 14:00:02 +08:00
guanghongwei e5fe13337b ޸jasset 2015-01-10 13:57:37 +08:00
root 94beae5282 a new branch 2015-01-10 13:52:39 +08:00
guanghongwei 65b29cb68d ޸ 2015-01-10 13:50:59 +08:00
guanghongwei c6e0429584 ޸model 2015-01-10 13:35:56 +08:00
guanghongwei 30cfa8a5f4 ޸asset models 2015-01-10 13:30:01 +08:00
guanghongwei 67074fa895 ޸bug 2015-01-10 13:11:50 +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
guanghongwei 662c48ed37 group_list޸ 2015-01-10 12:07:15 +08:00
ibuler a63f2304fe 修改icheck 2015-01-09 23:15:28 +08:00
ibuler 4af80d2b61 查看iCheck 2015-01-09 22:51:46 +08:00
ibuler 113054c92c 修改bug 2015-01-09 22:21:19 +08:00
ibuler 53d8f7fad7 修改checkbox样式 2015-01-09 22:19:05 +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 2aea864fbe 添加group_add url 2015-01-07 23:22:47 +08:00
ibuler 9652460ba5 Merge remote-tracking branch 'origin/master' 2015-01-07 23:21:11 +08:00
ibuler fde3d19a9d 添加分组template 2015-01-07 23:20:48 +08:00
halcyon 0ed0853489 完善资产添加和查看资产页面 2015-01-07 18:35:09 +08:00
ibuler bafbacc18a 修改nav字体颜色 2015-01-06 23:45:40 +08:00
ibuler cd7aa37a72 添加虚线 2015-01-06 23:36:11 +08:00
ibuler e79aaff750 修改bug 2015-01-06 23:33:49 +08:00
ibuler de226a9249 测试查看 user_add.html 2015-01-06 23:21:07 +08:00
ibuler fc162f1429 测试查看 2015-01-06 23:10:13 +08:00
ibuler 6175f4eb29 长度再修改 2015-01-05 23:58:51 +08:00
ibuler e74438f54d 修改长度 2015-01-05 23:57:49 +08:00
ibuler 64c155bede 修改添加用户 2015-01-05 23:55:05 +08:00
ibuler c8828f40ba 测试修改Path 2015-01-05 23:52:25 +08:00
ibuler ee3336de9e 修改长度 2015-01-05 23:46:13 +08:00
ibuler f9a5907762 修改长度 2015-01-05 23:07:20 +08:00
ibuler 67c94265b1 修改长度 2015-01-05 23:03:46 +08:00
ibuler ba704d61b6 修改长度 2015-01-05 22:57:36 +08:00
ibuler a1973c2a89 修改长度 2015-01-05 22:51:15 +08:00
ibuler 3735136009 修改长度 2015-01-05 22:50:05 +08:00
ibuler 3ed3f3e830 修改长度 2015-01-05 22:45:10 +08:00
ibuler 3f54828114 修改title 2015-01-05 22:44:05 +08:00
ibuler 1c648d6396 添加 skin_config.html 2015-01-05 22:39:14 +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 ba5757e377 修改bug 2015-01-05 21:29:49 +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