Commit Graph

1818 Commits (ff8994fc9dcf725db5bf94bbca55277a9abc3369)

Author SHA1 Message Date
wanglinchun 1393aebace 完成了按钮样式
11 years ago
sw 2827bd0c21 1.修改下载一个人作业所有文件的传递参数
11 years ago
yanxd 4c7bcd50f5 contests delete routes error
11 years ago
nwb 54505340eb 1.修正新建课程错误
11 years ago
wanglinchun 53ded67d9d 竞赛通知删除功能ok
11 years ago
wanglinchun 467f8f54e1 sdf
11 years ago
yanxd c3865ab319 notificationcomments
11 years ago
wanglinchun 45e12c4bef xx
11 years ago
wanglinchun 545e5c5941 ert
11 years ago
wanglinchun 7f5fa8b9b8 dfd
11 years ago
wanglinchun 391d4df3d1 sdf
11 years ago
yanxd 8b176c0027 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
yanxd db61ecc255 合并user_score属性
11 years ago
wanglinchun 1c28edd5d4 修改竞赛通知相关文件
11 years ago
z9hang cf5c7a6610 修复学生从个人主页课程标签页未参加课程状态下点击加入课程进入课程列表搜索课程失败bug
11 years ago
nwb 59742b9ddb 1.给各角色添加项目相关的权限
11 years ago
wanglinchun 372de9932a 英文版竞赛子站完成
11 years ago
wanglinchun 42aba52111 竞赛子站英文版5
11 years ago
sw 8f94985186 1.添加作业时权限判断
11 years ago
yanxd 57994edc06 load user in homework
11 years ago
yanxd 1c7923e5bd sql
11 years ago
nwb ebe771db88 创建课程修改
11 years ago
sw 8e2288a362 1.封装获取作业平均评分方法
11 years ago
nwb c1f9f389b7 修改课程讨论区视图,从项目中分离
11 years ago
wanglinchun 0255a61d2f dfg
11 years ago
nwb d22ffa84b4 1.课程标签迁移,从项目中分离
11 years ago
sw 999b856d84 优化打开作业列表界面效率
11 years ago
wanglinchun f1555bf134 dfg
11 years ago
nwb cd3c69af94 课程资源文件迁移,从项目中分离
11 years ago
sw 81a97f6a5e 1.老师创建作业增加功能:是否启用互评,以及该功能的修改。对不启用互评的作业,学生不可下载作业,不可互相打分,但可以留言;老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
11 years ago
wanglinchun f17c01010f werew
11 years ago
nwb 6ff26d06ab 修改课程基础页面逻辑(base_courses.html.erb)
11 years ago
wanglinchun 982bf17ebc dfd
11 years ago
wanglinchun 8b78929190 修改竞赛通知中评论的相关文件
11 years ago
nwb 529cf4f4f8 修改重启课程
11 years ago
nwb 6a9037dde5 修改关闭课程逻辑
11 years ago
yanxd 2e11d76652 lin
11 years ago
wanglinchun ed84ec633f 竞赛通知
11 years ago
wanglinchun ae70081288 eter
11 years ago
nwb 10397eec3e 更改课程图标显示逻辑,添加课程图标文件夹
11 years ago
sw 39ce95a950 美化作业显示界面
11 years ago
nwb a49cf3eb6b 1.修改课程作业路由
11 years ago
nwb 69e366d841 迁移课程作业数据
11 years ago
nwb 0d99644fa7 1.用户课程表逻辑修改
11 years ago
sw 43b350e3d8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 78ac974a75 1.修改课程作业列表界面提交作业
11 years ago
nwb fb36a0d5ba 1.课程control添加create方法
11 years ago
yanxd 8fb82bbdc4 register Mod
11 years ago
nwb 4404222437 0604
11 years ago
nwb 0f5c996278 新建课程逻辑修改
11 years ago
sw 94542e935a 增加点击作业名下载改作业下所有附件的功能
11 years ago
wanglinchun da26c70f6c 修改首页子站入口
11 years ago
wanglinchun a38ffb9e9d 首页修改4
11 years ago
sw 2bbcff54d3 取消作业提交形式选择,统一为提交文件
11 years ago
wanglinchun 7abeabeadf 首页修改3
11 years ago
wanglinchun 4b54f2949d 首页修改2
11 years ago
sw 1889996d6f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 80afefcd28 修改可对文件进行增、删等操作
11 years ago
wanglinchun ebcdd2cc9e 修改首页英文显示
11 years ago
sw 29ac5ff12a 如果当前用户已经提交过作业就不显示新增作业按钮
11 years ago
wanglinchun b5be2d58ce 英文子站首页
11 years ago
z9hang 3690bf79f4 修复个人动态中留言人链接错误
11 years ago
sw 66c9de94a8 修复新增作业后页面不会跳转的问题
11 years ago
sw 50171ad0f8 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
wanglinchun 9d783a7caa 修改竞赛通知等tab-menu的显示状态
11 years ago
wanglinchun 6a8d697582 Merge branch 'develop' into competition
11 years ago
wanglinchun a3fb48a4bb 0603
11 years ago
z9hang 3a80a80841 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 9bfe9ba1b2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 27be52e58d 老师的邮件中增加取消邮件通知链接
11 years ago
sw 5ef1332ded 实现修改、删除作业后页面跳转
11 years ago
yanxd 510b1c4233 merge gem
11 years ago
yanxd 37232cd5b2 把所有user_extensions的逻辑移到了user中,业务代码还没有修改,下一步是user_score和projectxxx,先测测效果
11 years ago
sw 1a0de23b38 修改作业在进行修改、删除、添加时的代码
11 years ago
wanglinchun 81a45fe977 dfs
11 years ago
yanxd 7d6311f8e4 Merge branch 'develop' into szzh
11 years ago
yanxd 789a8d1392 tag_name从ProjectInfo取用户抛错的问题
11 years ago
nwb 7d3d406c00 新增部分课程所需的解析函数
11 years ago
nwb 9f948c971f 添加课程排序方法
11 years ago
nwb e490f7979d 添加课程index界面
11 years ago
wanglinchun 528af32f91 修改forge,localhost首页不能显示的问题
11 years ago
sw cc5eb3d0af 1. 修复作业无附件时会将作业删除的问题
11 years ago
wanglinchun 09ea833dcb 竞赛通知修改2
11 years ago
wanglinchun bf71a38608 竞赛通知相关文件修改
11 years ago
z9hang 2e9251530c 修改缺陷状态留言处引用的链接被遮住问题
11 years ago
yanxd bced2476cd 在更新下
11 years ago
yanxd d2b90b98cc 1, 调整了settting中的成员显示,去掉了冗余的计算逻辑,打开页面速度快多了
11 years ago
z9hang 4747375499 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
ganyiang 9f16123bed 修复osp显示帖子页面,footer漂移的问题
11 years ago
yanxd 8c33cf0afb Merge branch 'develop' into szzh
11 years ago
yanxd b33ee17343 Merge remote-tracking branch 'remotes/origin/develop' into szzh
11 years ago
nwb e15bad7462 course新增列并更改相关逻辑
11 years ago
ganyiang b4c299bff8 修复osp中“热帖”下显示“没有帮助”的问题
11 years ago
yanxd 9194b32060 file/index上传文件功能里。 remote: true 文件是不能提交的!
11 years ago
sw 22688dd5da Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
ganyiang 44d24d038f Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
ganyiang 3c9279d285 修改标签错误
11 years ago
xianbo 7d1327ad2a Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
ganyiang e8b33bfd8f 修复osp主页index界面态势列表显示标题过长的问题
11 years ago
ganyiang e901e8046d 修改osp中allbug的显示界面
11 years ago
ganyiang a4d1e036f4 去除osp中“聚焦” 标签的链接(演示用)
11 years ago
fanqiang 9e05ecf5b4 修改主页展示部分
11 years ago
ganyiang 0335e06df0 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
ganyiang c8ca5277a6 新增osp项目“聚焦”标签 (演示用)
11 years ago
fanqiang 150bb1ba1e 修改开源社区主页中的漏洞展示部分
11 years ago
sw 96504d6806 1.修改作业提交流程,
11 years ago
wanglinchun 43449e66b5 增加了竞赛通知按钮
11 years ago
fanqiang b47cec9c3a 修改bug展示界面问题
11 years ago
fanqiang d17ce35596 修改项目展示界面中bug的链接问题,将会重新打开页面
11 years ago
fanqiang 91d61502a2 将软件漏洞改为软件态势
11 years ago
yanxd 006e4ae45e user tab bar
11 years ago
nwb f936c30ec9 添加与course.index相关的control、view、help等实现
11 years ago
nwb 4e815a38b6 更改路由,课程独立出来,不再包含在项目中
11 years ago
sw 86cb496f3f Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
ganyiang 4b1212f279 修正OSP在rubymine下报红的小问题
11 years ago
sw 5a2226af37 修改作业html
11 years ago
z9hang c4b292b711 个人主页项目课程动态,不能查看真名时不显示括号
11 years ago
z9hang 4b119e2f00 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 03c8f39729 1.修复登录提示描述不正确的问题
11 years ago
z9hang 97ae2356bf 引用被遮住不能点问题
11 years ago
sw b9550cedb9 课程作业显示界面修改
11 years ago
sw 91497d3f95 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw 3546355f70 增加修改昵称功能以及昵称是否重复的判断
11 years ago
z9hang 2d77975221 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 1c92007ac6 课程个人主页动态改为 昵称(真名) 形式显示(对该课程的老师助教)
11 years ago
sw 218fb3f831 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw e0273d320c 1.登录增加js提示可以用昵称和邮箱登录
11 years ago
nwb b52690adc2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 61135a352a 上传文件表单支持添加文件标签
11 years ago
yanxd 306ae9f685 用户tag点击之后的名字显示修改,用户邮箱隐藏
11 years ago
sw 8227c5222a 修复老师未进行综评的用户进入互评界面报错的BUG
11 years ago
sw 27a30d44be 1.修改判断当前用户是不是为课程老师的方法
11 years ago
xianbo a70593ad76 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
z9hang bf12692de4 登录名==》账号/邮箱
11 years ago
fanqiang 06a775e3f9 修改帖子显示数字错误
11 years ago
xianbo 0f56d9e885 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 4c3e2376f0 修改帖子页面
11 years ago
fanqiang fdf8b5640a 添加显示bug的页面
11 years ago
fanqiang 6dba5aaae6 修改帖子中 回复,关注,浏览的链接错误
11 years ago
wanglinchun d20114cc42 竞赛子站国际化完成
11 years ago
wanglinchun a1083fe900 修改了原有参赛作品显示报500;
11 years ago
z9hang ddf5590c54 修复个人主页查看关注的项目时报user_id指代不明的sql错误
11 years ago
z9hang 5d4eec010e 隐藏点击描述用户的标签后跳到的标签页面显示的用户邮箱
11 years ago
z9hang ab85ee5169 admin个人主页项目功能修正
11 years ago
yanxd 654cb404e2 bootstrap test
11 years ago
fanqiang 401f097079 项目展示页面添加帖子的发布者信息
11 years ago
fanqiang f392fc244f 修改连接,进入帖子后应该进入新的界面
11 years ago
wanglinchun b416d69639 vxc
11 years ago
yanxd 12b1553a33 Merge branch 'develop' into szzh
11 years ago
yanxd 2273a6fd0b Merge remote-tracking branch 'origin/develop' into develop
11 years ago
yanxd d77d7e14c7 home page memo css no wrap
11 years ago
yanxd 7a4e5afba0 test
11 years ago
wanglinchun b13638bb95 竞赛子站国际化
11 years ago
wanglinchun 7b6c96a8b6 view中contests中的文件已经全部国际化
11 years ago
wanglinchun 8b356cddb1 修改用户留言页面中未登录状态下的提示语位置
11 years ago
z9hang 0e6d9a804a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
t430 fd0a504d84 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
yanxd 5364687160 bootstrap & tag bug
11 years ago
xianbo be1a0e0fea Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo 734caef3dc Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo a3a95556a3 fix 王林春提交了冲突文件
11 years ago
z9hang ad5ac329f2 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 6583ccb001 admin账户个人主页显示修改
11 years ago
t430 edfd7372bb Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
11 years ago
yanxd 4eebd48f92 realname
11 years ago
yanxd 3ae7729539 Merge branch 'szzh' into develop
11 years ago
yanxd 213939b474 realname
11 years ago
wanglinchun 4081ef93a3 参赛作品发布人不能打分和评论;
11 years ago
xianbo e52886cf46 Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
11 years ago
xianbo cda9942723 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
sw 0ec7d6b4e7 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 71bbc50542 增加作业留言的分页显示
11 years ago
yanxd 598429695f Merge branch 'develop' into szzh
11 years ago
yanxd 62f9ed052b issues#655
11 years ago
fanqiang d3ead651fe 动态显示安全问题
11 years ago
sw 5d4226ce79 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 65c3bb5eb1 1.作业列表评分结果显示保留2位有效数字
11 years ago
ganyiang 5374addb5a Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
ganyiang c70352011d 修复buglist.css对整体界面的影响
11 years ago
yanxd f44b930037 233
11 years ago
ganyiang f0f807b2de 修改OSP社区的态势分析图表显示;
11 years ago
nwb 4f9625b265 修改BUG
11 years ago
nwb f51873d98b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb dd4ef11b3d 添加项目管理员审核已申请用户界面及逻辑
11 years ago
yanxd 34aa8433de import hubspot
11 years ago
fanqiang 0b79cbac32 修改帖子的链接,帖子不在自己社区显示,而是直接链接到其他的网站
11 years ago
yanxd 3517dbb88b Merge branch 'szzh' into develop
11 years ago
sw 7748704c3a Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
fanqiang 10aa8eee81 显示帖子的发布者和时间
11 years ago
wanglinchun a22678f36f 彻底调好了新建参赛作品后弹出的提示框问题
11 years ago
wanglinchun e10c6adf7a 隐藏掉新建参赛作品中完成后上传文件小框中出现的提示语
11 years ago
wanglinchun 88b7fd24b1 给新建参赛作品中托管项目添加默认选项,使用户自行选择是否需要将参赛作品托管到制定的项目中
11 years ago
nwb 80e84069a1 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 1d6816419d 优化用户申请加入项目界面刷新
11 years ago
wanglinchun 56b66c8f5f 给参赛作品页面中托管项目添加超链接
11 years ago
z9hang 7d9b2c751b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 4fffd321d2 竞赛、课程主页贴吧动态及贴吧内帖子列表添加最后回复人
11 years ago
yanxd 3e8decf1d1 student user_course
11 years ago
yanxd c5a3a5bac3 user_courses.html
11 years ago
z9hang 21e58ce3df 课程列表中课程成员数量显示n+(不显示精确数)
11 years ago
nwb 104ee13ac7 1.添加用户申请加入项目contrl、model及相关逻辑
11 years ago
sw 8bb8de7d7f Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
sw c7b19d8f2e 修改作业提交流程
11 years ago
wanglinchun 12f3da8416 sdf
11 years ago
wanglinchun 947c0f8f64 竞赛页面中添加参赛作品成功创建的提示语
11 years ago
xianbo 4b063a2c69 Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
11 years ago
nwb 0f340a7cda Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 624a7f7bdd 还原资源文件管理的tag显示为一行
11 years ago
fanqiang 45fa8b384a 修改字体颜色
11 years ago
fanqiang c5dd0317c2 修改合并后的bug(open_source_project)
11 years ago
yanxd 0ab17f1e90 contest image show
11 years ago
wanglinchun a5cb14274c 修改参赛作品页面中未登录状态下的提示
11 years ago
wanglinchun dd43e2c3fc 竞赛页面我要参赛中添加判断,当用户未登录时提示登录后参赛
11 years ago
xianbo e3fe69c445 Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
11 years ago
fanqiang 973a59042c 修改帖子显示用户名与链接问题
11 years ago
wanglinchun bcb3bf0c19 调整参赛作品编辑页面中托管项目列表的显示宽度
11 years ago
fanqiang aed4b250a0 修改数据库后修复bug
11 years ago
wanglinchun 77b7da81fd 参赛作品页面编辑功能中添加修改托管项目列表完成
11 years ago
yanxd c4bd9aaabd Merge branch 'szzh' into develop
11 years ago
yanxd 4aed14228a project/course/ members remove link
11 years ago
yanxd 85c77ca074 xss, ckeditor js bug.
11 years ago
yanxd dac992548a course_form
11 years ago
nwb 0b4c95711a Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 4156983494 缺陷添加缩略图显示
11 years ago
yanxd 7189d9a14a course_form
11 years ago
yanxd d47facc9e8 Merge branch 'szzh' into develop
11 years ago
yanxd 9ae8494c97 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
nwb 097489e594 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
nwb 4d21933e09 1.优化资源文件上传下载界面
11 years ago
wanglinchun 10b34341c7 修改参赛作品编辑页面说明文字:应用--》作品
11 years ago
wanglinchun 2c30008981 竞赛页面中我要参赛下面修改温馨提示内容
11 years ago
yanxd 2aeb12616b Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 4de089250f 修改删除留言方法为destroy_jour,以及相关路由,访问action的改变
11 years ago
yanxd 112b8de921 issues#575
11 years ago
wanglinchun f815410381 修改了新建参赛作品中托管项目的显示颜色和宽度
11 years ago
yanxd f9166a71a7 issues#555
11 years ago
sw c141501085 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 9a62fe22c6 修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
11 years ago
yanxd 9373666576 混淆课程数量
11 years ago
sw b80c51475f 1.增加作业参与人员类homework_users及相关代码
11 years ago
wanglinchun 9fb9d2dbdf 初步增加了新建参赛作品中参赛作品所属的托管项目列表
11 years ago
yanxd a76620a741 welcome footer
11 years ago
z9hang e78a309842 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago
z9hang 19d1682077 修改编辑作业提交文件处样式
11 years ago
z9hang eaa9c94290 自己的用户界面也不现实邮箱
11 years ago
z9hang 2b12d31fb8 去除网站中的邮箱地址显示
11 years ago
sw 7ead12dba6 1.优化路由代码
11 years ago
sw 3fee4211a2 Merge remote-tracking branch 'origin/szzh' into szzh
11 years ago
sw 6c9b9841b8 课程作业留言增加回复以及回复的评论删除功能
11 years ago
z9hang ea095a6f61 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
11 years ago