57 Commits (a737564a6c6bf39c84c07023ca29cd21e07f7584)

Author	SHA1	Message	Date
ibuler	3aea994101	asset import	2016-11-27 14:37:50 +08:00
ibuler	c1c9c7b68a	update asset	2016-11-25 22:45:47 +08:00
ibuler	205c11dfba	Finish list paganation	2016-11-18 12:00:23 +08:00
ibuler	8d7759d22f	change user api	2016-11-09 19:29:15 +08:00
ibuler	a75e1db970	Add form validate	2016-11-07 00:39:26 +08:00
ibuler	072da114db	Finish system user list	2016-11-06 22:45:26 +08:00
ibuler	968b1b4cb6	Stash	2016-11-06 21:29:04 +08:00
ibuler	34a0a37b63	Add token	2016-11-01 19:31:35 +08:00
ibuler	1159d9494c	Update signer	2016-11-01 17:21:16 +08:00
ibuler	92251f2a45	Merge with master	2016-10-28 15:09:38 +08:00
ibuler	5d3f9b4a03	Add command list	2016-10-26 19:10:14 +08:00
ibuler	6b161d5971	Update import	2016-10-20 19:01:57 +08:00
ibuler	4531157c72	may be some wrong	2016-10-16 22:12:13 +08:00
ibuler	26a8bce2c3	Change auto_now to auto_now_add	2016-10-15 23:34:02 +08:00
江世峰	b99b88a30f	asset:update tag	2016-10-08 18:33:00 +08:00
江世峰	2829445f4f	assets:add tag	2016-10-07 23:04:37 +08:00
江世峰	e83ecb1254	assets_group_forbug	2016-09-28 12:05:34 +08:00
ibuler	1f3d763490	Add requirement	2016-09-24 11:44:59 +08:00
ibuler	220892824c	Finish some bug	2016-09-20 01:13:50 +08:00
ibuler	ce5950ca73	Merge with asset	2016-09-20 00:43:30 +08:00
ibuler	24e31a69cb	finish asset	2016-09-20 00:39:33 +08:00
江世峰	98757aa428	update assets_group	2016-09-19 17:25:41 +08:00
ibuler	d323c9df88	Modify asset create	2016-09-19 00:07:52 +08:00
ibuler	acfe8950b8	MOdify asset create	2016-09-18 00:10:08 +08:00
ibuler	502c7e756b	Modify asset	2016-09-17 23:43:41 +08:00
ibuler	7fd224e690	Merge with user-perm	2016-09-17 19:15:14 +08:00
wangyong	b95c1deee1	alter asset add and detail	2016-09-17 14:50:14 +08:00
ibuler	e232962649	Update some template	2016-09-16 20:53:10 +08:00
wangyong	42012d7bfe	merge master	2016-09-16 17:32:35 +08:00
wangyong	792908eb35	asset add	2016-09-16 17:23:23 +08:00
ibuler	a091036744	Add user permission select	2016-09-16 16:09:11 +08:00
ibuler	6069b8946b	Start asset extend	2016-09-10 00:29:57 +08:00
ibuler	292179d41d	system-user	2016-09-09 21:48:44 +08:00
ibuler	4fc9274e00	Add asset system user	2016-09-09 00:09:49 +08:00
ibuler	ff30435eb4	Finish adin user add	2016-09-08 18:12:53 +08:00
ibuler	6f4a832389	Add admin user list view	2016-09-08 00:40:59 +08:00
ibuler	dfc628a397	modify idc	2016-09-07 21:03:18 +08:00
ibuler	4db352f55b	Add idc	2016-09-07 20:51:33 +08:00
ibuler	d0ba17374e	Finish asset group create	2016-09-07 20:05:42 +08:00
ibuler	30fd51c268	Asset group detail	2016-09-06 21:39:21 +08:00
wangyong	bc232c4f77	merge cmdb	2016-09-06 18:45:40 +08:00
wangyong	342e4bdee8	change some html	2016-09-06 18:43:13 +08:00
ibuler	170b49428c	change date_added -> date_created	2016-09-06 16:50:19 +08:00
ibuler	02b5483d81	Update add->create edit->update and assetgrou->asset-grou etc format	2016-09-06 14:38:19 +08:00
ibuler	126d7fd62c	Add asset group add Form m2m	2016-09-06 00:49:42 +08:00
ibuler	2f5b7ad654	Modify asset model	2016-09-05 22:57:43 +08:00
ibuler	8827fd2d74	Modify translation	2016-09-05 20:17:45 +08:00
ibuler	4855e86a3f	Add asset group view	2016-09-04 21:47:10 +08:00
ibuler	3972bd3ff3	Add asset traslation	2016-09-04 19:05:47 +08:00
wangyong	fa07f4ee8a	fix null	2016-09-04 18:06:14 +08:00