41 Commits

Author	SHA1	Message	Date
ibuler	1719eee264	[Bugfix] 修复py3 bytes bug	2017-05-24 20:12:50 +08:00
ibuler	c11374ae39	[Bugfix] 修改翻译	2017-04-07 16:59:09 +08:00
ibuler	709552f14c	[Fixture] 添加首页	2017-04-02 18:09:40 +08:00
ibuler	10eb13920b	[Delete] 删除资产tag	2017-03-24 14:48:18 +08:00
ibuler	a57dac0706	[Fixture] 拆分proxy log 为在线和离线	2017-03-24 14:23:51 +08:00
ibuler	b60e5a7ee3	[Change] 修改一些view	2017-03-24 00:27:33 +08:00
ibuler	caec9709ef	[Fixture] 添加task list 搜索，重试	2017-03-22 21:57:05 +08:00
ibuler	240c7db416	[Fixture] 添加 rerun function	2017-03-14 14:15:13 +08:00
ibuler	915873135e	[Fixture] 添加runner run record	2017-03-14 00:58:25 +08:00
ibuler	ab62bfca7e	[Bugfix] 修改一些bug	2017-03-04 16:38:26 +08:00
ibuler	775cd523eb	Update app terminal name to applications	2016-12-25 23:10:53 +08:00
yumaojun03	150e1030c3	ansible Task接口更上层抽象的基本实现	2016-12-19 14:07:21 +08:00
Administrator	8e0afb2cc4	调整模型	2016-11-27 11:30:23 +08:00
Administrator	984391e2b2	同步Master分支上的代码, 解决部分冲突问题	2016-11-24 22:10:04 +08:00
Administrator	c289d6a4c5	Merge branch 'ansible_api' into ops_dev ... # Conflicts: # apps/jumpserver/urls.py # apps/locale/zh/LC_MESSAGES/django.po # apps/templates/_nav.html # requirements.txt # run_server.py	2016-11-24 17:57:50 +08:00
Administrator	18e0fee1a7	[future] 添加作业中心基础框架	2016-11-22 21:08:45 +08:00
ibuler	8d358a7a68	UPdate some	2016-11-14 19:28:21 +08:00
ibuler	374dfbdac2	Force merge	2016-10-28 11:36:37 +08:00
ibuler	534321d1aa	Merge with master	2016-10-28 11:34:07 +08:00
ibuler	589d0d0fac	Finish command log list	2016-10-27 22:58:19 +08:00
ibuler	c2aab50c7b	Add proxy log list	2016-10-25 23:23:01 +08:00
ibuler	303659cb0e	Change app name apps => terrminal	2016-10-17 15:24:41 +08:00
ibuler	4531157c72	may be some wrong	2016-10-16 22:12:13 +08:00
江世峰	b99b88a30f	asset:update tag	2016-10-08 18:33:00 +08:00
ibuler	6d736d7309	Finish permission create and list	2016-09-11 22:45:24 +08:00
ibuler	324bb68667	user-pserm	2016-09-11 16:59:19 +08:00
ibuler	4fc9274e00	Add asset system user	2016-09-09 00:09:49 +08:00
ibuler	6f4a832389	Add admin user list view	2016-09-08 00:40:59 +08:00
ibuler	4db352f55b	Add idc	2016-09-07 20:51:33 +08:00
ibuler	02b5483d81	Update add->create edit->update and assetgrou->asset-grou etc format	2016-09-06 14:38:19 +08:00
ibuler	7241f7509f	Update nav	2016-09-05 20:27:44 +08:00
ibuler	8827fd2d74	Modify translation	2016-09-05 20:17:45 +08:00
ibuler	508bda37f5	Modify form datetime valid error, because form format	2016-09-05 19:37:37 +08:00
ibuler	3972bd3ff3	Add asset traslation	2016-09-04 19:05:47 +08:00
ibuler	acd98365c1	Fix translation	2016-09-04 12:31:20 +08:00
ibuler	f274684473	Add translation for support i18n	2016-09-04 00:51:36 +08:00
ibuler	641e998504	Update context name path1, path2 => app, action	2016-08-25 13:56:49 +08:00
ibuler	b55b516fc3	Update foot_js.html add active	2016-08-23 17:34:52 +08:00
ibuler	cf15b7eaff	Add UserGroup some View	2016-08-19 01:39:08 +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	234684c875	Rename dir name dashboard to apps ... It's may be well	2016-08-13 21:59:08 +08:00