 yutao
|
709c026910
|
...
|
2015-05-28 15:48:52 +08:00 |
 huang
|
e2ec7d5f3e
|
QQ在线支持功能
|
2015-05-28 15:45:36 +08:00 |
 alan
|
1c760e8117
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into redis_cache
|
2015-05-28 15:14:57 +08:00 |
|
alan
|
f47d30f22a
|
项目首页缓存设置
Signed-off-by: alan <547533434@qq.com>
|
2015-05-28 15:14:38 +08:00 |
|
huang
|
cae882b3d6
|
新增邮件状态表
相关关联
|
2015-05-28 14:44:04 +08:00 |
 sw
|
6c67b829c5
|
Merge branch 'guange_dev' into develop
|
2015-05-28 14:15:37 +08:00 |
|
sw
|
3f9855f25c
|
老师删除作业功能
|
2015-05-28 14:13:47 +08:00 |
 guange
|
6f15738817
|
换一个autologin,解决老数据问题
|
2015-05-28 12:23:56 +08:00 |
|
sw
|
8c6ea88504
|
1、作品列表TAB切换
2、作品界面作业详细信息
3、到处Excel名称
|
2015-05-28 12:02:26 +08:00 |
|
sw
|
ee0a9093d3
|
学生作品附件列表显示以及间距调整
|
2015-05-28 11:37:08 +08:00 |
|
sw
|
e1a3ed4b82
|
到处Excel
|
2015-05-28 11:07:28 +08:00 |
|
sw
|
b182feb988
|
作业全部附件打包下周无法下载
|
2015-05-28 10:47:40 +08:00 |
|
sw
|
bf1574db59
|
Merge branch 'szzh' into develop
|
2015-05-28 10:31:48 +08:00 |
|
sw
|
a58a548095
|
Merge branch 'guange_dev' into szzh
|
2015-05-28 10:31:06 +08:00 |
|
sw
|
ff4dae56d1
|
作业所有作品附件打包下载
|
2015-05-28 10:30:10 +08:00 |
|
yutao
|
625023686a
|
...
|
2015-05-28 10:12:43 +08:00 |
|
guange
|
5279c2d3e5
|
删除所有的域的autologin
|
2015-05-28 09:51:32 +08:00 |
|
sw
|
a1e28bcd9e
|
增加按学生login、学号、真实姓名排序
|
2015-05-28 09:46:35 +08:00 |
|
sw
|
1fdd3b0b92
|
作品列表的各种排序
|
2015-05-28 09:19:49 +08:00 |
|
yutao
|
586c3709db
|
...
|
2015-05-28 09:18:02 +08:00 |
|
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 |