daiao 6d4be8bbd9 Merge branch 'dev_cs' into dev_daiao ... Conflicts: app/views/challenges/_content_list.html.erb app/views/challenges/_edit_task_pass.html.erb app/views/challenges/_task_pass_form.html.erb		2017-07-26 18:54:13 +08:00
..
api/mobile	first commit	2017-04-07 10:16:13 +08:00
assets	TPI的问题反馈更新为“评论”，直接在TPI中显示评论tab	2017-07-19 17:26:22 +08:00
controllers	Merge branch 'dev_cs' into dev_daiao	2017-07-26 18:54:13 +08:00
helpers	Merge branch 'dev_cxt' into dev_cs	2017-07-26 14:43:19 +08:00
models	单选多选题的编辑/新建页面	2017-07-26 18:50:52 +08:00
services	基本资料增加“昵称”，个人主页显示“昵称”	2017-07-18 14:47:50 +08:00
sweepers	first commit	2017-04-07 10:16:13 +08:00
tasks	first commit	2017-04-07 10:16:13 +08:00
views	Merge branch 'dev_cs' into dev_daiao	2017-07-26 18:54:13 +08:00