Commit Graph

7983 Commits

Author SHA1 Message Date
huang a7ca8edbf0 Merge branch 'szzh' into dev_hjq 2015-07-27 15:24:45 +08:00
huang b325274f54 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-27 15:21:49 +08:00
huang 0d31536c6e 版本库没有提交记录时不显示统计结果,并给出提示 2015-07-27 15:21:31 +08:00
lizanle ebfa2f6749 Merge remote-tracking branch 'origin/szzh' into szzh 2015-07-27 10:03:55 +08:00
lizanle e74ca78b0e 日志级别在debug环境下 调整为debug 2015-07-27 10:03:45 +08:00
huang 26166abc44 清理冗余的代码 2015-07-27 07:08:37 +08:00
huang 1c6915384e Merge branch 'develop' into szzh 2015-07-26 14:37:39 +08:00
huang f37cbd3e0d 修订改为提交次数 2015-07-26 14:35:41 +08:00
huang cdd201daae Merge branch 'szzh' into develop 2015-07-26 14:25:28 +08:00
huang 59bd915cf6 Merge branch 'develop' into szzh
Conflicts:
	app/views/my/account.html.erb
2015-07-26 14:24:52 +08:00
huang 3c618de2f9 Merge branch 'dev_hjq' into szzh 2015-07-26 14:22:59 +08:00
huang 6701accb91 Merge branch 'szzh' into dev_hjq 2015-07-26 14:22:20 +08:00
huang 46272a28cf = 2015-07-26 14:15:25 +08:00
huang d89cba7a1f 版本库统计 2015-07-26 14:12:26 +08:00
huang 839cbf2a55 添加一年提交次数 2015-07-26 13:43:56 +08:00
guange 3662baa0cf merge: 2015-07-25 12:04:20 +08:00
huang b320a02976 统计 2015-07-25 12:06:21 +08:00
huang a8eb62b24e Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq
Conflicts:
	app/controllers/repositories_controller.rb
2015-07-25 12:05:14 +08:00
huang fbc0f074d4 代码量统计 2015-07-25 12:04:06 +08:00
guange 51e027fdc3 szzh特殊处理 2015-07-25 12:02:30 +08:00
guange 405104c403 传入@rev 2015-07-25 11:46:29 +08:00
huang 59a3072f81 调整时间区段 2015-07-25 11:20:11 +08:00
guange c3d8e6c838 erge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-07-25 11:18:47 +08:00
guange bf5f7f8d4f 加入分支参数 2015-07-25 11:18:09 +08:00
guange ea03386ec1 Merge branch 'dev_hjq' of http://repository.trustie.net/xianbo/trustie2 into dev_hjq 2015-07-25 10:17:28 +08:00
guange 5732d9cee2 加入输出日志 2015-07-25 10:17:03 +08:00
huang a04fe786ea 去掉用户名后的空格
时间区间测试
2015-07-25 00:24:59 +08:00
huang 088e9b200a 时间区间测试 2015-07-25 00:05:28 +08:00
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
sw 9a9658baf3 l留言跳转到用户主页 2015-07-24 17:28:46 +08:00
sw 19e60f753f 取消编程作业 2015-07-24 17:14:55 +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
zhangshenjerry f0e8d545dd Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-24 16:34:08 +08:00
zhangshenjerry 6b3882aff8 个人主页:如图值为0时,这些字段不要显示 2015-07-24 16:33:53 +08:00
sw 6c894e63ee 添加、修改分班的长度限定为20 2015-07-24 15:54:09 +08:00
huang 98ecf2f298 Merge branch 'szzh' into dev_hjq 2015-07-24 15:42:59 +08:00
sw caec634e4c Merge branch 'szzh' into develop 2015-07-24 15:19:36 +08:00
sw e44b31d450 Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh 2015-07-24 15:19:16 +08:00
sw 4f8170700e 增加开发语言的显示 2015-07-24 15:19:01 +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