 sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
2014-05-17 11:15:27 +08:00 |
 yanxd
|
63af60d7b6
|
edit 图标丢失
bid修改文件保存
|
2014-05-17 10:44:01 +08:00 |
 z9hang
|
cb23b54d01
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-16 17:45:31 +08:00 |
|
z9hang
|
5d15349482
|
编辑作业时显示已添加的附件
|
2014-05-16 17:45:20 +08:00 |
 nwb
|
7e4343f00f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-16 17:29:59 +08:00 |
t430
|
00b866f06a
|
Merge branch 'develop'
|
2014-05-16 17:28:30 +08:00 |
 wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-16 17:06:38 +08:00 |
|
nwb
|
8f153520b4
|
调整上传资源界面
|
2014-05-16 16:29:01 +08:00 |
|
wanglinchun
|
84ae8a1cde
|
调整了新建参赛作品的显示样式
|
2014-05-16 16:22:59 +08:00 |
|
nwb
|
5c71d7e8be
|
1.资源上传默认类型修改为课件
2.调整标签显示
|
2014-05-16 15:30:32 +08:00 |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-16 11:04:49 +08:00 |
|
sw
|
029eb1a195
|
作业回复
|
2014-05-16 11:04:08 +08:00 |
|
ganyiang
|
08562c48fe
|
修复osp所有帖子页面布局错乱问题
|
2014-05-16 08:48:53 +08:00 |
|
z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
2014-05-15 19:16:36 +08:00 |
|
t430
|
09eae52fc1
|
hard picture file
|
2014-05-15 19:09:35 +08:00 |
|
t430
|
03ee62de64
|
Merge branch 'develop'
|
2014-05-15 18:16:24 +08:00 |
|
yanxd
|
be87e02e4c
|
Revert "从主页登陆时跳转到个人主页"
This reverts commit a794d612af.
|
2014-05-15 17:41:53 +08:00 |
|
yanxd
|
53a9d29292
|
Revert "acount"
This reverts commit 03dbcb1168.
|
2014-05-15 17:41:45 +08:00 |
|
nwb
|
b736dc91ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 17:36:52 +08:00 |
|
nwb
|
4f7087f9ae
|
课程修正为只有的教师才能查看学生学号
|
2014-05-15 17:36:39 +08:00 |
|
z9hang
|
e0592cd6f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 17:33:58 +08:00 |
|
z9hang
|
03dbcb1168
|
acount
|
2014-05-15 17:33:01 +08:00 |
|
wanglinchun
|
73175aa9b8
|
调整好了参加竞赛的项目列表显示样式
|
2014-05-15 17:26:39 +08:00 |
|
xianbo
|
9cdd101cc7
|
fix
|
2014-05-15 17:10:02 +08:00 |
|
nwb
|
fa7227931d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 16:59:27 +08:00 |
|
nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
2014-05-15 16:59:15 +08:00 |
|
wanglinchun
|
44ec6eabf6
|
完成了竞赛中参赛应用列表显示的调整
|
2014-05-15 16:50:30 +08:00 |
|
z9hang
|
06706b577d
|
贴吧、讨论区回复的样式修改
|
2014-05-15 16:27:56 +08:00 |
|
z9hang
|
a794d612af
|
从主页登陆时跳转到个人主页
|
2014-05-15 15:53:28 +08:00 |
|
yanxd
|
4db228f88e
|
调整tag高度为啥要修改两个地方我自己也忘了，改天再说
|
2014-05-15 15:52:25 +08:00 |
|
wanglinchun
|
a0a2d04bd7
|
参赛项目取出提交的人
|
2014-05-15 15:07:20 +08:00 |
|
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
2014-05-15 14:32:23 +08:00 |
|
nwb
|
22c37602db
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 13:59:14 +08:00 |
|
nwb
|
be73a232e8
|
修改显示
|
2014-05-15 13:58:54 +08:00 |
|
nwb
|
f2f81e1d02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 13:54:06 +08:00 |
|
nwb
|
4b064f3c2a
|
1.用户留言添加了竞赛类信息
2.优化跳转显示
|
2014-05-15 13:53:45 +08:00 |
|
yanxd
|
0c302c7aea
|
1s ===> 0.005s
|
2014-05-15 13:53:20 +08:00 |
|
nwb
|
8ef716b920
|
1.个人动态留言显示出留言人
2.留言添加跳转链接
|
2014-05-15 13:37:24 +08:00 |
|
yanxd
|
13a5aa988a
|
issues#623
|
2014-05-15 11:45:49 +08:00 |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-15 11:26:45 +08:00 |
|
z9hang
|
dcc2789aae
|
修正附件型作业已提交数量显示问题
|
2014-05-15 11:14:44 +08:00 |
 fanqiang
|
4ee9602621
|
..
|
2014-05-15 10:51:48 +08:00 |
|
z9hang
|
fb9d6f74af
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 10:50:57 +08:00 |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
2014-05-15 10:50:46 +08:00 |
|
wanglinchun
|
bb3536a7d5
|
调整了参赛作品页面中最终得分和打分总人数和下面文字的剧中对其
|
2014-05-15 10:46:05 +08:00 |
|
fanqiang
|
74169221a3
|
1234
|
2014-05-15 10:33:52 +08:00 |
|
wanglinchun
|
65f1e2a8d1
|
参赛作品页面添加托管项目网址+超链接+判断网址是否为空
|
2014-05-15 10:25:24 +08:00 |
|
wanglinchun
|
f88322f2a1
|
参赛作品页面添加托管项目网址+超链接
|
2014-05-15 10:06:51 +08:00 |
|
fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-15 10:05:25 +08:00 |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
2014-05-15 10:05:05 +08:00 |