Commit Graph

4396 Commits (0232826a6e2b1017596f626a567fc69c6cb3d2b2)

Author SHA1 Message Date
alan 5191411508 <邮件加密自动登录功能,邮件附件下载功能>
11 years ago
z9hang 933ad22cd2 修改提交问卷后提示框样式
11 years ago
z9hang 30a058133d Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
z9hang e44cc07f86 提交问卷功能
11 years ago
sw c4bedfb369 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
sw d55492b07a 增加修改单选题的路由、action、以及js
11 years ago
z9hang 77dc9607df 简答题答题
11 years ago
sw 5ec2789881 删除某一题目后,后面的题目序号自动-1,以及页面js的刷新
11 years ago
sw 3fab26214f 删除单选题后页面数据的删除,增加删除题目的路由及相关方法
11 years ago
sw 870f9bba98 必答按钮的数据存入
11 years ago
sw f78de71814 编辑单选题时页面js添加
11 years ago
sw 4edd9fee64 新增单选题取消后无法重新添加单选题
11 years ago
sw 5792bd77e5 实现新增单选题题时页面的刷新
11 years ago
sw a1f21f3ebb 1、修改一次添加一个题目
11 years ago
sw a99d7c5145 1、分离出新建问卷问题页面
11 years ago
sw 4996b9a546 修复重复编辑问卷头会使问卷头信息显示不正确的BUG
11 years ago
sw 517c3d1ca5 修复部分情况下删除单选题题选项后,后面再添加的单选题与前面单选题name有重复的BUG
11 years ago
z9hang d684acf527 多选题答题功能
11 years ago
sw 496ef94b97 增加编辑头页面js
11 years ago
sw 20c160f03f 1、修改标题头、取消修改标题头数据的保存和页面的变更
11 years ago
z9hang d2fadfda08 单选题选择答案
11 years ago
z9hang 8dab2057a9 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
z9hang 6d82e79e7f 答题相关方法添加
11 years ago
lizanle 75ba61ed74 issue 1798 ,用户名出现不显示的情况
11 years ago
huang 2b0775da26 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
huang b63b4974eb 统计
11 years ago
sw 99ffc8a643 初始单选题有3个选项
11 years ago
sw 2a23eb8e17 1.增加单选题的显示
11 years ago
lizanle aca74bf937 Merge remote-tracking branch 'origin/dev_zanle' into szzh
11 years ago
alan 2bba0ddd70 添加《邮件加入附件下载功能及私有项目自动登录》
11 years ago
sw 0433f7c87f 增加新建单选题功能
11 years ago
sw 2af6121f82 Merge branch 'Poll' of http://repository.trustie.net/xianbo/trustie2 into Poll
11 years ago
sw eb2498c62c 1.增加新增单选题、新增选项、删除选项等js
11 years ago
z9hang b6826a74d3 问卷显示
11 years ago
sw e4edc5d1db 1.增加修改页面动态加载
11 years ago
z9hang 60b0743292 问卷调查页面在火狐中的显示问题
11 years ago
sw feb6dc139d 增加添加标题时js验证
11 years ago
sw 85542095a6 增加input为空时的提示,修改部分html错误
11 years ago
sw 311d90d565 1.增加点击单选、多选、单行文本、多行文本的js
11 years ago
alan cd504f8978 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into develop
11 years ago
alan 2f147dcddd 增加《邮件地址自动登录功能》
11 years ago
sw c84b8f75cc 编辑问卷的页面的分割
11 years ago
sw 0a9509a921 新增问卷界面调整
11 years ago
sw e59e9cd661 增加新增问卷页面
11 years ago
sw 8503f0c803 根据最新设计页面,修改页面显示样式,调整css代码
11 years ago
sw c856005803 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 86b18f1cb3 修改课程--匿评提示窗口有两个关闭窗口的图标按钮
11 years ago
z9hang f0cac221e9 修正作业详情接口
11 years ago
sw fc72d6f9a9 1.增加问卷统计、问卷答卷等页面跳转,并增加对应路由
11 years ago
z9hang 8f8919c9fd Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
11 years ago
z9hang 0f9915fc2a Merge branch 'szzh' into api
11 years ago
sw d8e6b4a92f 学生取消新建问卷按钮显示
11 years ago
sw a18fa10de5 1.增加老师和学生显示界面的区别
11 years ago
sw 32219bd850 增加访问权限控制
11 years ago
zhuhao a70e0ccadd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
zhuhao 7ac6d0467f 修改资料form表单对齐
11 years ago
alan 8217e37516 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 90925edce2 修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug
11 years ago
sw d0dc01b992 增加问卷修改功能,以及相关js
11 years ago
z9hang 525cf10376 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6efe9ff5c6 注释掉无用的方法调用
11 years ago
sw 450c4b203d 增加新建问卷按钮功能
11 years ago
sw f54cf53663 1.问卷列表页面动态显示,
11 years ago
hhuai 8ecdaf2fe8 merge
11 years ago
hhuai 5c9f1a1e1b merge
11 years ago
sw d2dfff33d0 课程页面增加问卷调查的链接
11 years ago
sw 475b046898 修改访问poll#index报ArgumentError
11 years ago
sw 1c24a306fe 去掉无用的control
11 years ago
sw c964194d85 增加问卷调查相关的路由、action、以及部分对应的页面
11 years ago
sw 9604117e93 Merge branch 'develop' into szzh
11 years ago
alan 9f807438d6 教师数目显示:-1 ,同时动态大量不显示。是不是只显示近期3个月的?
11 years ago
guange 828f57249c merger
11 years ago
guange da880dae00 作业展示
11 years ago
sw 90349eed5d Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
sw 6fc496c8ee Merge branch 'szzh' into develop
11 years ago
huang 2cd805ef4c 去掉课程单独的弹框
11 years ago
alan 296d88c14d Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 74af44a826 修改《修改个人资料页面》bug
11 years ago
sw bf7eaa7a80 修复同一个学生提交相同的文件后,打包下载异常的BUG
11 years ago
alan a31088cc1b Signed-off-by: alan <547533434@qq.com>
11 years ago
alan 3db80fc3fc 修改《contest链接bug》
11 years ago
sw f101037b26 Merge branch 'szzh' into develop
11 years ago
huang 293b3a3b42 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
huang f7c1b76b3d 用户反馈弹框模块!
11 years ago
z9hang 666facd483 Merge branch 'szzh' into develop
11 years ago
alan fb6c297a37 Signed-off-by: alan <547533434@qq.com>
11 years ago
alan 575b641e25 merge dev_chuangbin
11 years ago
sw f4e30f77cc 1.打包下载异常捕获去除
11 years ago
alan 6c9f5136c0 修改《竞赛主页显示错误》
11 years ago
alan 725866a23d Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan c9e23ec52f 修改《创建作业页面》bug
11 years ago
zhuhao 92cf3d86cc Merge branch 'develop' into szzh
11 years ago
sw 9ef3849fe3 如果缺少某一附件。在下载后的文件增加相关说明文档
11 years ago
sw 82c2a659df 修复当作业打包下载时,某一文件不存在时,跳过该文件继续下载其他的文件
11 years ago
lizanle 3047b523b0 add expire_helper and change the code way of set cache expire!
11 years ago
alan 3f354a019f 修改(个人主页个人签名格式乱了)
11 years ago
alan 53b57d4c53 修改《个人主页积分弹框显示错误》bug
11 years ago
alan 4b9bad0dc5 修改《若有某公开课程courseA,在课程主页中搜索courseA跳转到搜索结果界面,相关链接没有对齐》bug
11 years ago
alan d095aed7a3 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 2dc626b595 修改《学生列表中重名的班名提示报错》
11 years ago
sw 7ae9556404 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw ee9d82bfc7 1.实现文件调查的model、control、view的架构
11 years ago
zhuhao a2c2266590 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
zhuhao aae69417cd 标签按钮样式修改
11 years ago
alan 9bbc8d64eb 课程母版页加载缓慢
11 years ago
alan 2262997c31 修改《新建课程时:课程名中有空格或者特殊符号会提示名称无效,》
11 years ago
sw 4c6ade4c08 定义各model之间的关系
11 years ago
sw c9de30bd83 增加问卷调查相关表,以及对应的model、control、view的文件夹
11 years ago
alanlong9278 da85c3efb8 进入某竞赛主页,点击创新竞赛链接没反应
11 years ago
alanlong9278 d212a20bbf IE浏览器中:课程,竞赛,托管平台的主页不能正常显示
11 years ago
z9hang fd1dc80bf0 修改作业详情接口
11 years ago
z9hang fdb38c1b87 修复课程教师,课程学生接口
11 years ago
z9hang 303752fc7e 修复退出课程接口
11 years ago
z9hang b711793d7c 修正加入课程接口问题
11 years ago
sw 2277d388c0 修改了两处语法错误
11 years ago
lizanle 10cde37582 cache using version
11 years ago
z9hang d407f8656d 1、修复课程img_url为空问题。2、补上用户课程接口
11 years ago
z9hang 1686ed4fbd 补上显示用户接口
11 years ago
z9hang ed776fa9b9 1、修正用户编辑接口报错问题。2、修正用户注册,编辑用户接口返回数据不正确问题
11 years ago
z9hang 2c49dad4dc Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
11 years ago
guange 59f687bb6a added homework
11 years ago
z9hang 58c31b1d7f Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
11 years ago
z9hang f252438f85 修改编辑课程接口
11 years ago
guange b1125e7d7e 编辑课程改为put
11 years ago
guange a3ed599d49 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
11 years ago
z9hang f55d8fe303 1、修正新建课程接口无效问题。2、修正新建课程接口返回的数据中课程名称错误问题
11 years ago
z9hang b5da95d5ce 修改错误
11 years ago
sw a09a3dc378 课程首页: 1-3月份显示上一年度的秋季学期的课程, 3-9月份显示本年度的春季学期课程, 9-12月份显示本年度的秋季学期的课程
11 years ago
guange d97b26f131 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
11 years ago
guange d7cad23854 加上作业
11 years ago
sw 805de7fc28 修改课程首页课程列表显示策略
11 years ago
hhuai d1846e6303 for update
11 years ago
alan 394beedcc2 <课程首页>bug
11 years ago
alan 43511c8e97 修改《课程首页按年份显示》bug
11 years ago
alan c1705bd65b 增加《导入student_for_course数据》
11 years ago
sw fc7447ba6b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 9fc7ed8233 修复老师第一次评分报错问题的BUG
11 years ago
z9hang 7741e7bd37 非当前老师提交的资源显示引入我的其他课程
11 years ago
alan 275d691b13 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan ba524675e0 修改<打分更新表单>bug
11 years ago
sw 16201f79cf 去掉首页更新提示
11 years ago
sw 06d4d2f465 修复老师列表加入时间和实际时间未对齐
11 years ago
sw 77e8d412ea 修改评分列表中教师评分未最后一名教师的评分
11 years ago
sw 3dc7c55aef 去除评分时部分重复查询
11 years ago
alan 7a727bfed7 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 486f0b69b1 数据迁移student_for_course的数据
11 years ago
sw 171d743fa1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw b79ec2b50f #1761 修复关闭匿评不可用
11 years ago
z9hang 4b923ed483 修改导出作品列表的名称
11 years ago
z9hang 42b3fd9584 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang d3f9f23465 修改课程列表导出的文件名
11 years ago
alan 23140307aa 实现<去存储过程功能,并修改打分的表更新>
11 years ago
z9hang 35dce16924 课程成员列表excel导出
11 years ago
sw a07bb18dcb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw d08bce46dd 调整页面代码
11 years ago
= 098b8094b1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
= 305cbae008 维护浮动框
11 years ago
z9hang 101be35f19 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 899ac6f654 添加作品列表导出excel功能
11 years ago
sw 66d67e2cc9 修改通知界面主题最多为60个字符
11 years ago
alan 6a86e1c386 <分组点击两次>bug
11 years ago
sw 933a84f51d 项目、课程主页用户搜索后结果界面也支持按姓名、昵称、邮箱搜索
11 years ago
sw ee1df78f13 课程、项目首页增加用户姓名、邮箱、昵称等搜索功能
11 years ago
sw 0bce2ae8f3 #1752“竞赛通知”,“参加竞赛”时,左侧以及上方布局不同
11 years ago
alan 36eca5e425 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan e39e801c61 增加《学生列表按作业评分排序功能》
11 years ago
z9hang 058d19f8d5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 61e1f0fa52 导出作品列表功能
11 years ago
sw 3545a8b0bc 修改竞赛评分显示异常
11 years ago
sw 05b9b26314 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 70083789cb 1.修复匿评列表查询有错
11 years ago
alan 9ba0c75ddb Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan fb398904b6 优化《学生列表》分页查询
11 years ago
z9hang cd6508efa2 提交部分代码
11 years ago
sw aa06251fd3 修改当用户角色改变时,该用户评分所属角色也跟着改变的BUG
11 years ago
z9hang 4161c42c54 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 3f6b36096c 缺陷查询添加integer_done类型处理(暂未用上)
11 years ago
sw 259799eb89 1.增加评分的model
11 years ago
sw afbcc3f8d3 1.#1742 首次加载课程实践平台主页时,点击“加入课程”快捷通道,课程ID默认是当前登录用户名,口令默认为当前登录用户密码
11 years ago
alan 329be27567 增加《分班查询》
11 years ago
alan 6192a36481 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan b79b08fa8f 编写《作业查询存储过程》
11 years ago
sw 2e1387b9e4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 68cadba317 #1710 测试版--项目--作品下载:选择任意内容类型、文件类型,都弹出error的提示框
11 years ago
alan d2aef552e6 优化《作业评分》
11 years ago
sw f549530744 取消课程动态中描述显示为最多30个字母或汉字的限制
11 years ago
alan f8dc9dcd35 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan b17d4840b1 《作业优化》
11 years ago
sw 9545b1da0c 优化课程成员列表访问效率
11 years ago
sw a3910477e4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 0e7f7a4254 优化《作业评分》
11 years ago
sw b0c2958a72 修复作业倒计时和截至提示未和提交作业按钮对齐
11 years ago
sw 92c7ba49d1 修复作业倒计时和截至提示未和提交作业按钮对齐
11 years ago
sw a89eb1c7b3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
alan 8e87e83ad8 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan abdd6458d3 优化《作业评分》
11 years ago
sw 63bc66adc3 修复关联版本库会默认登录帐号密码的BUG
11 years ago
sw 98cfeeee82 #1050 wiki界面部分意思不明确的按钮隐藏
11 years ago
sw 819c4c0bc1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw e6aab5baf2 #1650 老师应该可以删除自己课程的留言,或帖子
11 years ago
sw b512bc53e9 修改用户搜索无法精确搜索的bUG
11 years ago
z9hang 550577e942 修改编辑用户接口的返回值
11 years ago
alan 6e0311d928 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 2a94c61a3e 修改bug(项目--缺陷:更新图片时在历史记录中没有相关记录,删除图片只显示一个更新时间也不合理)
11 years ago
z9hang 40d06011f8 修改用户的课程列表接口
11 years ago
z9han 4518fe4355 test
11 years ago
z9han 5ee37f32e2 课程学生列表、教师列表接口报错问题
11 years ago
sw 3caf5c8657 #1736 猎豹浏览器中,打开某竞赛,进入竞赛主页看到右上方搜索按钮下移了
11 years ago
sw 30d8d82f37 #1734 某竞赛主页中当搜索框为空时,点击搜索的提示问题
11 years ago
z9han d7557e2839 修改密码返回错误问题
11 years ago
z9han 93762e89d3 修改加入课程、退出课程接口调用,添加创建课程,编辑课程的参数说明
11 years ago
sw f834759d84 #1709测试版--课程--加入课程:成功加入课程,还是显示为“加入”,需手动刷新页面
11 years ago
guange 7f1826ebf2 修改个人信息
11 years ago
guange 9d99eee92e 用户密码修改没传userid
11 years ago
guange d6aadc1624 搜索和列表中的课程老师输出一致
11 years ago
guange 8fe5fee0f0 搜索课程报错
11 years ago
sw f68e62d1c1 修改403、404的html错误
11 years ago
sw 053edb7934 #1730 修改课程作业中,当作业名字过长时显示不能换行,贴近按钮显示
11 years ago
zhuhao 8bd42054d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
zhuhao 61a859f91a 托管平台项目主业搜索按钮样式调整
11 years ago
alan b8e00e16df Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 629641d065 《调整学生列表页面》和《优化个人主页查询》
11 years ago
z9han 7f57bd97ff Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9han 67ffc03fee #1708 课程--资源库:非课程成员可以引用私有课程里面的公开资源,改为提示没有权限引用
11 years ago
alan 2084a17191 Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 6c09228139 根据凌彬设计修改学生列表样式
11 years ago
z9han b143093e49 1、#1707 课程--资源库:全站搜索得到当前作业模块的资源,应显示为“选入我的课程”.2、公开私有字样未居中问题
11 years ago
sw 73afb7e6c8 调用作业课程时首先判断该作业的所属课程是否存在
11 years ago
alan c99af4cb7b 修改《个人主页出现没权限访问链接》bug
11 years ago
alan 683acfcafc 优化《学生列表作业评分查询太慢》功能
11 years ago
alan d81240e63c 修改《关注老师后,老师发布的作业都会在我主页的动态中显示出来,若我未加入该课程但感兴趣点击后返回403页面,提示不够人性化》bug
11 years ago
= 57091b34f4 老师、学生匿评列表
11 years ago
alan 49cb52146f Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 815d2ceb3d 添加《添加相同组时应该给出相关提示信息》功能
11 years ago
sw d6d7331ec6 修改竞赛中搜索,搜索条件可以为空,且为空时搜出所有竞赛
11 years ago
sw c6be2317a7 项目搜索,增加搜索条件不能为空的提示
11 years ago
sw ff49fbe5c8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 4e2fe44d10 修改js验证事件,由失去焦点事件改为文本改变事件
11 years ago
alan f9a86356ad 添加《重新发送激活邮件》功能to注册模块
11 years ago
alan c560ca617b Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
11 years ago
alan 1965b75d92 添加《学生列表按作业评分排序》功能
11 years ago
= 226d5e9889 修改作业详、匿评
11 years ago
sw dc9f5d0730 修该讨论区帖子时,如描述为空,跳转到edit页面改为js报错
11 years ago
sw 0f9a82637e #1716 课程讨论区-发布新贴点2次才能成功
11 years ago
sw b6327460a8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 1fbd2e95d4 #1719 修改竞赛搜索之后标题栏错位的BUG
11 years ago
sw 3dfb0358c1 #1718 修复作品下载添加标签框不能正常显示
11 years ago
= 93c7deebc4 Merge branch 'api' of http://repository.trustie.net/xianbo/trustie2 into api
11 years ago
= 53d85136a3 修改课程中一个错误,完善匿评
11 years ago
guange 03f2c9c192 关注返回规范化
11 years ago