daiao e86bd6728e Merge branch 'cxt_course' into develop ... Conflicts: app/controllers/users_controller.rb app/helpers/application_helper.rb app/views/users/_user_activities.html.erb db/schema.rb		2016-12-24 16:48:48 +08:00
..
comment_service.rb	回复通知api	2015-07-08 17:36:17 +08:00
contests_service.rb	竞赛消息的调整	2016-12-22 17:13:10 +08:00
courses_service.rb	邮件相关改进	2016-12-23 14:29:48 +08:00
homework_service.rb	微信：修改一些头像的路径	2016-08-09 14:09:13 +08:00
projects_service.rb	班级项目成员管理BUG修改	2016-09-01 11:18:42 +08:00
resources_service.rb	微信：作业增加发送功能	2016-07-18 11:08:02 +08:00
syllabuses_service.rb	微信班级名改为课程名。班级名	2016-09-14 15:10:24 +08:00
users_service.rb	用户修改密码、删除项目成员 添加事务处理	2016-12-19 17:26:56 +08:00
watches_service.rb	关注接口限制不能关注自己	2015-03-05 09:26:13 +08:00
wechat_service.rb	微信修改资料后台代码	2016-09-06 14:41:22 +08:00