jumpserver

Commit Graph

Author	SHA1	Message	Date
江世峰	73f5891f87	asset:update assets_list by tag	2016-10-12 18:57:51 +08:00
ibuler	45df58114c	Merge branch 'connect'	2016-10-02 21:45:44 +08:00
xiaokong1937@gmail.com	6856fad0c0	integrate the user-group list page with its api;	2016-10-02 11:09:27 +08:00
xiaokong1937@gmail.com	d40aa49d8c	user bulk import through Excel and close #20	2016-10-01 20:26:43 +08:00
ibuler	acf51238d0	Modify ssh server bug for using public key	2016-09-29 18:01:26 +08:00
ibuler	ce5950ca73	Merge with asset	2016-09-20 00:43:30 +08:00
xiaoyu	f00da20764	user-group delete implement	2016-09-19 15:47:58 +08:00
ibuler	d323c9df88	Modify asset create	2016-09-19 00:07:52 +08:00
ibuler	7d3474aeea	Add user permission user list	2016-09-17 15:20:33 +08:00
ibuler	037d9323a4	Modify and code review	2016-09-15 11:19:36 +08:00
ibuler	a4dc27f073	Finish permissin detail asset list and user list	2016-09-14 23:29:39 +08:00
ibuler	5bca783e12	permission user search	2016-09-14 01:08:26 +08:00
ibuler	627a5825f4	Add user perm	2016-09-10 21:08:10 +08:00
ibuler	6f4a832389	Add admin user list view	2016-09-08 00:40:59 +08:00
ibuler	7350e150c8	Merge branch 'master' into cmdb	2016-09-04 16:39:27 +08:00
ibuler	f274684473	Add translation for support i18n	2016-09-04 00:51:36 +08:00
wangyong	d96ac56460	merge master	2016-09-03 23:01:36 +08:00
wangyong	77f3a1f146	add asset add	2016-09-03 19:05:50 +08:00
ibuler	10d51ada37	Update login error message	2016-09-03 00:39:06 +08:00
ibuler	3a9cf6c360	Add forget password and reset password	2016-09-01 23:09:58 +08:00
ibuler	5940cec0e6	Add user and send mail	2016-09-01 01:12:02 +08:00
ibuler	b31f8d5867	Add user generate reset password token	2016-08-31 19:28:06 +08:00
ibuler	5350f83275	Add celery usage more	2016-08-31 16:48:12 +08:00
广宏伟	dd80b94b43	Update README.md	2016-08-31 16:43:44 +08:00
广宏伟	4cbadbd941	Update README.rst	2016-08-31 16:43:18 +08:00
广宏伟	e61341df79	Update README.md to README.rst	2016-08-31 16:33:05 +08:00
ibuler	f7ab26a5da	Add celery broker	2016-08-31 15:54:04 +08:00
ibuler	ffed46175d	update .gitignore	2016-08-30 17:26:33 +08:00
yumaojun03	363ddb70e2	add celery support (not use django-celery)	2016-08-25 19:52:03 +08:00
ibuler	0427d406b9	Add init data file	2016-08-21 01:16:30 +08:00
ibuler	e355c7b8ef	Modify pagination and Role model	2016-08-20 18:33:18 +08:00
ibuler	98d6043f2d	merged	2016-08-16 23:25:30 +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

33 Commits (1e835d2fa99b73b88cce34eb7ef4d76b32a70fcf)