313 Commits (c1185e989a38a92c9103d588df56fa195d60ef61)

Author	SHA1	Message	Date
ibuler	f253d2ea69	Merge with master	2016-09-14 23:31:22 +08:00
unknown	8490583d73	add assets manage ... Sweet Alert	2016-09-14 15:19:27 +08:00
ibuler	6d736d7309	Finish permission create and list	2016-09-11 22:45:24 +08:00
ibuler	70cae93a4b	Add user perm model and form	2016-09-11 09:50:42 +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	02b5483d81	Update add->create edit->update and assetgrou->asset-grou etc format	2016-09-06 14:38:19 +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	ffed46175d	update .gitignore	2016-08-30 17:26:33 +08:00
wangyong	3771b2ff70	add asset detail and list	2016-08-21 22:12:17 +08:00
wangyong	fcd39370ed	add asset some cbv	2016-08-14 22:10:10 +08:00
ibuler	234684c875	Rename dir name dashboard to apps ... It's may be well	2016-08-13 21:59:08 +08:00