 sw
|
3274013862
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-29 08:54:05 +08:00 |
|
sw
|
8ef0d0f8a6
|
1、个人主页，布局右侧显示不够左侧长度时自动补充
2、个人主页js、css提取出来
3、css错误整理
|
2015-07-28 16:38:18 +08:00 |
 lizanle
|
8f6b72564a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-07-28 16:20:08 +08:00 |
|
lizanle
|
d13ab7aa5d
|
点击空白处可以让弹出框隐藏
|
2015-07-28 16:20:01 +08:00 |
|
sw
|
b765feb885
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-28 16:08:48 +08:00 |
|
sw
|
9728277005
|
1、课程动态、每次项目动态显示13条
2、取消动态页面、他的课程、他的项目、留言等显示
|
2015-07-28 16:04:40 +08:00 |
|
lizanle
|
90a416fb2f
|
点击空白处可以让弹出框隐藏
|
2015-07-28 16:01:16 +08:00 |
|
sw
|
5dc3eba27a
|
我的课程、我的项目、他的课程、他的项目只显示出有权限的课程和项目。以及数量统计不正确
|
2015-07-28 15:56:06 +08:00 |
|
sw
|
03c1099b78
|
个人主页，取消个人主页的箭头
|
2015-07-28 15:04:55 +08:00 |
|
sw
|
38599614d3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-28 15:00:23 +08:00 |
|
sw
|
26bdc376ee
|
取消上一步
|
2015-07-28 14:25:43 +08:00 |
|
lizanle
|
b22f9b221b
|
db_schema.rb
|
2015-07-28 11:34:50 +08:00 |
|
sw
|
f31015c989
|
上线编程作业
|
2015-07-28 11:24:30 +08:00 |
|
lizanle
|
6b45702f8c
|
点击空白处可以让弹出框隐藏
|
2015-07-28 11:20:21 +08:00 |
|
lizanle
|
ad5c4052fb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-07-28 10:27:56 +08:00 |
|
lizanle
|
45d5972a93
|
在发布问卷的时候中间可以插入问题
|
2015-07-28 10:27:45 +08:00 |
|
sw
|
6091369e02
|
增加学校logo的上传功能，以及实时预览效果
|
2015-07-27 18:20:20 +08:00 |
|
sw
|
19c515e11e
|
学校列表增加序号显示
|
2015-07-27 16:15:04 +08:00 |
|
sw
|
7c818ce59a
|
admin界面增加学校列表显示，以及按名称过滤功能
|
2015-07-27 16:07:29 +08:00 |
|
sw
|
922bb0167c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-07-27 15:22:02 +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 |
|
sw
|
81c942a792
|
整理代码
|
2015-07-27 15:06:00 +08:00 |
|
sw
|
f106965093
|
Merge branch 'develop' into szzh
|
2015-07-27 14:54:29 +08:00 |
|
sw
|
b94f5a54cc
|
输入输出结果集只要老师才可以看到
|
2015-07-27 10:43:39 +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 |