Commit Graph

2125 Commits (a4441bca37a9b883c171a5f489eeed512899d67a)

Author SHA1 Message Date
sw 9f02003bb9 用户课程列表增加自动换行
11 years ago
nwb 0e9a15aad5 短描述修改
11 years ago
sw 41983833d7 用户项目列表增加自动换行
11 years ago
z9hang bd43ef5d61 网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
11 years ago
sw e0f5708038 修改错误
11 years ago
sw 999a252f7b 修改软件创客搜索结果显示样式
11 years ago
nwb 5087f90a26 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 3b9245d143 隐藏新建竞赛作品时的作品类型
11 years ago
sw 46c7a4bb9f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 4a04d47c3c commit
11 years ago
nwb 29618d6a72 竞赛界面调整
11 years ago
yanxd df848ca756 print tag exception, course name valid test.
11 years ago
sw 5838b3e47d 不选择新闻时,取消"添加新闻"按钮的显示。不选择问题跟踪时,取消“新建问题”和“自定义查询”按钮的显示,不选择讨论区时,取消“发布新帖”按钮的显示
11 years ago
z9hang 057447f810 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb a4d06fbb12 课程成员设置为只能使用单一权限
11 years ago
sw 6f858795ef 项目模块配置未选中wiki时,取消左侧项目工具集的WIKI显示
11 years ago
sw bcaaa02bed 取消已完成课程在软件创客列表的显示
11 years ago
z9hang 036f8a3870 user.trustie.net域名下的用户列表课程项目链接跳转域名不正确
11 years ago
nwb 28543e3288 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 8eac756ac7 1.项目首页的描述更改,不再限制项目描述字数
11 years ago
z9hang 5b7fc4048a user.trustie.net域名下课程主页导航栏多个课程实践菜单
11 years ago
z9hang 0f4933240b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 7c3a81735c user。trustie.net域名下跳转到项目页面时主域名没变bug(尚需测试)
11 years ago
nwb 3b1b057f0a 课程描述自动换行
11 years ago
nwb 634ef8df5f 界面修改
11 years ago
nwb 02b4029e8c 资源文件下载界面调整
11 years ago
nwb 615b3ac2ac 课程界面调整
11 years ago
nwb a58a747cfa 屏蔽用户界面的关注需求功能
11 years ago
z9hang d9e04bab0a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang cc4bf3b328 添加超级管理员控制首页热门项目排序问题
11 years ago
nwb 62af03debd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb ca7ad03a05 1.优化课程动态信息
11 years ago
sw 4825c5287e Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 3254c4a237 修正二级菜单名称显示问题
11 years ago
z9hang 53ff6ea335 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6a45a0287d 添加删除图片功能,修复用户修改资料界面form.quene undefine的js错误(导致加载中不消失的原因)
11 years ago
sw 121ffa0342 修改缺陷时增加跟踪者的删除和增加功能
11 years ago
sw b142953a4b 1.创建项目增加功能:是否启动DTS测试,默认为不启用。根据用户选择,决定左侧DTS测试工具选项是否在该项目内显示
11 years ago
sw 61ba2c47ee 1.修改历史数据中作业为项目时作业显示列表未改变的问题
11 years ago
sw 8f8fb79a63 1.软件创客搜索功能修改表单提交为在js中提交
11 years ago
sw 90e28518f2 增加学校列表查询时,如查询条件为空,增加提示
11 years ago
nwb 1da147684a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 2a1a051362 课程资源文件密级BUG修正
11 years ago
sw b704a44dfb Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 7a9b5156c9 修复软件创客列表当用户姓名比较长时,用户姓名会被个人得分覆盖掉的BUG
11 years ago
nwb 0950ac2329 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 87b623bc51 1.文档添加密级设置
11 years ago
z9hang f44c715cfb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6b6fd2906f 竞赛列表。贴吧列表的非空判断
11 years ago
sw 59a5541e45 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 9da70f9a20 调整项目列表样式
11 years ago
sw 9472a7eb5c 未登录时取消显示我的学校按钮
11 years ago
z9hang fcdfeae326 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 3dfcc90574 课程、竞赛首页定制
11 years ago
sw 4f2298fd22 修复个人动态首页中留言等动态显示有误的问题
11 years ago
nwb 9b3ffc90ba Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 6688ba61dd 1.用户申请加入项目向管理员发送邮件
11 years ago
sw bed662c2e5 修复项目缺陷列表描述显示不正常的BUG
11 years ago
z9hang b4dd8409eb 添加项目托管平台首页定制功能
11 years ago
sw 51ef3fa5a1 修复主页课程介绍显示有误的BUG
11 years ago
sw 7bcb1cbe2e 修复个人主页中作业、项目介绍不正确的BUG
11 years ago
sw 39434766e3 1.修复超级管理员无法访问课程作业列表的BUG
11 years ago
sw a5518363c3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 720c75478a 修正上传图片可传非图片文件bug
11 years ago
sw 76db0e61c3 调整页面样式
11 years ago
yanxd 91eb7751da issue global 859. 搜索处理空格
11 years ago
Administrator 6082eca117 test
11 years ago
z9hang 4d75fbfcb8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 9634046d11 权限管理机制优化
11 years ago
yanxd 0998438e67 bootstrap fine tuning.
11 years ago
z9hang fd71435b30 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang b87abf1f68 权限管理优化
11 years ago
yanxd 449b87e38d remove cnzz
11 years ago
xianbo 25ee1d8672 for adjust test domain and give a setting reposwq
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 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
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
sw 8b389776a1 打开缺陷列表改为从新建窗口打开
11 years ago
sw 65c25feabb 修复项目的缺陷模块改版之后,新增缺陷界面找不到的问题
11 years ago
sw eac725a0f4 修改作业、用户、课程界面中相关学校的链接
11 years ago
sw 71b17cd98e 1
11 years ago
sw 62bcccedea 新建作业时给必填项添加*号
11 years ago
sw bc9f1e5a01 1.修改软件创客中每个用户内容显示不一致的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
sw 1e6693cdcf 1.取消软件创客界面2个个人得分显示
11 years ago
yanxd d54f37e630 个人动态,判断留言人逻辑有误
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
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
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 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
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
xianbo 830e2d4fb4 隐藏 站长统计
11 years ago
sw 063460f119 tt
11 years ago
z9hang cc2862ae0f 修正缺陷不能踩自己提示错误
11 years ago
nwb e94ed86ead 部分BUG修正
11 years ago
sw 4470f0dd73 添加作业时增加教师评分所占比例设置
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 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 74603e1256 解决直接访问ajax链接地址报错问题
11 years ago
sw 08bfb8e80a 修复教师评分后星星显示不正常的BUG
11 years ago
sw 12b16f0bb6 1.修复作业界面点击所属任务链接出错的BUG
11 years ago
sw 392dc0c365 增加访问作业显示列表的权限
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 7425178419 Merge branch 'CourseModify' into szzh
11 years ago
z9hang 02e221eedb 修改:网站中的旧分数显示为新分数
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
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
z9hang 773b728828 修改:自己不能踩或顶自己
11 years ago
z9hang 9d9bc76af4 定时刷新分数
11 years ago
z9hang f9612ca63f 实时刷新(ajax轮询)
11 years ago
sw 339b5b0296 缺陷编辑页面直接显示,不需要点击留言按钮才显示缺陷编辑页面
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
sw 600ec536b3 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
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 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
sw d38e009469 取消学号显示,增加参与人员在作业列表的显示
11 years ago
sw 71bb76ff91 作业显示界面页面改造,实现新的页面显示效果
11 years ago
nwb 8a5e1f5d9f 界面修改
11 years ago
z9hang 9061a77221 修改user.user_score为空问题的解决方式
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
z9hang d2db58050d 修复部分未填工作单位报错问题
11 years ago
z9hang 08ba10c32d 添加超链接
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 9b707f2b5a a
11 years ago
z9hang 1cb1eeeb1d 个人主页:姓名、工作单位
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
yanxd 47e6c3eedd home cache
11 years ago
yanxd 63cd19c15c Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd 955fece267 merge develop
11 years ago
yanxd 3fd7104448 welcome index obj.includes, routes add school logo
11 years ago
yanxd 07e4d40d44 cache obj
11 years ago
z9hang eae3918074 添加用户得数统计功能
11 years ago
yanxd 93d13c8867 system bin, 坑
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
wanglinchun 8618b73a8c 本次安卓校园竞赛获奖结果更新,首页正常显示
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
yanxd 0536af6625 Merge branch 'szzh' into develop
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