324 Commits (4f79abe6784c43cf00f9f8e70f80d306048f521c)

Author	SHA1	Message	Date
ibuler	071d1922d0	stash it	2017-04-10 22:55:15 +08:00
ibuler	c11374ae39	[Bugfix] 修改翻译	2017-04-07 16:59:09 +08:00
ibuler	ac3553babb	[Fixture] 修改asset detail	2017-04-04 11:14:59 +08:00
ibuler	7720e9f3fd	[Change] 修改图片	2017-03-31 18:47:50 +08:00
ibuler	61a481f427	[Fixture] 添加用户连接终端	2017-03-31 11:25:25 +08:00
ibuler	3fa5ce5404	[Fixture] 添加用户信息更改	2017-03-30 16:28:00 +08:00
ibuler	0983f294b7	[Fixture] 添加用户profile	2017-03-30 00:51:36 +08:00
ibuler	ab62bfca7e	[Bugfix] 修改一些bug	2017-03-04 16:38:26 +08:00
ibuler	695dc96ce8	Merge branch 'audits'	2017-03-03 10:24:34 +08:00
ibuler	9518672ad2	Add	2017-03-02 18:29:29 +08:00
ibuler	b055144908	Merge with audits	2017-03-01 15:35:11 +08:00
xiaokong1937@gmail.com	548d7ef99a	fix #13;fix `user` context conflict problem in user-detail page	2017-02-09 21:19:49 +08:00
xiaokong1937@gmail.com	8a5d0b2d92	remove unused templatetags: users_tags and common_tags	2017-01-26 20:24:50 +08:00
ibuler	0869931e67	[Bugfix] 修改了一些issue上的bug	2017-01-20 20:13:22 +08:00
ibuler	25cb47d2f5	[Change] 拆分user view为多个view	2017-01-17 16:34:47 +08:00
ibuler	17657deb0e	[Bugfix] 和Master分支合并后，修复冲突，DRF 新版本要求 fields和exclude	2017-01-08 13:35:59 +08:00
ibuler	92d854b971	Update api	2016-12-29 00:29:59 +08:00
ibuler	775cd523eb	Update app terminal name to applications	2016-12-25 23:10:53 +08:00
ibuler	a8fa4d2f0c	update terminal regist	2016-12-25 17:44:39 +08:00
ibuler	2707012325	Finish access key auth	2016-12-25 13:15:28 +08:00
ibuler	5b4ce709af	Add private token and change user group	2016-12-22 00:36:31 +08:00
ibuler	875aaa0029	update user model for create application user	2016-12-21 01:17:36 +08:00
ibuler	649509dec1	Change models dir	2016-12-21 00:43:52 +08:00
ibuler	96d32f2e3e	prepare merge ops	2016-12-20 23:06:27 +08:00