4818 Commits (83ef013708c2a012e32f2109ac972ab30e3d56e7)

Author	SHA1	Message	Date
ibuler	342298ad3e	reslove conflict	2016-08-18 14:43:10 +08:00
ibuler	a76191ffdc	Change view detail template	2016-08-18 10:20:37 +08:00
ibuler	279987925a	Modify user detail of usergroup	2016-08-18 00:47:34 +08:00
ibuler	824b1c7f6f	update user update view	2016-08-17 22:17:16 +08:00
ibuler	bcae7beae6	upload avatar	2016-08-17 00:36:54 +08:00
ibuler	9353022627	add context	2016-08-17 00:23:52 +08:00
ibuler	35abf16f7d	Modify panel color	2016-08-17 00:22:33 +08:00
ibuler	c14eb42186	reslove conflict add user detail template	2016-08-17 00:14:56 +08:00
ibuler	98d6043f2d	merged	2016-08-16 23:25:30 +08:00
ibuler	7a8d4a3a59	Add delete view	2016-08-16 22:13:06 +08:00
ibuler	3bf0d4aabb	Add common app ... common app used as write public api or templatetags modify user list view and user edit view	2016-08-16 00:09:48 +08:00
ibuler	edd60cad11	Merge branch 'master' of code.simcu.com:jumpserver/jumpserver	2016-08-15 22:54:56 +08:00
广宏伟	e3223f745a	app users ... Modify user list view Modify user add view	2016-08-15 21:10:30 +08:00
wangyong	fcd39370ed	add asset some cbv	2016-08-14 22:10:10 +08:00
广宏伟	86ffcc973c	Add user template	2016-08-14 19:18:41 +08:00
ibuler	9493fb07cb	Add user list view	2016-08-14 17:21:04 +08:00
ibuler	9303415b89	modify some issues	2016-08-14 00:40:21 +08:00
ibuler	234684c875	Rename dir name dashboard to apps ... It's may be well	2016-08-13 21:59:08 +08:00