Commit Graph

2513 Commits (dd589c4811f025735445bee9579948cd1fdc19ad)

Author SHA1 Message Date
yanxd 4259f63fbf 预览在issue和new里报错
11 years ago
z9hang fd71435b30 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd 38b3e86e62 ip=nil
11 years ago
z9hang b87abf1f68 权限管理优化
11 years ago
yanxd 449b87e38d remove cnzz
11 years ago
z9hang 4c6fb2a266 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
xianbo 25ee1d8672 for adjust test domain and give a setting reposwq
11 years ago
z9hang 0fa552c8d3 软件众包中点击我要参与报无权限问题
11 years ago
z9hang b4bf320c2e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 5e3a763776 添加引用项目权限、修改引用判断
11 years ago
yanxd 4dbe149b42 删掉user里的扩展表信息,防止第一次迁移失败
11 years ago
yanxd ab03962e9a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd aca63146e9 搜索文件归属,课程相关逻辑修改,查询把过滤去掉了。暂时没想有什么过滤的好办法
11 years ago
nwb 8b2199e28c 新建竞赛时的日期判断优化
11 years ago
nwb 431b4541c3 新建竞赛时奖励设置为不能为空
11 years ago
nwb b4ee106ce9 竞赛搜索项为空时给出提示
11 years ago
nwb bc179fbc39 右上角菜单增加二级菜单
11 years ago
nwb 633c4278d8 修改课程列表视图
11 years ago
nwb 0471446ac8 新增、修改缺陷发送邮件的缺陷编写优化
11 years ago
nwb beeb707347 用户未登陆时首页不提示“该学校未开设任何课程”
11 years ago
nwb 5f18b1a38c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang f5b69be967 新建贴吧描述为空不能新建、搜索空内容添加提示
11 years ago
nwb fb8e97ff61 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb eb15edd5ff 1.添加文档
11 years ago
z9hang 5c93442c79 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 01da0852e3 新建贴吧错误提示修改
11 years ago
sw 6365d01051 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw f1b8b7caed t
11 years ago
z9hang 470f40db82 去除绝对网址
11 years ago
z9hang 011d161f8f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd db28ecd883 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd 2fa9a4855c 最后创建人信息的正确显示(+去掉了乱78糟的table套table)
11 years ago
nwb c927bb6fd6 首页课程列表修改
11 years ago
z9hang 8c65e1ac03 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang c709545809 提交后点击版本库才刷新项目积分问题(尚需测试)
11 years ago
sw 8b389776a1 打开缺陷列表改为从新建窗口打开
11 years ago
sw 65c25feabb 修复项目的缺陷模块改版之后,新增缺陷界面找不到的问题
11 years ago
nwb fd25f42e61 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 2395ee4b1d 留言发送邮件优化
11 years ago
sw eac725a0f4 修改作业、用户、课程界面中相关学校的链接
11 years ago
sw 698870ddee Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 71b17cd98e 1
11 years ago
yanxd 8ccc39ae71 首页更多报错
11 years ago
nwb b6ebbab830 项目版本库名称限定优化
11 years ago
sw 62bcccedea 新建作业时给必填项添加*号
11 years ago
sw bc9f1e5a01 1.修改软件创客中每个用户内容显示不一致的BUG
11 years ago
nwb b42605accd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 864ef17941 清理课程状态表,修正同一课程出现多次的BUG
11 years ago
sw b492ead0c0 修改学校链接
11 years ago
sw a1920ca54c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd 36c90f1dfd 取不到学校,再拿id直接空指针
11 years ago
sw 0e0b8fb8d8 历史数据中当课程名称字段为空时从项目列表里获取名称
11 years ago
sw 1e6693cdcf 1.取消软件创客界面2个个人得分显示
11 years ago
yanxd d54f37e630 个人动态,判断留言人逻辑有误
11 years ago
nwb ff8994fc9d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 08a6dec39d 课程讨论区回复时主题只读
11 years ago
sw 2506e8e50d Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 108866b8ba 1
11 years ago
sw 016ef25019 1.注释无效代码
11 years ago
z9hang d525220aca Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 2dd249a105 修正发帖不填主题报错问题,修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个
11 years ago
nwb dc0180988f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb d001b4416a 1.优化课程首页
11 years ago
sw 7acf73c4ca 修复未登陆用户进入学校主页列表出错的问题
11 years ago
sw fd1f3b45c9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw f86e889c23 修复学校列表链接
11 years ago
nwb 42a602a9bc 修改首页
11 years ago
sw 2bdb0e20e9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 3e185c3a4b 修改学校链接
11 years ago
nwb 98ba57b819 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 4d25ec1623 1.添加课程垃圾数据清理迁移文件
11 years ago
sw b42d742c06 1.增加我的学校链接
11 years ago
yanxd 0e2b7ba362 tag search fix
11 years ago
sw fe4e1cc175 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 9f7951a22c 修改BUG
11 years ago
nwb 52ddee2b2f 界面优化
11 years ago
nwb 5c0b1f3a47 修改界面
11 years ago
sw 740f6a19ec 项目名称唯一
11 years ago
nwb 8d22ccd23a 修改BUG
11 years ago
sw 5abee0a06c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb b928eb6ed8 修改课程首页“更多”链接错误
11 years ago
nwb 2a6cbe28f0 修正课程首页错误
11 years ago
sw 3c7e680b1b Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
nwb 2d9e0d507e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 31e338f1e5 修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
11 years ago
sw 967c377191 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 050a780b50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6f5d6c382b 给用户留言的回复若为查看计入新留言数
11 years ago
nwb 70dc5e2b49 去除主版本库标识允许为空的设置
11 years ago
nwb 898ecb443a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb e8705bccb1 修改文件上传界面样式
11 years ago
z9hang fe3861c1d7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 54a2fb8a9c 主页项目得分与项目页面的项目得分保持一致
11 years ago
nwb fb0597ab4a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 2b855badf9 修正课程资源库关联已有资源功能
11 years ago
yanxd e1d9d6ab45 tag查询崩溃
11 years ago
xianbo 830e2d4fb4 隐藏 站长统计
11 years ago
sw 063460f119 tt
11 years ago
z9hang cc2862ae0f 修正缺陷不能踩自己提示错误
11 years ago
z9hang 8b0f155be7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang d34ab220cc 登录名区分大小写
11 years ago
nwb 138211efba Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb e94ed86ead 部分BUG修正
11 years ago
z9hang 2e38f66899 搜索用户修改为按昵称搜索
11 years ago
z9hang a7fa444f9e 修正项目个人得分问题:统计时只计算项目成员,user_grade表user_id和project_id联合不重复验证,user_grade分数部位负验证
11 years ago
sw 4470f0dd73 添加作业时增加教师评分所占比例设置
11 years ago
z9hang 0f9c098df9 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 0bcc0beaf1 修复留言计分
11 years ago
sw 12b6525cc6 t
11 years ago
sw bb86ef4612 修复获取作业列表时课程老师参数获取不正确的问题
11 years ago
sw bc434a82a4 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
z9hang 33c883146a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 4906bad7d2 修正进项目报错异常
11 years ago
sw 98d2c144ae 修改时间排序为升序排序
11 years ago
nwb 671eaa8d45 测试
11 years ago
sw d03718e30f 修复新评分规则下按分数排序不正确的问题
11 years ago
nwb 6141cc56e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb e863c30352 部分BUG修正
11 years ago
z9hang 9a8c5ebecc 个人得分规则显示
11 years ago
sw f6d9bfc91d 修改新建作业时传递参数
11 years ago
sw be2faea15b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 25a3114a5a 老师的学生列表显示为真实姓名
11 years ago
nwb 917288c84c 修正课程讨论区、课程通知等创建时BUG修正
11 years ago
sw 3f8f141107 修复 创建作业时,由于输入参数错误导致保存失败后,再次输入错误参数会报错。如再次输入参数正确,会进入一个空白页面 的BUG
11 years ago
nwb 99c9f81aea BUG修正
11 years ago
nwb 1a4ee62853 修正课程错误信息显示2遍的问题
11 years ago
nwb ad97066a45 课程名称有效性判断
11 years ago
nwb c0f0e294e5 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb beeab518e8 课程动态中留言链接BUG修复
11 years ago
z9hang 0717148a0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang bc587f3e7d 屏蔽个人分数实时刷新功能
11 years ago
nwb 3565b9da88 修正用户课程界面关闭、重启课程,数据刷新不及时的问题
11 years ago
sw 09d79ae4e0 添加作业增加默认日期为当前时间的下一天
11 years ago
sw 745727b8e7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang d57688413e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 74603e1256 解决直接访问ajax链接地址报错问题
11 years ago
sw 08bfb8e80a 修复教师评分后星星显示不正常的BUG
11 years ago
nwb 33baf88886 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 38baa247bf BUG修正
11 years ago
sw 12b16f0bb6 1.修复作业界面点击所属任务链接出错的BUG
11 years ago
z9hang 2501f31ef1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 7399e1aca2 添加项目个人得分统计功能
11 years ago
sw 392dc0c365 增加访问作业显示列表的权限
11 years ago
sw dbd5c49246 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb a115edea9d 修改课程标签页选中状态
11 years ago
sw ed9b97f987 增加访问作业显示列表的权限
11 years ago
sw 56ce9e8bdb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw c4b2c47dc7 调整作业显示样式
11 years ago
sw 12087f40c7 1.当作业未选定项目时,项目得分为灰色的N/A,选定了项目,项目得分为橘色的分数
11 years ago
nwb b4af75f289 部分界面优化
11 years ago
sw 7702b746c6 修复作业显示界面,提交作业按钮不显示的问题
11 years ago
nwb f4aa817f42 修改合并后首页出错的问题
11 years ago
nwb 88c3347f7c 修正合并分支后的创建课程错误
11 years ago
nwb 7425178419 Merge branch 'CourseModify' into szzh
11 years ago
z9hang b04992b226 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 57cdb55282 修正get_level方法是用错误
11 years ago
nwb d5665c7bb7 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb ae3457e68b 1.添加代码评审(CodeReview)插件
11 years ago
z9hang 02e221eedb 修改:网站中的旧分数显示为新分数
11 years ago
nwb 6a2c486f62 修改作业数为10倍数时的显示BUG
11 years ago
sw c320ede205 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang dc1bd010f6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb e367c03f6e 修正课程作业列表显示BUG
11 years ago
z9hang df89e5e173 去掉多的一个分数显示
11 years ago
nwb ef61e41d48 去掉首页缓存
11 years ago
sw 91408cc960 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 358d4a53b8 修复未公开项目动态仍在主页最新动态显示的问题
11 years ago
z9hang 773b728828 修改:自己不能踩或顶自己
11 years ago
sw 0dce86d47e 修改首页项目显示为按活跃度排名的前10个项目
11 years ago
z9hang f16bec924c 处理undefined method `update_user_level' for nil:NilClass问题
11 years ago
z9hang 9d9bc76af4 定时刷新分数
11 years ago
z9hang 24172c85c8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang f9612ca63f 实时刷新(ajax轮询)
11 years ago
sw 339b5b0296 缺陷编辑页面直接显示,不需要点击留言按钮才显示缺陷编辑页面
11 years ago
sw 05659fa2db 修复注册后在”修改资料“中发现我在注册时选择的”学生“身份和地区信息以及学号信息都没有了,需要重新填写。
11 years ago
z9hang 55b28296a0 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 54d4b957ee 修复竖排的踩顶图标在踩或顶完后变成横排问题
11 years ago
sw 18762e2da7 增加、修改作业时提交项目增加空值选择,即不选定任何关联项目
11 years ago
sw d2376eb0b1 将页面部分jS代码转为JQuary代码
11 years ago
sw d0c9390e91 增加什么是项目链接。点击什么是项目 实现jQuary窗帘效果显示解释
11 years ago
nwb 8cdab80d31 用户课程界面链接BUG修改
11 years ago
sw 5277eddb95 封装获取一个作业参与人员方法
11 years ago
nwb 6039cf63af 课程讨论区文件上传权限优化
11 years ago
sw 600ec536b3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 989407dad2 12
11 years ago
sw 09eae9e253 1.作业列表增加项目得分显示
11 years ago
sw 36fecfc635 1.界面颜色调整
11 years ago
sw 19530df395 作业附件显示修改
11 years ago
z9hang 2ee5b422fb RolesController.rb移回app/controls
11 years ago
sw 463edeee71 1.修复未开启互评功能作业总评得分计算不正确的问题
11 years ago
sw e43a84ab4b 1.修复作业无关联项目是进入编辑界面报错的问题
11 years ago
sw 59e6433938 修复获取当前用户建立项目不正确的问题
11 years ago
z9hang a764888055 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 31049fcf4e 修复同时更新缺陷状态和缺陷完成度时只有缺陷完成度加分及记录分数变化细节,缺陷状态更改操作未加分及记录分数变化细节bug
11 years ago
sw 4d06d26303 优化新建作业页面显示
11 years ago
sw f3f303e6e2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw ef234d8c50 1.按照新的评分规则修改作业得分
11 years ago
nwb 0736dd1254 课程讨论区回复权限和界面BUG修正
11 years ago
z9hang 9e4dbcc08e 加回学校主页学校的超链接
11 years ago
z9hang 3e37a54a0f 修复竞赛处不能留言问题
11 years ago
z9hang f2cb1390da 修复带pre标签缺陷留言的显示问题
11 years ago
sw d38e009469 取消学号显示,增加参与人员在作业列表的显示
11 years ago
sw 71bb76ff91 作业显示界面页面改造,实现新的页面显示效果
11 years ago
nwb 8a5e1f5d9f 界面修改
11 years ago
z9hang 9061a77221 修改user.user_score为空问题的解决方式
11 years ago
nwb f5c9123647 管理员创建课程逻辑修改,管理员创建课程后成为该课程成员
11 years ago
z9hang 3c89de4c81 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang c0d97870d5 项目=》文档 文档提交者添加超链接
11 years ago
sw 2f66296b62 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb f0b016bcbe 讨论区留言编辑修改
11 years ago
nwb e17090d506 修改课程通知show方法,并添加独立视图
11 years ago
nwb 462e5ab589 修改课程资源文件类型编辑BUG
11 years ago
nwb 80145c5c3b 修改课程列表动态数显示不正确的BUG
11 years ago
z9hang d2db58050d 修复部分未填工作单位报错问题
11 years ago
z9hang 08ba10c32d 添加超链接
11 years ago
nwb 0480405afb 1.修改原课程各数据迁移文件BUG
11 years ago
sw efb6c1fd19 1.修改、新增作业增加提交项目选项(可以为空)
11 years ago
sw 872357cdf4 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 97a4aaf8ab homework_attach增加列project_id及相关数据迁移
11 years ago
yanxd 8840a11a99 attachments error
11 years ago
yanxd 9b707f2b5a a
11 years ago
nwb 3afb70bf84 主讲教师修改为不允许退出课程
11 years ago
z9hang 1cb1eeeb1d 个人主页:姓名、工作单位
11 years ago
z9hang ab486aa811 补充user_score_details Model及数据迁移文件
11 years ago
z9hang da3aa7b291 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 50dbe3d04a 添加记录得分变化功能
11 years ago
nwb 726697a69b BUG修改
11 years ago
nwb 0de6cc8a31 修改作业基础视图
11 years ago
nwb ec72bb2904 编辑作业逻辑修改
11 years ago
yanxd b76f1c2b12 管理员用户粉丝列表出错。
11 years ago
nwb 936c40b490 提交作业逻辑和视图修改
11 years ago
yanxd 2f724aa23e xss 过滤memo content中的标签
11 years ago
nwb 78612488e5 1.修改新建作业及视图
11 years ago
nwb 099e8a0912 Merge branch 'szzh' into CourseModify
11 years ago
nwb cdaa27b52b 文件上传去掉tag显示
11 years ago
z9hang f9a17241da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 9e53ad67d0 去除个人分数显示的链接
11 years ago
z9hang 697a6034b2 新得分显示
11 years ago
nwb 99e5644c4e 去掉上传文件的标签编辑
11 years ago
nwb 9c3605320e 加入、退出课程逻辑优化
11 years ago
nwb b4e78d2b0c 课程添加成员逻辑更改
11 years ago
nwb 2a4486bf0d 修改迁移文件
11 years ago
nwb e698f3a6c6 修改新建课程成员时的唯一性判断
11 years ago
nwb 59a261d96d 1.优化课程通知动态和权限判断
11 years ago
nwb 755e758596 优化课程资源文件动态和权限判断
11 years ago
yanxd 47e6c3eedd home cache
11 years ago
yanxd 63cd19c15c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang b727d023b6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd 955fece267 merge develop
11 years ago
yanxd b356145d71 course logo
11 years ago