Commit Graph

18459 Commits

Author SHA1 Message Date
huang c370668b21 解决sw_3用户主页500问题 2017-01-12 11:11:46 +08:00
huang 0bd5cd52d7 修复版本库查看单个文件500问题 2017-01-12 10:25:13 +08:00
huang 6aa2052c7f 版本库界面改版及show页面代码优化 2017-01-12 10:11:42 +08:00
huang c97c2b7738 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-11 16:18:47 +08:00
huang b4d28c176d gem 2017-01-11 14:34:09 +08:00
huang f8f2c816fb 上线注释掉某些版本 2017-01-11 14:33:16 +08:00
Your Name 3d57752d9f sonar echarts 2017-01-11 14:14:18 +08:00
huang 18c8d99a9e 引入Echarts;柱状图 2017-01-11 09:18:20 +08:00
huang a365453f9c trustie平台输入版本库地址让其跳入Trustie项目版本库 2017-01-10 14:49:50 +08:00
huang dc6a515f08 解决部分路由不正确报500问题,让其跳转至404 2017-01-10 09:19:37 +08:00
huang 1a2063fe7e 某个页面跳入登录,登录成功后返回当前页面 2017-01-09 16:32:15 +08:00
huang c9bb226b0b 完成版本库 最新提交记录根据目录名的变化而变化功能 2017-01-09 15:34:37 +08:00
陈晓婷 14eea2f7c4 Merge branch 'develop' into 'develop'
bug



See merge request !118
2017-01-06 22:37:57 +08:00
cxt cb8d295088 竞赛首页报500 2017-01-06 22:35:44 +08:00
黄井泉 3caca58c26 Merge branch 'guange_dev' into 'develop'
微信at显示问题



See merge request !117
2017-01-06 21:58:20 +08:00
guange fdf00eb9cf zip下载js问题 2017-01-06 21:55:55 +08:00
guange 62b1ffc0c5 微信at列表显示问题 2017-01-06 21:48:04 +08:00
黄井泉 a78585c203 Merge branch 'develop' into 'develop'
bug修复



See merge request !115
2017-01-06 20:13:11 +08:00
黄井泉 baccfb5f29 Merge branch 'develop' into 'develop'
我的作业过滤后排序



See merge request !116
2017-01-06 20:12:47 +08:00
huang 9df3d2f46a 我发布的作业过滤排序 2017-01-06 19:50:18 +08:00
cxt feb0aa9a45 Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-06 19:10:26 +08:00
cxt 8e2953f405 班级作业:如图点击作品列表中的“提交作品”报404 2017-01-06 19:09:55 +08:00
黄井泉 5fb78d1d9e Merge branch 'guange_dev' into 'develop'
微信的@回复功能,只在项目的issue里增加了,需要在班级和项目的所有微信动态的回复中增加



See merge request !112
2017-01-06 19:02:09 +08:00
黄井泉 09bc9abfa7 Merge branch 'develop' into 'develop'
bug修复



See merge request !114
2017-01-06 19:01:16 +08:00
cxt 57565a122e Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop 2017-01-06 18:59:32 +08:00
cxt 20581a68c7 班级讨论区、竞赛讨论区 删除子栏目中的帖子却返回主栏目帖子列表 2017-01-06 18:59:11 +08:00
cxt 406d987125 加入竞赛消息通知未显示在未读消息列表中 2017-01-06 18:53:39 +08:00
黄井泉 f4cc2fca62 Merge branch 'develop' into 'develop'
周五上线的一些修改



See merge request !113
2017-01-06 18:51:04 +08:00
cxt b18d9f2eb3 课程列表的归档恢复 2017-01-06 17:33:45 +08:00
huang 629c1e849d 解决我发布的作业中已评和未评统计数据错误 2017-01-06 17:29:29 +08:00
guange 1967b89ff0 微信的@回复功能,在班级和项目的所有微信动态的回复中增加。issue: 11026 2017-01-06 17:01:37 +08:00
huang d99ec1db10 我收到的作业过滤后按创建时间倒序 2017-01-06 16:57:51 +08:00
huang c34812f8a3 我发布的作业,过滤后按创建时间倒序 2017-01-06 16:56:01 +08:00
cxt 19e484aaeb 竞赛讨论区的调整 2017-01-06 16:54:03 +08:00
huang 17bdb053bc pull request提示语病问题 2017-01-06 16:32:44 +08:00
huang 7fd1b84b34 解决加入班级通知中已省略号结尾的鼠标显示全部内容,定义公共的用户名长度隐藏样式 2017-01-06 16:28:53 +08:00
cxt 0e10e52fdf 竞赛上传图片的弹框“上传图片”手势修改 2017-01-06 16:24:40 +08:00
陈晓婷 1035301d89 Merge branch 'develop' into 'develop'
本周上线内容



See merge request !107
2017-01-06 15:58:45 +08:00
cxt 83c00d1225 竞赛图片的上传 2017-01-06 15:52:34 +08:00
cxt cc4d46c3ee Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
	public/stylesheets/css/common.css
2017-01-06 15:06:22 +08:00
cxt 44e1a09906 竞赛图片上传 2017-01-06 15:03:01 +08:00
黄井泉 6b67f5036c Merge branch 'guange_dev' into 'develop'
变量统一



See merge request !111
2017-01-06 15:00:21 +08:00
cxt 9130111b2c 竞赛提交的评分 2017-01-06 15:00:14 +08:00
guange 29dda04a2d 变量统一 2017-01-06 14:52:47 +08:00
黄井泉 866d44c568 Merge branch 'develop' into 'develop'
作品列表导出作品附件大于200M提示



See merge request !110
2017-01-06 14:50:05 +08:00
huang 0be2dbe10b 作品附件下载大于200m弹框语句及样式修改 2017-01-06 14:32:59 +08:00
huang e0252a114a 作品附件打包下载超过200M,给出提示 2017-01-06 14:22:14 +08:00
黄井泉 a2bc649a56 Merge branch 'guange_dev' into 'develop'
zip手工打包



See merge request !108
2017-01-06 13:40:38 +08:00
黄井泉 62616b022d Merge branch 'develop' into 'develop'
还原pullrequest小铃铛消息



See merge request !109
2017-01-06 12:17:18 +08:00
daiao 4f2bd2dc31 还原pullrequest小铃铛消息 2017-01-06 12:15:46 +08:00