socialforge/app
huang 6ceb4f4549 Merge branch 'develop' into hjq_new_course
Conflicts:
	app/models/course_contributor_score.rb
	app/views/organizations/_org_course_homework.html.erb
	app/views/users/_homework_search_input.html.erb
	app/views/users/_show_user_homeworks.html.erb
	app/views/users/_user_homework_detail.html.erb
	app/views/users/_user_homework_form.html.erb
	app/views/users/user_homework_type.js.erb
	app/views/users/user_homeworks.html.erb
	app/views/users/user_homeworks.js.erb
2016-03-05 03:17:47 +08:00
..
api/mobile issue回复局部刷新 2016-01-22 17:27:21 +08:00
assets 1.解决一些bug;2.组织子目录功能实现 2016-01-13 15:17:13 +08:00
controllers Merge branch 'develop' into hjq_new_course 2016-03-05 03:17:47 +08:00
helpers Merge branch 'develop' into hjq_new_course 2016-03-05 03:17:47 +08:00
models 0 2016-03-05 03:16:04 +08:00
services 低版本的谷歌浏览器无法修改课程密码 2016-02-23 15:51:33 +08:00
sweepers
tasks 修改发系统消息后跳转路劲 2015-09-11 09:45:28 +08:00
views 0 2016-03-05 03:16:04 +08:00