319 Commits (38b0f2f5f9ba2f55cdc7341c51d2c7fbf2c3be4f)

Author	SHA1	Message	Date
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	a4b3a07885	修改已出bug	2015-01-03 23:11:15 +08:00
ibuler	9087b41352	修改 文平提交	2015-01-03 23:10:09 +08:00
ibuler	8682d7c6ec	基于文平修改	2015-01-03 22:42:46 +08:00
ibuler	dde0b75d17	使用 陈文平的html	2015-01-03 22:24:34 +08:00
ibuler	a6642ab004	修改base.html	2015-01-03 20:42:20 +08:00
ibuler	f552babde6	添加facio	2015-01-02 22:08:49 +08:00
root	d51287fa8b	修改base.html	2015-01-02 22:06:35 +08:00
root	55c3b06d0f	简单定制base	2015-01-02 20:53:20 +08:00
ibuler	6d32e6a1a7	添加Demo皮肤设置	2015-01-02 17:43:28 +08:00
ibuler	8f95f11f35	添加Demo皮肤设置	2015-01-02 17:14:57 +08:00
ibuler	cefc175790	测试固定Footer	2014-12-29 21:26:09 +08:00
ibuler	d7df0fb48b	修改皮肤颜色	2014-12-29 21:23:34 +08:00
ibuler	c0d1ae6afc	t图片bug	2014-12-29 21:20:10 +08:00
ibuler	c8c34dca29	修改地址	2014-12-29 21:16:43 +08:00
ibuler	2860f4a343	添加测试页面	2014-12-28 21:48:26 +08:00
ibuler	b24ad2854c	添加static, templates	2014-12-22 23:20:47 +08:00