Commit Graph

3954 Commits

Author SHA1 Message Date
cxt 5510df165d Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-11-18 15:45:06 +08:00
cxt 1fcb1db27c 课程大纲下的班级归档 2016-11-18 15:34:53 +08:00
cxt 3ebc3c6492 老师、学生测验列表的调整 2016-11-17 17:04:00 +08:00
cxt efd0bf6707 删除学生/退出班级时隐藏学生作品、退出班级按钮位置调整 2016-11-17 10:23:13 +08:00
cxt 1ad0c1cbff 测验列表 2016-11-17 09:06:44 +08:00
cxt 2dc717df0c Merge branch 'develop' into cxt_course 2016-11-15 16:57:33 +08:00
cxt 9f79408e32 导入试卷 2016-11-15 16:57:07 +08:00
cxt f754ac870d 导航栏题库-发送:如图发送弹框中当鼠标移至下拉条时,鼠标光标不要显示成可以左右拉动的图标 2016-11-15 14:18:15 +08:00
cxt 79b6a99324 班级左侧导航栏的发布icon简化 2016-11-15 09:30:45 +08:00
cxt 0ed878e718 404、403、500页面 2016-11-14 15:36:36 +08:00
huang 8e36cd1374 attach弹框宽度 2016-11-11 19:19:26 +08:00
huang 5104340b78 Merge branch 'dev_newproject' into develop 2016-11-11 18:21:29 +08:00
cxt c352fb5604 学生列表的删除和编辑按钮的对齐显示、删除学生时刷新班级头部的学生数 2016-11-11 17:55:25 +08:00
daiao 1ec0100386 项目简介样式调整,并且输入网页能点击 2016-11-11 17:35:11 +08:00
cxt cb5ca96bb5 Merge branch 'cxt_course' into develop
Conflicts:
	app/views/users/_course_homework.html.erb
	db/schema.rb
2016-11-11 16:53:20 +08:00
cxt 16c51e1eaa 基于项目的分组作业没有显示项目详情 2016-11-11 16:50:25 +08:00
daiao e1afe9d2d7 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-11 16:36:13 +08:00
daiao 92531ce487 项目简介样式调整 2016-11-11 16:35:26 +08:00
huang 442fb8a531 添加fork成员列表 2016-11-11 16:09:43 +08:00
cxt d1bfdde261 班级名称命名和显示规范调整 2016-11-11 15:19:22 +08:00
cxt 07b97c8eb9 学生列表增加删除功能、删除学生时删除其对应的作品 2016-11-11 13:58:07 +08:00
daiao ae84afe43e 项目issue,新建和编辑issue时,上传附件时,保存按钮不可点击 2016-11-10 17:16:54 +08:00
daiao 4fc98308bc 项目简介样式问题 2016-11-10 13:34:43 +08:00
daiao c1cf633d2c 项目版本库样式调整 2016-11-09 10:01:56 +08:00
huang b5f035d286 版本库详情页面添加目录回退功能,部分功能及界面调整 2016-11-08 15:21:12 +08:00
huang 721a916a20 版本库按钮调整 2016-11-08 10:44:57 +08:00
huang cceadb02ce Merge branch 'develop' into dev_newproject 2016-11-07 17:19:47 +08:00
cxt 2bb018b0fe 导入问卷的弹框用新版样式 2016-11-07 17:12:29 +08:00
daiao e57e439210 新建,编辑issue时,上传附件尽课程展示全 2016-11-07 17:08:24 +08:00
daiao 3d2d526149 新建和编辑ISSUE,上传附件名称显示问题 2016-11-07 15:21:00 +08:00
daiao e70c66b5ac Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject
Conflicts:
	app/views/projects/_act_issues.html.erb
2016-11-07 13:30:15 +08:00
daiao 8b5879217d 调整新建项目issue页面 2016-11-07 13:28:50 +08:00
yuanke 44724c6905 弹框BUG修改 2016-11-04 21:07:57 +08:00
yuanke 76a62af858 Merge branch 'yuanke_youhua' into develop 2016-11-04 20:30:44 +08:00
yuanke d71ebb08b0 弹框BUG修复 2016-11-04 20:29:18 +08:00
cxt 15a88b76c2 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2016-11-04 19:18:53 +08:00
yuanke 9ef8f0f612 弹框BUG修改 2016-11-04 18:59:48 +08:00
cxt 94284e72a2 弹框样式调整、
课程大纲的提示,在操作文字的前后应该各空一格、
作品列表的各种提示未知需要对齐、
评分设置等新弹框:如图当鼠标移至右上角关闭图标,图标丢失、
2016-11-04 18:43:44 +08:00
cxt 0bbccab616 样式调整 2016-11-04 16:59:33 +08:00
cxt 78ca68b5e3 Merge branch 'cxt_course' into develop
Conflicts:
	public/stylesheets/css/moduel.css
	public/stylesheets/css/public.css
2016-11-04 16:15:56 +08:00
cxt d762c68f7b 分组作业的页面显示和评分处理调整 2016-11-04 16:10:13 +08:00
cxt 20f112d5ad 作业评分设置的调整 2016-11-04 09:23:23 +08:00
cxt ecae600546 启动匿评、关闭匿评的提示 2016-11-02 16:46:47 +08:00
cxt 54f45f18a5 匿评设置的调整 2016-11-02 15:19:17 +08:00
huang 77e1a26e6c 修改issue搜索超出放大镜问题,以及鼠标经过就不显示放大镜的问题 2016-11-02 11:23:28 +08:00
huang f6f9464945 版本库显示调整 2016-11-02 11:19:23 +08:00
huang 368b27ef95 项目简介改成白底 2016-11-02 10:32:07 +08:00
huang 0b4caa3ebd Merge branch 'dev_newproject' into develop 2016-11-01 16:34:54 +08:00
huang 03dba25ab7 项目增加fork于某项目功能 2016-11-01 16:34:05 +08:00
huang a5193cd266 版本库显示调整,及汉字姓名 2016-11-01 15:24:02 +08:00