 sw
|
7537aa4a1a
|
作业批次
|
2015-05-28 09:03:01 +08:00 |
|
sw
|
356dd21c52
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-28 08:47:28 +08:00 |
|
sw
|
bcb1b8dc39
|
Merge branch 'guange_dev' into szzh
|
2015-05-28 08:47:14 +08:00 |
|
sw
|
ec42497417
|
Merge branch 'guange_dev' into develop
|
2015-05-28 08:45:31 +08:00 |
 guange
|
aaf7d645ba
|
Merge branch 'guange_dev' of http://repository.trustie.net/xianbo/trustie2 into guange_dev
|
2015-05-27 19:39:31 +08:00 |
|
guange
|
1fe49c8cb1
|
添加删除作业功能
|
2015-05-27 19:39:06 +08:00 |
|
guange
|
47e3e93a2f
|
cookies 删除也需要domain
|
2015-05-27 19:37:46 +08:00 |
|
sw
|
a218015e57
|
1、作业附件显示不正确
2、没学号时作品列表显示有问题
|
2015-05-27 17:51:26 +08:00 |
 alan
|
32a6c29c7c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
Gemfile
app/views/layouts/base_projects.html.erb
app/views/projects/_development_group.html.erb
app/views/projects/_research_team.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2015-05-27 17:42:25 +08:00 |
|
alan
|
d2720d8fb8
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-27 17:40:46 +08:00 |
 huang
|
1b5c41b3ad
|
邮件配置
|
2015-05-27 17:40:18 +08:00 |
|
sw
|
378907d68c
|
打分后匿评悬浮的详细信息不显示
|
2015-05-27 17:34:44 +08:00 |
|
sw
|
4783bad924
|
1、打分后作品的各项得分数据刷新
2、作品列表样式调整
|
2015-05-27 17:32:14 +08:00 |
 yutao
|
e97503647d
|
...
|
2015-05-27 17:26:11 +08:00 |
|
alan
|
59c77e870c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
Conflicts:
db/schema.rb
public/javascripts/course.js
Signed-off-by: alan <547533434@qq.com>
|
2015-05-27 17:01:52 +08:00 |
|
sw
|
52834d8fa9
|
打分增加打分角色的判定
|
2015-05-27 16:21:59 +08:00 |
|
huang
|
8e74712b86
|
Merge branch 'szzh' into dev_hjq
|
2015-05-27 16:10:44 +08:00 |
|
sw
|
d80ade96c8
|
1、添加评分后页面刷新
2、如果只填写了评分就只更新评分，不对评论进行修改
3、如果已经评分过，继续评分为修改，如果未进行过评分，就是添加
|
2015-05-27 16:01:00 +08:00 |
|
huang
|
df5c040aab
|
添加项目issue复制功能
|
2015-05-27 16:00:11 +08:00 |
|
yutao
|
cd38e9aa70
|
...
|
2015-05-27 15:50:31 +08:00 |
|
sw
|
bdb0f638da
|
增加批阅结果的下载，解决批阅结果下周报错
|
2015-05-27 15:18:53 +08:00 |
|
sw
|
fea784cbcc
|
1、添加评分回复路由改变
2、删除回复功能及界面刷新
|
2015-05-27 15:11:11 +08:00 |
|
sw
|
2bb59ffd79
|
1、作品评论回复以及相关界面刷新
2、调整回复框宽度
|
2015-05-27 14:58:55 +08:00 |
|
huang
|
04c54d4f6e
|
项目新闻显示页面时间和附件换位
|
2015-05-27 14:50:09 +08:00 |
|
huang
|
95f3d89afa
|
项目新闻添加编辑器：显示页面、列表页面新样式显示
|
2015-05-27 14:45:36 +08:00 |
|
yutao
|
94c7c68b7f
|
...
|
2015-05-27 14:42:36 +08:00 |
|
huang
|
e0ea57b213
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-27 13:39:24 +08:00 |
|
sw
|
93c4a54598
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-27 11:27:33 +08:00 |
|
sw
|
05674f991f
|
Merge branch 'guange_dev' into szzh
|
2015-05-27 11:27:18 +08:00 |
|
sw
|
a0324f5e39
|
增加评分回复，以及相关显示
评分回复真实信息显示
评分回复以及回复删除
|
2015-05-27 11:25:32 +08:00 |
|
huang
|
6bf76fdba1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-05-27 11:15:47 +08:00 |
|
huang
|
1e8ef39369
|
Merge branch 'guange_dev' into szzh
|
2015-05-27 11:15:30 +08:00 |
|
huang
|
f770702d0b
|
issue编辑时候去掉铅笔图标
|
2015-05-27 11:08:05 +08:00 |
|
huang
|
5af284e8a4
|
项目资源统计代码优化
|
2015-05-27 10:43:03 +08:00 |
|
sw
|
eab44ddaeb
|
Merge branch 'guange_dev' into develop
|
2015-05-27 09:30:05 +08:00 |
|
sw
|
1fe7c70955
|
1、评价作品增加批阅结果的删除与显示
2、修改课程的昵称下拉框无法正常显示
|
2015-05-27 09:29:27 +08:00 |
|
guange
|
1919292c58
|
还是issues count计算问题
|
2015-05-27 09:23:48 +08:00 |
|
yutao
|
dc557f7826
|
...
|
2015-05-27 09:04:39 +08:00 |
 lizanle
|
144b68df19
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-05-27 08:56:56 +08:00 |
|
sw
|
44d452cdb5
|
Merge branch 'guange_dev' into develop
|
2015-05-27 08:56:56 +08:00 |
|
lizanle
|
10e24bebd5
|
动态首页改变
|
2015-05-27 08:56:34 +08:00 |
|
sw
|
fa3b9e2af0
|
进入作品评分界面，评分等数据的初始化
|
2015-05-27 08:55:33 +08:00 |
|
huang
|
6bb649e831
|
issue引用在项目动态的显示格式调整
|
2015-05-27 08:36:32 +08:00 |
|
guange
|
1975df63d4
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
|
2015-05-26 23:11:34 +08:00 |
|
guange
|
3fa5179026
|
issue数统计拖慢性能
|
2015-05-26 23:11:10 +08:00 |
|
guange
|
9ce1916fbb
|
autologin token cookies domain修改
|
2015-05-26 23:10:08 +08:00 |
|
guange
|
f3a15ce313
|
加入性能分析 oneapm
|
2015-05-26 23:09:10 +08:00 |
|
sw
|
a006e2e462
|
1、实现打分功能
2、打分之后页面刷新
3、获取指定用户对某一作业的评分结果
|
2015-05-26 18:14:53 +08:00 |
|
sw
|
1ae8c7d234
|
作业评分、上传评阅结果，以及上传结果的显示样式
|
2015-05-26 17:51:56 +08:00 |
|
alan
|
0b6f35055d
|
Signed-off-by: alan <547533434@qq.com>
|
2015-05-26 17:44:39 +08:00 |