 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 |
|
sw
|
4a781ea6b2
|
个人主页，助教不可以关闭课程。修改张生代码
|
2015-07-24 14:36:53 +08:00 |
|
sw
|
cf58ea8a9f
|
密码修改成功提示错误
|
2015-07-24 14:31:08 +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 |