Commit Graph

878 Commits

Author SHA1 Message Date
sw d2dfff33d0 课程页面增加问卷调查的链接 2015-01-12 17:01:39 +08:00
sw 475b046898 修改访问poll#index报ArgumentError 2015-01-12 16:56:53 +08:00
sw d0a6fa64e5 修改路由 2015-01-12 16:27:47 +08:00
sw c964194d85 增加问卷调查相关的路由、action、以及部分对应的页面 2015-01-12 16:02:15 +08:00
sw bf7eaa7a80 修复同一个学生提交相同的文件后,打包下载异常的BUG 2015-01-10 17:41:50 +08:00
sw 57eb9f555f Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-01-10 16:21:56 +08:00
sw 41679a8d5c 修改文件缺少时的提示 2015-01-10 16:20:36 +08:00
huang 293b3a3b42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-10 15:42:33 +08:00
huang f7c1b76b3d 用户反馈弹框模块! 2015-01-10 15:39:02 +08:00
alan fb6c297a37 Signed-off-by: alan <547533434@qq.com> 2015-01-10 11:46:39 +08:00
alan 575b641e25 merge dev_chuangbin
Signed-off-by: alan <547533434@qq.com>
2015-01-10 11:01:16 +08:00
zhuhao 92cf3d86cc Merge branch 'develop' into szzh 2015-01-09 16:05:38 +08:00
sw a30cc9bea8 修改文件缺少时的提示 2015-01-09 16:01:47 +08:00
sw 9ef3849fe3 如果缺少某一附件。在下载后的文件增加相关说明文档 2015-01-09 15:59:42 +08:00
sw 035d45ea5c 增加数据库访问配置文件 2015-01-07 10:12:03 +08:00
sw 805de7fc28 修改课程首页课程列表显示策略 2015-01-04 13:28:33 +08:00
z9hang 4b923ed483 修改导出作品列表的名称 2014-12-31 09:48:17 +08:00
z9hang d3f9f23465 修改课程列表导出的文件名 2014-12-31 09:05:21 +08:00
z9hang 35dce16924 课程成员列表excel导出 2014-12-30 17:49:48 +08:00
z9hang 899ac6f654 添加作品列表导出excel功能 2014-12-30 14:29:30 +08:00
sw 734216bbcd "截止了,可补交”改为“已截止,但可补交” 2014-12-24 09:48:09 +08:00
alan 6c09228139 根据凌彬设计修改学生列表样式
Signed-off-by: alan <547533434@qq.com>
2014-12-22 15:48:35 +08:00
alan 815d2ceb3d 添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
2014-12-19 23:12:32 +08:00
alan f9a86356ad 添加《重新发送激活邮件》功能to注册模块
Signed-off-by: alan <547533434@qq.com>
2014-12-19 10:51:53 +08:00
alan 1965b75d92 添加《学生列表按作业评分排序》功能
Signed-off-by: alan <547533434@qq.com>
2014-12-18 18:24:37 +08:00
alan 7c1b86556d 增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
2014-12-17 17:36:12 +08:00
sw 77d72039fe 取消启用assets,原因:启用后界面样式不对 2014-12-11 11:54:42 +08:00
sw 49341714ca 启动assets 2014-12-11 11:34:20 +08:00
sw cf5b03a379 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/views/courses/_member_list.html.erb
2014-12-10 17:56:50 +08:00
sw 66d8609c56 作业截止时间已到,此后提交的作品将记为迟交 -> 截止了,可补交 2014-12-10 09:44:03 +08:00
sw 9b5cbb0b4e #1696作业提交时间已过->作业截止时间已到,此后提交的作品将记为迟交。 2014-12-10 09:25:24 +08:00
alan 90a01c8d84 对新增功能《添加学生列表班内搜索和课内搜索》样式微调
Signed-off-by: alan <547533434@qq.com>
2014-12-09 15:16:43 +08:00
alan 5c33c578bb 增减功能《课程分班模块添加当分班中没有学生时,可以删除该分班》
Signed-off-by: alan <547533434@qq.com>
2014-12-08 16:50:20 +08:00
alan a6fc79a474 将分组改成分班
Signed-off-by: alan <547533434@qq.com>
2014-12-06 15:09:19 +08:00
sw c44eeb4ff8 修改项目成员显示为 Member 2014-12-06 13:51:47 +08:00
alan fbe6ce16d7 修改《分组界面》样式
Signed-off-by: alan <547533434@qq.com>
2014-12-05 23:34:16 +08:00
alan 9d0e39e708 修改孙涛提出的bug
Signed-off-by: alan <547533434@qq.com>
2014-12-05 16:03:41 +08:00
alan 020242a8c9 增减《查询显示人数以及显示全部人数》功能
Signed-off-by: alan <547533434@qq.com>
2014-12-05 11:27:51 +08:00
alan c9b84d0a35 增加《学生加入,退出分组》功能
Signed-off-by: alan <547533434@qq.com>
2014-12-04 22:02:10 +08:00
alan 66f93150f6 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group 2014-12-04 19:09:51 +08:00
alan 9765f11f7e 增加<修改,添加分组>功能
Signed-off-by: alan <547533434@qq.com>
2014-12-04 19:09:10 +08:00
alan 3d12d6f0e8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
	db/schema.rb
2014-12-03 19:20:25 +08:00
alan 615bc7d444 增加课程分组的功能
Signed-off-by: alan <547533434@qq.com>
2014-12-03 19:17:10 +08:00
sw 19b61118ac 修改加入按钮失败后变为加入课程按钮 2014-12-02 18:00:57 +08:00
zhuhao a7d7b790d2 公共页个性签名的提交按钮显示调整 2014-12-01 20:26:21 +08:00
zhuhao 05a5b18710 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-27 17:06:51 +08:00
z9hang f267a3daf8 引用课程中已有的资源时提示资源已存在 2014-11-26 16:51:09 +08:00
zhuhao da82a4e842 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-11-26 09:14:02 +08:00
sw 5bcc76d399 修改作业提交项目第一项为请选择 2014-11-25 10:35:43 +08:00
zhuhao 535ec333c3 显示字样的改动:项目改为课程 2014-11-24 15:36:58 +08:00