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

4494 Commits

Author SHA1 Message Date
sw bba213dec9 1.#1802 修复页面下方有很大一片空白 
2.修复系统文本框的padding、margin都为0
 2015-01-17 12:12:06 +08:00
z9hang 33fd43e7b6 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 12:04:29 +08:00
sw 4e19690887 1.修改取消编辑多行主观后多行主观从页面消失 
2.修改编辑后取消，第二次进入编辑却显示前一次编辑的结果 #1810 #1806
 2015-01-17 11:58:19 +08:00
z9hang 092dd61c86 修改修改资料处样式问题 2015-01-17 11:51:59 +08:00
huang e75193e35a Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 11:47:02 +08:00
alan 1602d2e439 Signed-off-by: alan <547533434@qq.com> 2015-01-17 11:46:45 +08:00
huang 0f5c3c5f4c 添加主观题统计页面及样式 2015-01-17 11:46:34 +08:00
alan b9ea3e589e 修改《邮件系统》页面 
Signed-off-by: alan <547533434@qq.com>
 2015-01-17 11:18:24 +08:00
sw e8f3bd4dbb Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-17 11:09:39 +08:00
sw e14deeb4dd 增加限制：问卷标题最多100字，问卷描述最多300字，问卷问题最多250字，问卷选项最多200字 2015-01-17 11:05:38 +08:00
z9hang 9487ce1245 #1807课程--问卷调查：答题多行主观后，再点击打开答题页面，如图，显示html元素<br> 2015-01-17 11:02:09 +08:00
huang 3acec4b7c1 修改了总统计数 2015-01-17 10:14:07 +08:00
sw f99d159ca1 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 17:34:52 +08:00
sw d16d5fd362 单行文字/多行文字 --> 单行主观/多行主观 2015-01-16 17:31:04 +08:00
alan 9c45e372b4 Merge remote-tracking branch 'remotes/origin/develop' into szzh 
Conflicts:
	app/views/layouts/base_newcontest.html.erb
 2015-01-16 17:24:45 +08:00
alan 479a1249ae Signed-off-by: alan <547533434@qq.com> 2015-01-16 17:23:35 +08:00
sw ae9856c01a 发布时弹出框js、css调整 2015-01-16 17:21:33 +08:00
huang b43e6558e1 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 16:48:46 +08:00
huang 59c21d81e9 修改了分母不能为0的bug 
统计结果精确到两位
 2015-01-16 16:48:20 +08:00
z9hang bbf4c4629b 问卷show页面国际化 2015-01-16 16:13:03 +08:00
sw 17b96bdb14 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:57:58 +08:00
sw 79ad33a90f 增加发布问卷的路由 2015-01-16 15:57:49 +08:00
z9hang e49dfefefb Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:51:41 +08:00
z9hang dd42c89ee6 百分比除数为0问题 2015-01-16 15:51:26 +08:00
huang 2cbe801528 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:49:41 +08:00
huang 7177303eeb 问卷统计最终效果 2015-01-16 15:49:22 +08:00
sw d448599664 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:34:43 +08:00
sw fe3a84c8db 实现添加多行文字 2015-01-16 15:34:25 +08:00
z9hang b8047bec28 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 15:32:33 +08:00
z9hang 0a367249ae 问卷完成度显示 2015-01-16 15:32:09 +08:00
sw 65a3ddce41 1、增加新增单行文字功能 
2、修改题目后总是显示为单选题
 2015-01-16 15:05:30 +08:00
sw f46c8e8adc 新建单选、多选取消之后无法继续新建的BUG 2015-01-16 14:47:09 +08:00
sw 164c89d7b8 1.实现添加多选题 
2.单选题、多选题后面增加括号提示
 2015-01-16 14:39:40 +08:00
sw dedb70c56b 显示问题增加多选、单行文字、多行文字的显示 2015-01-16 14:03:12 +08:00
sw 2954bba411 j进入新建、修改页面时，问卷头显示为可编辑 2015-01-16 13:54:06 +08:00
sw a5cf1576f1 将新增问题栏放到问题列表下面 2015-01-16 13:44:20 +08:00
huang b53686dfd7 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 11:19:01 +08:00
huang eacc1079b0 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 
Conflicts:
	app/controllers/poll_controller.rb
 2015-01-16 11:18:39 +08:00
sw a683acf85c 修复新建问卷时刷新页面，会新建一个问卷的BUG 2015-01-16 11:05:04 +08:00
z9hang d0117e5d03 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 11:02:07 +08:00
z9hang 0dc0ba3a4a 问卷显示权限管理 2015-01-16 10:59:25 +08:00
huang 34b8ffeb5b tongji 2015-01-16 10:51:08 +08:00
sw 40d6ebfd88 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-16 10:49:00 +08:00
sw 9fb0275563 1.增加修改单选题时页面js的刷新 
2.修改单选题时删除某些选项有误
 2015-01-16 10:43:05 +08:00
z9hang dc2c96f59a 提交后的问卷禁止查看与编辑 2015-01-16 10:19:38 +08:00
sw f41cd0a8ab 1.修改单选题业务逻辑处理 
2.删除选项时，单选题至少有一个选项
 2015-01-16 10:11:17 +08:00
alan 5191411508 <邮件加密自动登录功能，邮件附件下载功能> 
Signed-off-by: alan <547533434@qq.com>
 2015-01-15 18:48:19 +08:00
z9hang 933ad22cd2 修改提交问卷后提示框样式 2015-01-15 18:35:27 +08:00
z9hang 30a058133d Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-15 18:22:38 +08:00
z9hang e44cc07f86 提交问卷功能 2015-01-15 18:22:30 +08:00
sw c4bedfb369 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 
Conflicts:
	app/controllers/poll_controller.rb
 2015-01-15 18:22:05 +08:00
sw d55492b07a 增加修改单选题的路由、action、以及js 2015-01-15 18:17:45 +08:00
z9hang 77dc9607df 简答题答题 2015-01-15 17:36:30 +08:00
sw 5ec2789881 删除某一题目后，后面的题目序号自动-1，以及页面js的刷新 2015-01-15 17:26:56 +08:00
sw 3fab26214f 删除单选题后页面数据的删除，增加删除题目的路由及相关方法 2015-01-15 17:15:29 +08:00
sw 870f9bba98 必答按钮的数据存入 2015-01-15 16:50:06 +08:00
sw f78de71814 编辑单选题时页面js添加 2015-01-15 16:44:35 +08:00
sw 4edd9fee64 新增单选题取消后无法重新添加单选题 2015-01-15 16:33:11 +08:00
sw 5792bd77e5 实现新增单选题题时页面的刷新 2015-01-15 16:31:40 +08:00
sw a1f21f3ebb 1、修改一次添加一个题目 
2、新增题目时，新建题目获取焦点
3、新增题目后页面事件改变
 2015-01-15 16:10:24 +08:00
sw a99d7c5145 1、分离出新建问卷问题页面 
2、增加修改问题相关路由及action
 2015-01-15 14:40:17 +08:00
sw 4996b9a546 修复重复编辑问卷头会使问卷头信息显示不正确的BUG 2015-01-15 14:09:27 +08:00
sw 517c3d1ca5 修复部分情况下删除单选题题选项后，后面再添加的单选题与前面单选题name有重复的BUG 2015-01-15 13:58:50 +08:00
z9hang d684acf527 多选题答题功能 2015-01-15 11:54:30 +08:00
sw 496ef94b97 增加编辑头页面js 2015-01-15 11:05:19 +08:00
sw 20c160f03f 1、修改标题头、取消修改标题头数据的保存和页面的变更 2015-01-15 10:50:08 +08:00
z9hang d2fadfda08 单选题选择答案 2015-01-15 10:11:52 +08:00
z9hang 8dab2057a9 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 
Conflicts:
	config/routes.rb
 2015-01-15 09:42:41 +08:00
z9hang 6d82e79e7f 答题相关方法添加 2015-01-15 09:41:19 +08:00
lizanle 75ba61ed74 issue 1798 ,用户名出现不显示的情况 2015-01-14 16:42:12 +08:00
huang 2b0775da26 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 
Conflicts:
	db/schema.rb
 2015-01-14 16:37:45 +08:00
huang b63b4974eb 统计 2015-01-14 16:36:30 +08:00
sw 99ffc8a643 初始单选题有3个选项 2015-01-14 16:33:24 +08:00
sw 2a23eb8e17 1.增加单选题的显示 
2.去掉无用页面
 2015-01-14 16:15:33 +08:00
lizanle aca74bf937 Merge remote-tracking branch 'origin/dev_zanle' into szzh 
Conflicts:
	Gemfile
	app/views/welcome/index.html.erb
 2015-01-14 16:15:09 +08:00
alan 2bba0ddd70 添加《邮件加入附件下载功能及私有项目自动登录》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-14 16:08:56 +08:00
sw 0433f7c87f 增加新建单选题功能 2015-01-14 15:35:04 +08:00
sw 2af6121f82 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll 2015-01-14 14:24:08 +08:00
sw eb2498c62c 1.增加新增单选题、新增选项、删除选项等js 
2.修改问卷layout增加
3.增加新增单选题确定按钮的路由以及相关action
 2015-01-14 14:23:41 +08:00
z9hang b6826a74d3 问卷显示 2015-01-14 11:50:59 +08:00
sw e4edc5d1db 1.增加修改页面动态加载 
2.增加编辑完成后问卷头页面
3.增加问卷按钮的css样式
 2015-01-14 10:05:05 +08:00
z9hang 60b0743292 问卷调查页面在火狐中的显示问题 2015-01-14 09:48:19 +08:00
sw feb6dc139d 增加添加标题时js验证 2015-01-13 20:34:44 +08:00
sw 85542095a6 增加input为空时的提示，修改部分html错误 2015-01-13 20:20:28 +08:00
sw 311d90d565 1.增加点击单选、多选、单行文本、多行文本的js 
2.分割问卷标题头
3.增加新增问题的路由及action
 2015-01-13 20:13:50 +08:00
alan cd504f8978 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into develop 2015-01-13 18:24:30 +08:00
alan 2f147dcddd 增加《邮件地址自动登录功能》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-13 18:24:14 +08:00
sw c84b8f75cc 编辑问卷的页面的分割 2015-01-13 18:21:46 +08:00
sw 0a9509a921 新增问卷界面调整 2015-01-13 17:54:19 +08:00
sw e59e9cd661 增加新增问卷页面 2015-01-13 17:03:41 +08:00
sw 8503f0c803 根据最新设计页面，修改页面显示样式，调整css代码 2015-01-13 16:58:44 +08:00
sw c856005803 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-13 16:36:29 +08:00
sw 86b18f1cb3 修改课程--匿评提示窗口有两个关闭窗口的图标按钮 2015-01-13 16:36:10 +08:00
z9hang f0cac221e9 修正作业详情接口 2015-01-13 16:00:17 +08:00
sw fc72d6f9a9 1.增加问卷统计、问卷答卷等页面跳转，并增加对应路由 
2.调整页面样式
3.动态分页
 2015-01-13 15:59:02 +08:00
z9hang 8f8919c9fd Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2015-01-13 15:13:12 +08:00
z9hang 0f9915fc2a Merge branch 'szzh' into api 
Conflicts:
	Gemfile
	Gemfile.lock
	app/controllers/bids_controller.rb
	app/controllers/users_controller.rb
	db/schema.rb
 2015-01-13 15:12:05 +08:00
sw d8e6b4a92f 学生取消新建问卷按钮显示 
修改问卷总数显示不正确
 2015-01-13 11:54:07 +08:00
sw a18fa10de5 1.增加老师和学生显示界面的区别 
2.增加分页的动态显示，以及分页相关css修改
 2015-01-13 11:44:28 +08:00
sw 32219bd850 增加访问权限控制 2015-01-13 10:23:26 +08:00
zhuhao a70e0ccadd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-12 17:57:45 +08:00
zhuhao 7ac6d0467f 修改资料form表单对齐 2015-01-12 17:57:32 +08:00
alan 8217e37516 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-12 17:56:24 +08:00
alan 90925edce2 修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-12 17:56:09 +08:00
sw d0dc01b992 增加问卷修改功能，以及相关js 2015-01-12 17:55:22 +08:00
z9hang 525cf10376 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-12 17:34:51 +08:00
z9hang 6efe9ff5c6 注释掉无用的方法调用 2015-01-12 17:34:26 +08:00
sw 450c4b203d 增加新建问卷按钮功能 2015-01-12 17:30:33 +08:00
sw f54cf53663 1.问卷列表页面动态显示， 
2.问卷调查页面引起base_course的样式显示不正确
 2015-01-12 17:25:48 +08:00
hhuai 8ecdaf2fe8 merge 2015-01-12 17:20:35 +08:00
hhuai 5c9f1a1e1b merge 2015-01-12 17:19:18 +08:00
sw d2dfff33d0 课程页面增加问卷调查的链接 2015-01-12 17:01:39 +08:00
sw 475b046898 修改访问poll#index报ArgumentError 2015-01-12 16:56:53 +08:00
sw 1c24a306fe 去掉无用的control 2015-01-12 16:37:23 +08:00
sw c964194d85 增加问卷调查相关的路由、action、以及部分对应的页面 2015-01-12 16:02:15 +08:00
sw 9604117e93 Merge branch 'develop' into szzh 2015-01-12 15:45:53 +08:00
alan 9f807438d6 教师数目显示：-1 ，同时动态大量不显示。是不是只显示近期3个月的？ 
Signed-off-by: alan <547533434@qq.com>
 2015-01-12 14:58:11 +08:00
guange 828f57249c merger 2015-01-10 21:32:23 +08:00
guange da880dae00 作业展示 2015-01-10 21:31:16 +08:00
sw 90349eed5d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop 2015-01-10 18:31:06 +08:00
sw 6fc496c8ee Merge branch 'szzh' into develop 2015-01-10 18:22:54 +08:00
huang 2cd805ef4c 去掉课程单独的弹框 2015-01-10 18:17:36 +08:00
alan 296d88c14d Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-10 18:02:03 +08:00
alan 74af44a826 修改《修改个人资料页面》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-10 18:01:41 +08:00
sw bf7eaa7a80 修复同一个学生提交相同的文件后，打包下载异常的BUG 2015-01-10 17:41:50 +08:00
alan a31088cc1b Signed-off-by: alan <547533434@qq.com> 2015-01-10 17:27:08 +08:00
alan 3db80fc3fc 修改《contest链接bug》 2015-01-10 17:02:23 +08:00
sw f101037b26 Merge branch 'szzh' into develop 2015-01-10 15:59:56 +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
z9hang 666facd483 Merge branch 'szzh' into develop 2015-01-10 14:40:45 +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
sw f4e30f77cc 1.打包下载异常捕获去除 
2.打包下载寻找课程、项目方法隐藏
 2015-01-10 10:55:37 +08:00
alan 6c9f5136c0 修改《竞赛主页显示错误》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-10 10:37:32 +08:00
alan d96843a1d5 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-09 19:11:00 +08:00
alan 576f799105 Signed-off-by: alan <547533434@qq.com> 2015-01-09 19:09:19 +08:00
alan 725866a23d Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-09 17:04:32 +08:00
alan c9e23ec52f 修改《创建作业页面》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-09 17:03:58 +08:00
zhuhao 92cf3d86cc Merge branch 'develop' into szzh 2015-01-09 16:05:38 +08:00
sw 9ef3849fe3 如果缺少某一附件。在下载后的文件增加相关说明文档 2015-01-09 15:59:42 +08:00
sw 82c2a659df 修复当作业打包下载时，某一文件不存在时，跳过该文件继续下载其他的文件 2015-01-09 15:33:30 +08:00
lizanle 3047b523b0 add expire_helper and change the code way of set cache expire! 2015-01-09 15:28:43 +08:00
alan 3f354a019f 修改（个人主页个人签名格式乱了） 
Signed-off-by: alan <547533434@qq.com>
 2015-01-09 14:14:15 +08:00
alan 53b57d4c53 修改《个人主页积分弹框显示错误》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-09 12:29:49 +08:00
alan 4b9bad0dc5 修改《若有某公开课程courseA，在课程主页中搜索courseA跳转到搜索结果界面，相关链接没有对齐》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-09 10:57:33 +08:00
alan d095aed7a3 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2015-01-09 10:22:49 +08:00
alan 2dc626b595 修改《学生列表中重名的班名提示报错》 
Signed-off-by: alan <547533434@qq.com>
 2015-01-09 10:22:30 +08:00
sw 7ae9556404 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-08 17:44:17 +08:00
sw ee9d82bfc7 1.实现文件调查的model、control、view的架构 
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
 2015-01-08 17:42:46 +08:00
zhuhao a2c2266590 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-01-08 17:05:27 +08:00
zhuhao aae69417cd 标签按钮样式修改 2015-01-08 17:05:08 +08:00
alan 9bbc8d64eb 课程母版页加载缓慢 
Signed-off-by: alan <547533434@qq.com>
 2015-01-08 17:04:25 +08:00
alan 2262997c31 修改《新建课程时：课程名中有空格或者特殊符号会提示名称无效,》 
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题，例如个人主页左侧的信息，具体如图所示》
    《本地版中关于学生列表的分组出现的问题：当前已存在A组，再次添加A组应给出提示“A组已存在”，该功能目前只有在学生列表首次加载时才正常》
   《托管，课程，竞赛主页中任意点击某一项目，进入该项目主页，右上角的搜索按钮风格和大小不统一。》
   《进入某竞赛主页，点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
 2015-01-08 16:16:59 +08:00
sw 4c6ade4c08 定义各model之间的关系 2015-01-08 14:41:28 +08:00
sw c9de30bd83 增加问卷调查相关表，以及对应的model、control、view的文件夹 2015-01-08 12:00:43 +08:00
alanlong9278 da85c3efb8 进入某竞赛主页，点击创新竞赛链接没反应 2015-01-07 17:48:22 +08:00
alanlong9278 d212a20bbf IE浏览器中：课程，竞赛，托管平台的主页不能正常显示 2015-01-07 17:28:45 +08:00
z9hang fd1dc80bf0 修改作业详情接口 2015-01-07 16:02:16 +08:00
z9hang fdb38c1b87 修复课程教师，课程学生接口 2015-01-07 15:24:43 +08:00
z9hang 303752fc7e 修复退出课程接口 2015-01-07 11:37:48 +08:00
z9hang b711793d7c 修正加入课程接口问题 2015-01-07 11:20:27 +08:00
sw 2277d388c0 修改了两处语法错误 2015-01-07 09:37:35 +08:00
lizanle 10cde37582 cache using version 2015-01-07 09:27:44 +08:00
z9hang d407f8656d 1、修复课程img_url为空问题。2、补上用户课程接口 2015-01-06 17:46:16 +08:00
z9hang 1686ed4fbd 补上显示用户接口 2015-01-06 16:59:22 +08:00
z9hang ed776fa9b9 1、修正用户编辑接口报错问题。2、修正用户注册，编辑用户接口返回数据不正确问题 2015-01-06 16:51:44 +08:00
z9hang 2c49dad4dc Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2015-01-06 15:49:24 +08:00
guange 59f687bb6a added homework 2015-01-05 19:53:25 +08:00
z9hang 58c31b1d7f Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2015-01-05 17:47:14 +08:00
z9hang f252438f85 修改编辑课程接口 2015-01-05 17:47:04 +08:00
guange b1125e7d7e 编辑课程改为put 2015-01-05 17:45:47 +08:00
guange a3ed599d49 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2015-01-05 17:45:14 +08:00
z9hang f55d8fe303 1、修正新建课程接口无效问题。2、修正新建课程接口返回的数据中课程名称错误问题 2015-01-05 16:58:11 +08:00
z9hang b5da95d5ce 修改错误 2015-01-05 10:15:14 +08:00
sw a09a3dc378 课程首页： 1-3月份显示上一年度的秋季学期的课程， 3-9月份显示本年度的春季学期课程， 9-12月份显示本年度的秋季学期的课程 2015-01-04 15:06:26 +08:00
guange d97b26f131 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2015-01-04 14:55:53 +08:00
guange d7cad23854 加上作业 2015-01-04 14:55:45 +08:00
sw 805de7fc28 修改课程首页课程列表显示策略 2015-01-04 13:28:33 +08:00
hhuai d1846e6303 for update 2015-01-04 11:53:16 +08:00
alan 394beedcc2 <课程首页>bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-01 09:56:18 +08:00
alan 43511c8e97 修改《课程首页按年份显示》bug 
Signed-off-by: alan <547533434@qq.com>
 2015-01-01 09:38:21 +08:00
alan c1705bd65b 增加《导入student_for_course数据》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 17:02:55 +08:00
sw fc7447ba6b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-31 16:01:18 +08:00
sw 9fc7ed8233 修复老师第一次评分报错问题的BUG 2014-12-31 16:00:45 +08:00
z9hang 7741e7bd37 非当前老师提交的资源显示引入我的其他课程 2014-12-31 15:58:21 +08:00
alan 275d691b13 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/controllers/homework_attach_controller.rb
	app/views/courses/_member_list.html.erb

Signed-off-by: alan <547533434@qq.com>
 2014-12-31 15:50:19 +08:00
alan ba524675e0 修改<打分更新表单>bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 15:48:45 +08:00
sw 16201f79cf 去掉首页更新提示 2014-12-31 15:47:43 +08:00
sw 06d4d2f465 修复老师列表加入时间和实际时间未对齐 2014-12-31 14:41:33 +08:00
sw 77e8d412ea 修改评分列表中教师评分未最后一名教师的评分 2014-12-31 11:18:22 +08:00
sw 3dc7c55aef 去除评分时部分重复查询 2014-12-31 10:45:21 +08:00
alan 7a727bfed7 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-31 10:23:36 +08:00
alan 486f0b69b1 数据迁移student_for_course的数据 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 10:23:21 +08:00
sw 171d743fa1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-31 10:10:31 +08:00
sw b79ec2b50f #1761 修复关闭匿评不可用 2014-12-31 10:09:00 +08:00
z9hang 4b923ed483 修改导出作品列表的名称 2014-12-31 09:48:17 +08:00
z9hang 42b3fd9584 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-31 09:05:30 +08:00
z9hang d3f9f23465 修改课程列表导出的文件名 2014-12-31 09:05:21 +08:00
alan 23140307aa 实现<去存储过程功能，并修改打分的表更新> 
Signed-off-by: alan <547533434@qq.com>
 2014-12-31 08:48:14 +08:00
z9hang 35dce16924 课程成员列表excel导出 2014-12-30 17:49:48 +08:00
sw a07bb18dcb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-12-30 15:39:23 +08:00
sw d08bce46dd 调整页面代码 2014-12-30 14:52:44 +08:00
= 098b8094b1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-30 14:35:57 +08:00
= 305cbae008 维护浮动框 2014-12-30 14:35:35 +08:00
z9hang 101be35f19 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-30 14:29:41 +08:00
z9hang 899ac6f654 添加作品列表导出excel功能 2014-12-30 14:29:30 +08:00
sw 66d67e2cc9 修改通知界面主题最多为60个字符 2014-12-30 14:14:20 +08:00
alan 6a86e1c386 <分组点击两次>bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-30 14:00:48 +08:00
sw 933a84f51d 项目、课程主页用户搜索后结果界面也支持按姓名、昵称、邮箱搜索 2014-12-30 11:09:47 +08:00
sw ee1df78f13 课程、项目首页增加用户姓名、邮箱、昵称等搜索功能 2014-12-30 10:57:39 +08:00
sw 0bce2ae8f3 #1752“竞赛通知”，“参加竞赛”时,左侧以及上方布局不同 2014-12-30 09:48:30 +08:00
alan 36eca5e425 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-29 20:46:41 +08:00
alan e39e801c61 增加《学生列表按作业评分排序功能》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-29 20:46:27 +08:00
z9hang 058d19f8d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-29 17:45:05 +08:00
z9hang 61e1f0fa52 导出作品列表功能 2014-12-29 17:44:39 +08:00
sw 3545a8b0bc 修改竞赛评分显示异常 2014-12-29 17:34:07 +08:00
sw 05b9b26314 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	db/schema.rb
 2014-12-29 17:00:35 +08:00
sw 70083789cb 1.修复匿评列表查询有错 
2.修复当身份改变时修改分数初始分数为之前身份的评分，修改为修改之前身份的评分的BUG
3.是否已经评分判断增加在当前角色下是否已经评分
 2014-12-29 16:59:22 +08:00
alan 9ba0c75ddb Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-29 16:57:47 +08:00
alan fb398904b6 优化《学生列表》分页查询 
Signed-off-by: alan <547533434@qq.com>
 2014-12-29 16:57:31 +08:00
z9hang cd6508efa2 提交部分代码 2014-12-29 16:30:39 +08:00
sw aa06251fd3 修改当用户角色改变时，该用户评分所属角色也跟着改变的BUG 2014-12-29 16:03:21 +08:00
z9hang 4161c42c54 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-29 15:30:54 +08:00
z9hang 3f6b36096c 缺陷查询添加integer_done类型处理（暂未用上） 2014-12-29 11:54:31 +08:00
sw 259799eb89 1.增加评分的model 
2.修改评分表中为教师评分的历史数据的is_teacher_score的值
 2014-12-29 11:38:35 +08:00
sw afbcc3f8d3 1.#1742 首次加载课程实践平台主页时，点击“加入课程”快捷通道，课程ID默认是当前登录用户名，口令默认为当前登录用户密码 
2.修改加入课程弹出框样式
 2014-12-29 10:42:48 +08:00
alan 329be27567 增加《分班查询》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-26 17:31:01 +08:00
alan 6192a36481 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-26 15:51:53 +08:00
alan b79b08fa8f 编写《作业查询存储过程》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-26 15:51:39 +08:00
sw 2e1387b9e4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-26 15:37:22 +08:00
z9hang 68cadba317 #1710 测试版--项目--作品下载：选择任意内容类型、文件类型，都弹出error的提示框 2014-12-26 15:35:38 +08:00
alan d2aef552e6 优化《作业评分》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-26 14:50:14 +08:00
sw f549530744 取消课程动态中描述显示为最多30个字母或汉字的限制 2014-12-25 17:36:53 +08:00
alan f8dc9dcd35 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 
Conflicts:
	app/controllers/courses_controller.rb
 2014-12-25 10:31:11 +08:00
alan b17d4840b1 《作业优化》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-25 10:23:59 +08:00
sw 9545b1da0c 优化课程成员列表访问效率 2014-12-25 09:02:58 +08:00
sw a3910477e4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-25 08:40:14 +08:00
alan 0e7f7a4254 优化《作业评分》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-24 18:31:45 +08:00
sw b0c2958a72 修复作业倒计时和截至提示未和提交作业按钮对齐 2014-12-24 17:25:16 +08:00
sw 92c7ba49d1 修复作业倒计时和截至提示未和提交作业按钮对齐 2014-12-24 17:24:25 +08:00
sw a89eb1c7b3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-24 16:21:34 +08:00
alan 8e87e83ad8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-24 15:55:16 +08:00
alan abdd6458d3 优化《作业评分》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-24 15:55:08 +08:00
sw 63bc66adc3 修复关联版本库会默认登录帐号密码的BUG 2014-12-24 11:12:12 +08:00
sw 98cfeeee82 #1050 wiki界面部分意思不明确的按钮隐藏 2014-12-24 10:20:41 +08:00
sw 819c4c0bc1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 
Conflicts:
	app/controllers/users_controller.rb
 2014-12-24 09:45:23 +08:00
sw e6aab5baf2 #1650 老师应该可以删除自己课程的留言，或帖子 2014-12-24 09:30:45 +08:00
sw b512bc53e9 修改用户搜索无法精确搜索的bUG 2014-12-24 09:08:42 +08:00
z9hang 550577e942 修改编辑用户接口的返回值 2014-12-23 17:43:53 +08:00
alan 6e0311d928 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-23 17:38:03 +08:00
alan 2a94c61a3e 修改bug(项目--缺陷：更新图片时在历史记录中没有相关记录，删除图片只显示一个更新时间也不合理) 
Signed-off-by: alan <547533434@qq.com>
 2014-12-23 17:37:45 +08:00
z9hang 40d06011f8 修改用户的课程列表接口 2014-12-23 15:54:57 +08:00
z9han 4518fe4355 test 2014-12-23 15:35:22 +08:00
z9han 5ee37f32e2 课程学生列表、教师列表接口报错问题 2014-12-23 15:24:18 +08:00
sw 3caf5c8657 #1736 猎豹浏览器中，打开某竞赛，进入竞赛主页看到右上方搜索按钮下移了 2014-12-23 15:18:55 +08:00
sw 30d8d82f37 #1734 某竞赛主页中当搜索框为空时，点击搜索的提示问题 2014-12-23 15:13:16 +08:00
z9han d7557e2839 修改密码返回错误问题 2014-12-23 14:46:23 +08:00
z9han 93762e89d3 修改加入课程、退出课程接口调用，添加创建课程，编辑课程的参数说明 2014-12-23 11:07:17 +08:00
sw f834759d84 #1709测试版--课程--加入课程：成功加入课程，还是显示为“加入”，需手动刷新页面 2014-12-23 11:05:31 +08:00
guange 7f1826ebf2 修改个人信息 2014-12-23 10:22:05 +08:00
guange 9d99eee92e 用户密码修改没传userid 2014-12-23 10:16:23 +08:00
guange d6aadc1624 搜索和列表中的课程老师输出一致 2014-12-23 10:05:29 +08:00
guange 8fe5fee0f0 搜索课程报错 2014-12-23 09:44:31 +08:00
sw f68e62d1c1 修改403、404的html错误 2014-12-23 09:33:39 +08:00
sw 053edb7934 #1730 修改课程作业中，当作业名字过长时显示不能换行，贴近按钮显示 2014-12-22 17:22:22 +08:00
zhuhao 8bd42054d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-22 17:13:36 +08:00
zhuhao 61a859f91a 托管平台项目主业搜索按钮样式调整 2014-12-22 17:12:59 +08:00
alan b8e00e16df Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-22 17:02:49 +08:00
alan 629641d065 《调整学生列表页面》和《优化个人主页查询》 
Signed-off-by: alan <547533434@qq.com>
 2014-12-22 17:02:32 +08:00
z9han 7f57bd97ff Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-22 16:17:07 +08:00
z9han 67ffc03fee #1708 课程--资源库：非课程成员可以引用私有课程里面的公开资源,改为提示没有权限引用 2014-12-22 16:16:33 +08:00
alan 2084a17191 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-22 15:48:51 +08:00
alan 6c09228139 根据凌彬设计修改学生列表样式 
Signed-off-by: alan <547533434@qq.com>
 2014-12-22 15:48:35 +08:00
z9han b143093e49 1、#1707 课程--资源库：全站搜索得到当前作业模块的资源，应显示为“选入我的课程”.2、公开私有字样未居中问题 2014-12-22 15:45:55 +08:00
sw 73afb7e6c8 调用作业课程时首先判断该作业的所属课程是否存在 2014-12-22 14:15:49 +08:00
alan c99af4cb7b 修改《个人主页出现没权限访问链接》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-22 11:26:21 +08:00
alan 683acfcafc 优化《学生列表作业评分查询太慢》功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-22 10:31:09 +08:00
alan d81240e63c 修改《关注老师后，老师发布的作业都会在我主页的动态中显示出来，若我未加入该课程但感兴趣点击后返回403页面，提示不够人性化》bug 
Signed-off-by: alan <547533434@qq.com>
 2014-12-22 01:29:53 +08:00
= 57091b34f4 老师、学生匿评列表 2014-12-20 13:00:13 +08:00
alan 49cb52146f Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-19 23:12:46 +08:00
alan 815d2ceb3d 添加《添加相同组时应该给出相关提示信息》功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-19 23:12:32 +08:00
sw d6d7331ec6 修改竞赛中搜索，搜索条件可以为空，且为空时搜出所有竞赛 2014-12-19 14:45:50 +08:00
sw c6be2317a7 项目搜索，增加搜索条件不能为空的提示 2014-12-19 14:39:24 +08:00
sw ff49fbe5c8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-19 11:23:50 +08:00
sw 4e2fe44d10 修改js验证事件，由失去焦点事件改为文本改变事件 2014-12-19 11:23:16 +08:00
alan f9a86356ad 添加《重新发送激活邮件》功能to注册模块 
Signed-off-by: alan <547533434@qq.com>
 2014-12-19 10:51:53 +08:00
alan c560ca617b Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh 2014-12-18 18:25:02 +08:00
alan 1965b75d92 添加《学生列表按作业评分排序》功能 
Signed-off-by: alan <547533434@qq.com>
 2014-12-18 18:24:37 +08:00
= 226d5e9889 修改作业详、匿评 
新增作品留言
 2014-12-18 17:20:21 +08:00
sw dc9f5d0730 修该讨论区帖子时，如描述为空，跳转到edit页面改为js报错 2014-12-18 16:02:33 +08:00
sw 0f9a82637e #1716 课程讨论区-发布新贴点2次才能成功 2014-12-18 15:58:33 +08:00
sw b6327460a8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2014-12-18 15:49:49 +08:00
sw 1fbd2e95d4 #1719 修改竞赛搜索之后标题栏错位的BUG 
修改竞赛搜索之后，置空再搜索跳转到404
 2014-12-18 15:39:32 +08:00
sw 3dfb0358c1 #1718 修复作品下载添加标签框不能正常显示 2014-12-18 14:53:21 +08:00
= 93c7deebc4 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api 2014-12-18 14:51:37 +08:00
= 53d85136a3 修改课程中一个错误，完善匿评 2014-12-18 14:48:14 +08:00
guange 03f2c9c192 关注返回规范化 2014-12-18 13:37:23 +08:00
sw 7f153ac982 #1726 取消作业列表界面学生提问显示 2014-12-18 10:40:25 +08:00
sw 5ad2d22f98 #1724 修复部分用户在课程列表中有2个退出课程的按钮 2014-12-18 09:58:16 +08:00