Tim b796ac3b53 Merge branch 'develop' into cxt_course ... Conflicts: app/views/exercise/_student_table.html.erb db/schema.rb		2016-09-09 13:30:10 +08:00
..
blocks	隐藏我的工作台更多按钮	2014-11-20 10:54:03 +08:00
_apply_add_school.html.erb	强制修改基本资料：申请单位点击确定后，进入主页面；提问按钮不可用	2016-08-25 15:29:04 +08:00
_block.html.erb	first commit	2013-08-01 10:33:49 +08:00
_sidebar.html.erb	first commit	2013-08-01 10:33:49 +08:00
account.html.erb	1.基本资料页面，身份为从业者时，直接点确定报提示问题	2016-09-02 16:11:14 +08:00
clear_user_avatar_temp.js.erb	班级作业：当已经发布了作业再去编辑作业时，现在是“发布时间”就不能再编辑了，建议代码判断只有当学生已经提交了作品或关联了项目才禁止再编辑发布时间，且要给出必要提示	2016-09-08 10:54:41 +08:00
destroy.html.erb	first commit	2013-08-01 10:33:49 +08:00
page.html.erb	first commit	2013-08-01 10:33:49 +08:00
page.js.erb	1.添加工作台分页处理操作	2014-08-22 09:38:07 +08:00
page2.js.erb	1.添加工作台分页处理操作	2014-08-22 09:38:07 +08:00
page_layout.html.erb	first commit	2013-08-01 10:33:49 +08:00
password.html.erb	修改密码页面查询按钮改为确定	2014-08-08 11:32:15 +08:00
save_user_avatar.js.erb	组织logo点击可编辑	2016-08-29 16:19:06 +08:00