Commit Graph

7941 Commits

Author SHA1 Message Date
huang c339e9071b date类型转换成string类型 2015-07-24 23:55:13 +08:00
huang 6aa332d1f6 调试、打印 2015-07-24 23:36:24 +08:00
huang 0a1afd7c45 测试打印结果 2015-07-24 23:25:56 +08:00
huang b9a902bb04 代码统计标题 2015-07-24 23:09:28 +08:00
guange 928e4806c6 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-07-24 22:55:48 +08:00
guange 0a300724d3 统计结果改为数组返回 2015-07-24 22:54:42 +08:00
huang ea93a68a84 版本库:用户六个月代码量统计 2015-07-24 17:40:43 +08:00
huang 683456dc3a Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-07-24 16:56:50 +08:00
huang 69b9cbee80 版本库代码统计(未完成) 2015-07-24 16:56:37 +08:00
guange 71970e1942 支持按时间段来统计每人的提交量 2015-07-24 16:53:21 +08:00
huang 98ecf2f298 Merge branch 'szzh' into dev_hjq 2015-07-24 15:42:59 +08:00
huang f20c989535 Merge branch 'dev_hjq' into szzh 2015-07-24 15:03:42 +08:00
huang 391c7f6821 Merge branch 'szzh' into dev_hjq 2015-07-24 15:02:57 +08:00
huang 390aa632cd 修改删除主版本库后,新建可以设置主版本库 2015-07-24 15:02:01 +08:00
sw 7f8f957a71 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-24 14:27:45 +08:00
sw 24a9a5034c 编程作业取消导出附件按钮 2015-07-24 14:27:30 +08:00
sw 430956bfe5 我要反馈---下拉编辑框时边框消失 2015-07-24 14:24:31 +08:00
huang 518ce15df5 修改添加成员提示 2015-07-24 14:01:15 +08:00
zhangshenjerry d38b840c4b Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-24 14:00:50 +08:00
zhangshenjerry 2f497f36d0 正确修改密码后建议给出“密码修改成功,请重新登录”的提示信息 2015-07-24 14:00:02 +08:00
sw 0e56a79622 课程通知查询不使用ajax局部刷新 2015-07-24 11:50:50 +08:00
lizanle f521ca424d 首页动态优化 2015-07-24 11:47:45 +08:00
huang 938d31a761 项目得分为0 的时候不显示项目得分 2015-07-24 11:36:21 +08:00
lizanle a4734bb135 首页动态优化 2015-07-24 11:13:53 +08:00
lizanle ce16550545 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-24 10:56:25 +08:00
lizanle c8cb730397 首页动态优化 2015-07-24 10:56:19 +08:00
huang bf86393bb9 项目自定义主页,添加图片删除功能 2015-07-24 10:39:07 +08:00
huang ad43c76ce7 修改项目首页可配置
包括图片大小、描述
2015-07-24 10:21:52 +08:00
huang 111ca6517a Merge branch 'dev_hjq' into szzh 2015-07-24 09:49:42 +08:00
huang b6812d8810 Merge branch 'szzh' into dev_hjq 2015-07-24 09:49:06 +08:00
huang e5801338d6 修改最近一个月时间跨度
当前日期延生到上月的当天
2015-07-24 09:47:28 +08:00
sw f4360e66dd 编辑编程作业出错 2015-07-24 09:47:20 +08:00
lizanle e85ef7b192 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-24 09:38:03 +08:00
lizanle 8350d5f10b 首页动态优化 2015-07-24 09:37:53 +08:00
huang 2fca0f4441 提交次数代码简化 2015-07-24 09:32:12 +08:00
sw ea8f72cce9 编程作业show:两个测试结果 2015-07-24 09:24:09 +08:00
huang c0da9257cd 版本库:用户最近六个月提交次数 2015-07-24 09:19:43 +08:00
huang 127a243bd2 版本库:用户最近一月提交次数统计 2015-07-24 09:18:34 +08:00
cxt e63705bf36 Merge branch 'dev_cxt2' into szzh 2015-07-24 09:08:45 +08:00
cxt afce49839f Merge branch 'szzh' into dev_cxt2
Conflicts:
	app/views/layouts/base_users_new.html.erb
2015-07-24 09:07:58 +08:00
zhangshenjerry d639942b82 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
	app/helpers/users_helper.rb
	app/views/layouts/base_users_new.html.erb
2015-07-24 08:58:56 +08:00
zhangshenjerry 1b3c6bde69 个人主页--留言文本框修改 2015-07-24 08:56:19 +08:00
huang a2c2f41908 版本库:最近一月的提交次数统计 2015-07-23 17:32:48 +08:00
sw 4ce693ad17 课程讨论区发送邮件增加 2015-07-23 16:49:54 +08:00
sw b781d22a62 删除课程过滤器中没有的方法,增加删除课程的action 2015-07-23 16:17:13 +08:00
sw ce17cb1da0 个人主页,TA的课程显示和课程数量、课程列表不匹配 2015-07-23 15:13:18 +08:00
cxt 8fba66d330 3251缺陷的修复 2015-07-23 15:02:26 +08:00
sw 6775008b50 加入课程数和创建课程数不正确
去除掉无用代码
2015-07-23 14:42:47 +08:00
sw 76247d74a7 公共贴吧 顶和踩之后数字未变化 2015-07-23 10:50:48 +08:00
huang 6911debad0 Merge branch 'develop' into dev_hjq 2015-07-23 10:37:52 +08:00