Commit Graph

13808 Commits

Author SHA1 Message Date
huang a98678e001 列表中类型显示方法封装 2016-05-09 15:00:50 +08:00
huang 878bcc8cf1 栏目创建类型添加老师、学生类型 2016-05-09 14:43:28 +08:00
huang 65bcca76c1 Merge branch 'develop' into hjq_beidou 2016-05-09 11:00:48 +08:00
cxt 1b309d4bf0 时间的比较 2016-05-09 10:36:38 +08:00
cxt 7b84c994e0 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-09 10:32:48 +08:00
cxt fc95d048a5 作业列表打不开 2016-05-09 10:32:41 +08:00
huang 18b70e9dd3 上线问题 2016-05-06 22:59:46 +08:00
huang 7a0d86228a Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-05-06 22:57:29 +08:00
huang 635d49cc25 course->课程动态
project->项目动态
2016-05-06 22:57:05 +08:00
cxt e03bc42c53 Merge branch 'cxt_course' into develop
Conflicts:
	app/controllers/words_controller.rb
2016-05-06 22:53:16 +08:00
huang 96ce1d8d40 | 及更多问题 2016-05-06 22:35:17 +08:00
huang 6401afb850 二级目录排序同步 2016-05-06 22:30:44 +08:00
cxt 2a55d8f0c3 作业的回复更新作业的updated_at字段 2016-05-06 22:23:05 +08:00
huang 9a80ff0597 右一添加“更多”链接 2016-05-06 22:21:52 +08:00
cxt 90809ea350 首页报500 2016-05-06 22:18:31 +08:00
cxt 9526962c69 翻页时不更新作业动态 2016-05-06 22:06:24 +08:00
huang e8c458c163 Merge branch 'yuanke' into develop 2016-05-06 22:03:36 +08:00
cxt b8f7672424 项目动态的更新时间更新到作业动态中 2016-05-06 22:02:45 +08:00
huang 00d0bc0ce1 Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-05-06 22:02:22 +08:00
yuanke 350e3f8eb4 表格颜色问题没改好暂时还原之前的 2016-05-06 21:34:08 +08:00
huang ece84e912d 鼠标经过显示标题 2016-05-06 21:32:37 +08:00
huang b7d87966dd 时间显示样式 2016-05-06 21:26:28 +08:00
huang 8323422f09 回复留言为空则不能提交 2016-05-06 21:19:35 +08:00
cxt 54cdd57f89 二级回复的内容与上边框的距离调整 2016-05-06 20:56:20 +08:00
huang d672c80edb 换行问题 2016-05-06 20:45:08 +08:00
huang cd0603f01b 模式二里面的链接问题 2016-05-06 20:36:06 +08:00
huang 967a76af67 图片变大的问题 2016-05-06 20:20:48 +08:00
cxt b0f407aae5 去掉导出的作业成绩中的作品描述的html代码 2016-05-06 20:19:16 +08:00
huang 3469d928d8 图片变的很大问题 2016-05-06 20:17:11 +08:00
huang 23a23fd085 组织logo上传图片 2016-05-06 19:53:13 +08:00
huang 86b0470b76 隐藏掉搜索功能 2016-05-06 19:02:43 +08:00
cxt 262fd8bb65 学生提交禁用匿评的作业时会弹出匿评关闭的提示 2016-05-06 18:54:51 +08:00
huang a267c75ec7 首页的隐藏可见 2016-05-06 18:50:57 +08:00
cxt c6c3625029 题目申请说明内容较长时,会导致被申请者收不到消息 2016-05-06 18:47:38 +08:00
huang f4a5aeec07 样式优化 2016-05-06 18:29:26 +08:00
huang 86ad0035b7 样式显示问题 2016-05-06 18:19:00 +08:00
huang 0a989daf31 Merge branch 'cxt_course' into develop
Conflicts:
	app/helpers/application_helper.rb
	public/stylesheets/courses.css
	public/stylesheets/new_user.css
2016-05-06 18:12:08 +08:00
huang 6ba4b9dfa2 Merge branch 'yuanke' into develop 2016-05-06 18:07:24 +08:00
huang 67be99530c 左侧模式三样式修改 2016-05-06 18:06:25 +08:00
yuanke 34ea7662b2 将内容省略显示的固定字数改为传参 2016-05-06 17:59:27 +08:00
cxt 620cc83d4b "从题库选用作业"暂时只提供公共作业和我的作业 2016-05-06 17:56:56 +08:00
cxt 10d26f89d9 作业列表的二级回复 2016-05-06 17:36:28 +08:00
huang 97f263e97e 空内容的提示语 2016-05-06 17:34:45 +08:00
huang b40a112015 配置页面一级域名超过的时候显示样式 2016-05-06 17:25:50 +08:00
huang d9b0c654aa 组织门户二级目录显隐 2016-05-06 17:14:53 +08:00
huang 5133338923 组织门户二级目录显隐 2016-05-06 17:11:08 +08:00
huang 9c18b37349 Merge branch 'hjq_beidou' into develop 2016-05-06 17:05:27 +08:00
huang 3de2b151a3 左三”更多“提供链接 2016-05-06 17:03:54 +08:00
Tim c3aec4d115 组织一级栏目名称过长时溢出 2016-05-06 16:31:40 +08:00
huang 7f9a327166 Merge branch 'hjq_beidou' into develop
Conflicts:
	app/views/sub_document_comments/show.html.erb
2016-05-06 16:25:41 +08:00