39 Commits

Author	SHA1	Message	Date
ibuler	e96053ba20	���޸�	2015-04-18 19:15:53 +08:00
ibuler	9ab855fd92	merge	2015-04-18 17:00:03 +08:00
ibuler	c1d8de4558	�ϲ���	2015-04-18 16:58:16 +08:00
halcyon	f19b274fcc	bug	2015-04-18 16:58:15 +08:00
halcyon	84929840d0	bug	2015-04-18 13:51:47 +08:00
ibuler	0d1d64e83c	�޸������ļ�	2015-04-16 15:13:22 +08:00
ibuler	e2e131146d	Merge branches 'master' and 'wangyong' of gitcafe.com:ibuler/jumpserver	2015-04-16 14:33:55 +08:00
ibuler	60cb5561f0	�޸�move	2015-04-16 14:32:51 +08:00
halcyon	55c5230eb2	hehe	2015-04-16 14:32:48 +08:00
guanghongwei	c08cee8052	�����û���������	2015-04-15 17:32:30 +08:00
guanghongwei	3424bef5d0	�޸�bug	2015-04-15 12:07:59 +08:00
halcyon	3bfe0e3c16	bugs	2015-04-14 17:25:56 +08:00
halcyon	4abf25ef13	hehe	2015-04-13 21:25:43 +08:00
guanghongwei	12df8cf060	���޸�	2015-04-11 17:45:33 +08:00
halcyon	9cfe6c569d	hehe	2015-04-11 12:52:00 +08:00
guanghongwei	2b14fefb5c	�޸���ҳ	2015-04-08 18:08:39 +08:00
halcyon	ef63fce7c4	修改bug，实时搜索完成	2015-04-07 19:15:45 +08:00
halcyon	7de943c6e4	管理员仪表盘基本完成	2015-04-05 22:52:37 +08:00
guanghongwei	afcc784797	�޸��û�����	2015-04-04 12:48:26 +08:00
halcyon	e1b9134d7f	0402	2015-04-01 18:58:10 +08:00
halcyon	1dddd98741	bug	2015-03-24 17:04:25 +08:00
guanghongwei	a2ede31ae6	��Ȩ��ʼ	2015-03-15 23:23:20 +08:00
halcyon	78dc6e5154	bugs	2015-03-14 17:54:27 +08:00
guanghongwei	d72d55c965	没怎么修改	2015-03-08 22:48:50 +08:00
halcyon	5bf66ca92e	修改各种bug	2015-03-07 17:37:40 +08:00
guanghongwei	8bc40dbea1	基本完成用户管理	2015-03-05 00:20:24 +08:00
root	67c1f12086	dashboard	2015-02-26 18:02:39 +08:00
root	2a645747de	Merge in 20150131	2015-01-31 13:03:58 +08:00
guanghongwei	6a8db89614	�޸�һ��bug	2015-01-28 17:35:06 +08:00
halcyon	d1f6ed4a55	增加日志查看功能	2015-01-25 22:20:07 +08:00
halcyon	1925cf4033	增加js判断	2015-01-14 19:19:56 +08:00
ibuler	14da0f18ab	添加用户完成	2015-01-13 22:14:50 +08:00
halcyon	acf508f074	资产管理页面基本完成.	2015-01-11 19:27:21 +08:00
root	37893bb394	修改配置文件	2014-12-27 23:57:40 +08:00
ibuler	0d48884e19	记录日志	2014-12-26 23:58:11 +08:00
ibuler	d7b2631410	修改名称	2014-12-24 22:21:46 +08:00
ibuler	e66b1b4192	修改bug	2014-12-24 22:20:38 +08:00
guanghongwei	99f95af74e	modified settings.py set option	2014-12-22 18:34:08 +08:00
ibuler	917a24e858	Add postfix_shell function. Add jumpserver.conf file.	2014-12-21 23:10:59 +08:00