jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
17,467 Commits 98 Branches 0 Tags 0 B
Commit Graph

63 Commits

Author SHA1 Message Date
cxt 2bb018b0fe 导入问卷的弹框用新版样式 2016-11-07 17:12:29 +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 20f112d5ad 作业评分设置的调整 2016-11-04 09:23:23 +08:00
cxt 54f45f18a5 匿评设置的调整 2016-11-02 15:19:17 +08:00
huang 60c064d27b 项目样式修改 2016-10-31 11:33:23 +08:00
yuanke 93ed72fb59 Merge branch 'cxt_course' into develop 
Conflicts:
	db/schema.rb
 2016-10-28 15:57:53 +08:00
huang 3ef90a3c62 Merge branch 'dev_newproject' into develop 
Conflicts:
	db/schema.rb
 2016-10-27 17:33:28 +08:00
Tim c58fb36f44 在线测验单选、多选、填空题显示调整 2016-10-27 14:31:14 +08:00
Tim e035316cc7 里程碑，版本库table宽度限制 2016-10-27 10:53:01 +08:00
cxt 15b6aaf2a2 新建班级、新建课程增加tip说明 2016-10-25 13:21:01 +08:00
huang 1f4e8ca931 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-21 11:20:08 +08:00
Tim f4690f0cab 回复，二级回复，删除时，回复框宽度控制 2016-10-21 11:09:54 +08:00
huang 733a91d160 新版pull 新建功能 2016-10-21 10:32:38 +08:00
cxt f085b79999 个人主页的调整 2016-10-20 10:50:59 +08:00
huang fce6c407c8 Merge branch 'rep_quality' into dev_newproject 
Conflicts:
	app/controllers/projects_controller.rb
	app/views/layouts/base_projects.html.erb
	app/views/projects/settings/_new_edit.html.erb
	public/stylesheets/css/project.css
 2016-10-19 11:27:49 +08:00
cxt a289a2cee0 班级问卷：新建时只保存并设置学生可查看统计列表，再到问卷列表中去发布，但实际学生不能查看统计结果 2016-10-15 15:16:21 +08:00
huang 5532ec3b86 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	app/views/layouts/base_projects.html.erb
	public/stylesheets/css/project.css
 2016-10-15 10:53:01 +08:00
cxt 142e301e53 必答换行 2016-10-14 18:03:49 +08:00
cxt a1b70a7e91 Merge branch 'cxt_course' into develop 2016-10-14 16:18:12 +08:00
cxt 38d43cfb67 必答不应换行 2016-10-14 16:11:46 +08:00
Tim 2735aca331 Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course 2016-10-14 14:51:09 +08:00
Tim 86de58f793 问卷问题增加支持折行输入功能；输入随文字高度自适应js；问卷折行输入按格式输出css支持及格式调整 2016-10-14 14:50:51 +08:00
cxt 12ad7c1612 班级讨论区增加二级子栏目 2016-10-14 14:28:19 +08:00
daiao 2324ad31e2 Merge branch 'develop' into dev_newproject 
Conflicts:
	app/views/issues/index.html.erb
	public/stylesheets/css/common.css
	public/stylesheets/css/project.css
 2016-10-13 17:00:53 +08:00
cxt 5fb7da4681 Merge branch 'cxt_course' into develop 
Conflicts:
	public/stylesheets/css/public.css
 2016-10-13 14:17:54 +08:00
daiao 065ec67417 Merge branch 'dev_newproject' of https://git.trustie.net/jacknudt/trustieforge into dev_newproject 2016-10-12 17:03:33 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
cxt 399b982e0d 問卷 2016-10-12 13:34:09 +08:00
Tim 005cd09d4a 大纲中按钮样式移到common.css中；project.css中部分样式去重；翻页去掉灰色边线；大纲项目公用样式提取到public.css中 2016-10-11 14:58:50 +08:00
cxt 405e2cfb9b 问卷单选题 2016-10-11 08:51:00 +08:00
cxt 3217f84df2 问卷的单选题 2016-10-10 14:13:20 +08:00
cxt b28579a3a3 Merge branch 'cxt_course' into develop 2016-09-30 14:49:57 +08:00
cxt 03fac1900e 分班 2016-09-28 10:00:01 +08:00
huang db54d6e0d9 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 
Conflicts:
	public/stylesheets/css/project.css
 2016-09-26 22:21:45 +08:00
Tim 0e531aa529 题库标题颜色加深，common.css去重 2016-09-26 14:27:33 +08:00
Tim e6657ae422 甘特图样式调整 2016-09-22 17:39:45 +08:00
cxt 1bd93904af Merge branch 'cxt_course' into develop 2016-09-14 19:47:24 +08:00
Tim 135a2b21f5 新问题反馈样式更新 2016-09-13 18:53:00 +08:00
cxt 9002844188 新版发布作业 2016-09-13 16:18:57 +08:00
Tim 95824e3b6b 新建课程增加名称正确错误示例，课程说明 2016-09-07 11:24:38 +08:00
cxt 3c5afb2b4f Merge branch 'develop' into cxt_course 
Conflicts:
	app/views/layouts/new_base_user.html.erb
 2016-08-29 15:35:04 +08:00
cxt 1e169985a4 访问计数的颜色调整 2016-08-29 15:23:35 +08:00
Tim a13ec60173 修复无效的css 2016-08-24 17:02:59 +08:00
cxt 3178700131 Merge branch 'cxt_course' into develop 2016-08-05 16:14:56 +08:00
huang dd768c2913 Merge branch 'cs_optimize_txz' into develop 
Conflicts:
	public/stylesheets/css/common.css
 2016-08-05 15:30:03 +08:00
Tim 56452d69f4 侧导航字体大小，颜色更改 2016-08-05 14:11:35 +08:00
cxt 718b13e6c1 新版题库 2016-08-03 11:12:55 +08:00
Tim 3e95b070d0 合并请求代码 2016-08-02 15:00:05 +08:00
cxt 72977886c7 Merge branch 'cs_optimize_txz' into cxt_course 
Conflicts:
	app/views/layouts/_course_base_info.html.erb
 2016-07-29 19:37:15 +08:00
cxt 335b82c046 加入班级的弹框 2016-07-29 19:19:58 +08:00