Commit Graph

891 Commits

Author SHA1 Message Date
huang 9a3793ffa9 完成training_task 编辑功能 2017-02-23 10:45:28 +08:00
daiao 3e705fabb8 平台底部调整(去除底部图片,增加合作伙伴一栏) 2017-02-09 10:47:18 +08:00
cxt ee4d676f11 竞赛提交增加作品成绩的导出 2017-01-12 11:14:27 +08:00
cxt 231fa56c49 管理员界面增加竞赛列表 2017-01-11 16:45:41 +08:00
daiao fbfbc0cdeb 问吧样式调整 2016-12-30 21:05:14 +08:00
huang 17d4e45acc Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/layouts/_logined_header.html.erb
2016-12-30 17:33:18 +08:00
huang baaaaf95d8 Merge branch 'dev_tieba' of https://git.trustie.net/jacknudt/trustieforge into dev_tieba
Conflicts:
	config/routes.rb
2016-12-30 16:51:23 +08:00
cxt 986fe7db86 竞赛增加讨论区模块 2016-12-30 16:37:20 +08:00
huang 8126353b43 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	app/views/users/_news_replies.html.erb
2016-12-27 12:29:43 +08:00
huang 40c3d34a58 注册邮件内容后台可配 2016-12-26 15:40:43 +08:00
cxt 9af9945cb4 竞赛 2016-12-24 16:29:10 +08:00
cxt 5242e12373 竞赛框架搭建 2016-12-22 10:01:37 +08:00
daiao ffe86c7ec9 项目配置删除按钮新版弹框 2016-11-15 13:21:27 +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
huang 5c31a5379e 里程碑添加删除功能 2016-10-26 18:39:14 +08:00
daiao e3f0f222e6 新版Issue新建页面 2016-10-25 09:28:09 +08:00
cxt 3d29eb2be0 分班批量添加学生、小班页面 2016-10-21 17:34:02 +08:00
cxt dff47b586e 主页宽度调整、主页配置菜单调整 2016-10-20 09:26:01 +08:00
cxt 6109a1602b Merge branch 'cxt_course' into develop
Conflicts:
	db/schema.rb
2016-10-19 18:11:02 +08:00
cxt e102815f60 个人主页 2016-10-19 18:03:59 +08:00
daiao bdbd2e9cf7 项目配置组织与里程碑界面 2016-10-18 15:17:36 +08:00
cxt 8648ea605f 问卷导出的统计结果:“其他”选项要标出来,多行主观题要对各小题标识出来 2016-10-18 11:14:29 +08:00
huang 10778fabc9 新版版本库界面代码整理 2016-10-12 17:02:51 +08:00
huang d647f7153a 新建里程碑术语 2016-09-27 20:01:23 +08:00
cxt b33136c59b 班级问答区改成讨论区 2016-08-25 15:59:09 +08:00
yuanke a1dfdae58d 修改班级通知模版消息的跳转 2016-08-11 10:54:14 +08:00
daiao 430a93e4b2 单位名称列表功能代码 2016-07-29 20:48:36 +08:00
daiao 6bd9f47222 Merge branch 'dev_shcool' into develop
Conflicts:
	db/schema.rb
2016-07-28 20:02:57 +08:00
yuanke 1489ab015a 微信模版消息标题加上句号 2016-07-28 17:55:37 +08:00
huang 29edd60ce6 Merge branch 'daiao_dev' into dev_shcool 2016-07-27 10:54:38 +08:00
daiao 9e788c9b6f 单位批准及消息框架搭建 2016-07-27 10:46:48 +08:00
huang 35172dab59 管理员界面单位申请框架 2016-07-25 10:59:08 +08:00
daiao dcc37ef847 增加作品查看界面中,班级查询条件下,增加暂无分班的查询条件 2016-07-13 16:58:31 +08:00
cxt 37dd447fcb Merge branch 'daiao_dev' into cxt_course
Conflicts:
	app/views/admin/courses.html.erb
	public/stylesheets/new_user.css
2016-07-07 15:14:11 +08:00
cxt a99b03ff76 管理员界面增加配置课程 2016-07-07 09:02:41 +08:00
cxt c5840d75da Merge branch 'daiao_dev' into cxt_course
Conflicts:
	db/schema.rb
2016-07-05 16:49:50 +08:00
daiao cc72ca8473 Merge branch 'develop' into daiao_dev
Conflicts:
	db/schema.rb
2016-07-05 15:44:47 +08:00
cxt 5f41e191b1 在线测验的提示信息 2016-07-05 10:06:46 +08:00
cxt 18d677c5eb Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/courses.css
2016-07-01 11:31:51 +08:00
cxt 2c1e0f534c 课程大纲 2016-07-01 11:11:53 +08:00
yuanke 5cc40408ee 修改KE单倍行距显示的时候不一致的BUG 2016-06-30 16:30:02 +08:00
cxt 383483de26 课程大纲的左侧栏base,新建课程大纲、新建班级的调整 2016-06-28 15:13:04 +08:00
huang 46cde061a6 Merge branch 'rep_quality' into develop
Conflicts:
	db/schema.rb
	public/stylesheets/project.css
	public/stylesheets/public.css
2016-06-24 19:17:26 +08:00
cxt bd3277681c 分组作业的作业成绩导出、学生列表的导出 2016-06-24 10:50:40 +08:00
cxt e457593416 作品列表--导出作业成绩:excel中增加缺评扣分、迟交扣分情况 2016-06-23 17:34:46 +08:00
huang c6bd5e6d31 饼状图 2016-06-14 09:57:53 +08:00
cxt b72ad364db 微信模板消息:用户绑定成功、作业消息、个人留言、班级通知 2016-06-02 10:39:11 +08:00
cxt c165d0b37e 作业二级回复的模板通知 2016-05-20 14:52:47 +08:00