Commit Graph

2353 Commits (ef95835bc6ba1dedba221fb3042ef20ea35f208c)

Author SHA1 Message Date
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
yanxd 3fd7104448 welcome index obj.includes, routes add school logo
11 years ago
nwb b2756650cf 修正课程留言动态引起的首页错误
11 years ago
yanxd 07e4d40d44 cache obj
11 years ago
z9hang eae3918074 添加用户得数统计功能
11 years ago
yanxd 93d13c8867 system bin, 坑
11 years ago
yanxd 7456e37e8a home
11 years ago
yanxd eff2da732b home
11 years ago
nwb 8a274981ce 修改课程动态
11 years ago
yanxd ceef85719e contest fix
11 years ago
yanxd 70abac4c1e Merge branch 'competition' into develop
11 years ago
yanxd 362570e34b contestnotification_edit function
11 years ago
nwb 054cfbcafc 修改课程搜索功能
11 years ago
z9hang 621346268f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd b58c5685ac Merge branch 'szzh' into develop
11 years ago
yanxd f8bfa83ae4 move cache
11 years ago
z9hang e8d561b4ba 修正贴吧顶踩加分无效问题
11 years ago
wanglinchun 8618b73a8c 本次安卓校园竞赛获奖结果更新,首页正常显示
11 years ago
nwb b178be984d 添加课程搜索处理
11 years ago
z9hang f7fc4d06a2 添加贴吧帖子顶踩功能
11 years ago
sw b7458abd9e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 277aa81a60 修复占位列表界面显示的作业描述样式不正确的问题
11 years ago
z9hang 4fb96bacdc 修正更新用户等级方法,保证每个用户只有一条记录
11 years ago
yanxd 0536af6625 Merge branch 'szzh' into develop
11 years ago
z9hang a42c79cea2 添加用户升级功能(用户达到一定条件时自动升级,未在前端体现)
11 years ago
nwb c8900c279c 课程标签增加、删除
11 years ago
yanxd 858a7936b5 revert userscore catch exception, added cache to footer.
11 years ago
nwb 3933817570 1.修改课程配置界面
11 years ago
sw 8075645591 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd cccb19e733 cnzz
11 years ago
sw 9bd8132359 修复作业无法留言、无法综评的BUG
11 years ago
wanglinchun 52e7be1b1d 修改首页中评奖结果的显示字体
11 years ago
sw f4961cbc50 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw a100193373 1.作业参与人员可以对作业进行修改,但不能进行删除
11 years ago
yanxd efdbf3e808 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd 09edfc7c0c cache test
11 years ago
z9hang 5a47c52d23 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang ebbd4b0642 课程讨论区踩顶帖子
11 years ago
sw 8ed95f132a 1.修改、新建占位页面增加导航栏
11 years ago
nwb ae8fcca14f 1.课程接触视图修改
11 years ago
sw 025b8971e6 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw d832a5eecf rake db:migrate
11 years ago
nwb 165dbc3f78 修改words_controller与课程相关方法及视图
11 years ago
wanglinchun 15c88df72d 为发布竞赛通知添加权限
11 years ago
wanglinchun d76eec27cc 为竞赛通知评论添加登录权限
11 years ago
wanglinchun 60bdff86a1 竞赛通知增加权限限制
11 years ago
nwb 517a29116f 修改message_controller与课程相关方法及视图
11 years ago
yanxd e4ed8cf970 分数显示整数
11 years ago
nwb 863dec03d2 添加课程讨论区show视图
11 years ago
nwb 70901832a8 1.修改课程讨论区control index、show方法及路由
11 years ago
wanglinchun bb06ee921a sdf
11 years ago
nwb 814233d245 1.修改课程通知保存功能
11 years ago
nwb 97d920c195 修改新增课程通知视图
11 years ago
z9hang a8670ba6fc Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb d6280befca 修改新闻model、路由、index方法
11 years ago
z9hang e606fd89d2 被关注+2分、取消关注-2分
11 years ago
sw 29fa624e9d 封装获取作业成员的方法
11 years ago
sw 19fc84afee 作业增加成员、删除成员增加权限控制
11 years ago
sw 43736ba8d6 兼容历史数据
11 years ago
sw 541ced18ec 作业显示界面增加导航栏
11 years ago
nwb 3165d97417 1.迁移课程新闻数据
11 years ago