Commit Graph

15 Commits

Author SHA1 Message Date
huang 18543c87ca 实训首页添加reduce排序 2017-04-27 10:18:15 +08:00
daiao 94b7a89e7b Merge branch 'develop' into dev_huang
Conflicts:
	app/views/challenges/_content_list.html.erb
	app/views/shixuns/index.html.erb
2017-04-26 09:48:13 +08:00
huang 2218a63710 shixun整型ID转换成8位字符串 2017-04-25 17:15:37 +08:00
daiao 476a69d38b 实训列表认证操作 2017-04-25 16:27:34 +08:00
huang fd87038ebc 完成实训个人主页 2017-04-25 14:18:52 +08:00
huang 4cc972d3fe admin提供实训认证 2017-04-24 17:29:38 +08:00
cxt 09482fea09 基本资料 2017-04-21 20:29:35 +08:00
cxt 046f73d2c6 新版个人首页 2017-04-20 17:17:02 +08:00
cxt c49191b70f Merge branch 'develop' into dev_cxt 2017-04-18 10:30:36 +08:00
cxt 6b9b1fe013 部门申请的后台审核 2017-04-14 15:36:23 +08:00
cxt 95911cd2ae 新版课程相关后台架构的搭建 2017-04-14 09:28:00 +08:00
guange 5c0bb0f870 markdown图片上传 2017-04-12 21:55:33 +08:00
huang 81be008780 发布实训功能及异常处理、权限处理 2017-04-12 16:06:03 +08:00
cxt 7b977e9fcc 基本资料相关后台开发 2017-04-11 16:19:35 +08:00
huang 1fc92c5c88 first commit 2017-04-07 10:16:13 +08:00