 z9hang
|
e78a309842
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-19 15:23:43 +08:00 |
|
z9hang
|
19d1682077
|
修改编辑作业提交文件处样式
|
2014-05-19 15:23:34 +08:00 |
|
z9hang
|
eaa9c94290
|
自己的用户界面也不现实邮箱
|
2014-05-19 12:00:13 +08:00 |
|
z9hang
|
2b12d31fb8
|
去除网站中的邮箱地址显示
|
2014-05-19 11:02:07 +08:00 |
 sw
|
7ead12dba6
|
1.优化路由代码
2.修改当查询学校课程数数量少于8个时，推荐9-当前学校课程数量门最好的课程给用户，并且排除当前学校课程
|
2014-05-19 10:00:24 +08:00 |
|
z9hang
|
edf2a84072
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 16:20:59 +08:00 |
|
z9hang
|
2524600aeb
|
修正贴吧留言删除附件后跳转错误问题
|
2014-05-17 16:20:48 +08:00 |
|
sw
|
3fee4211a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-17 15:39:28 +08:00 |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
2014-05-17 15:39:18 +08:00 |
 yanxd
|
9b31496a8c
|
edit 图标丢失
bid修改文件保存
|
2014-05-17 15:26:08 +08:00 |
|
z9hang
|
ea095a6f61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 15:17:09 +08:00 |
|
z9hang
|
fc1d5baf95
|
课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐，以及搜索条的上下居中。
|
2014-05-17 15:15:33 +08:00 |
 nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 14:39:00 +08:00 |
|
nwb
|
7df6be8ff4
|
调整资源文件界面
|
2014-05-17 14:07:57 +08:00 |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
2014-05-17 13:49:27 +08:00 |
|
sw
|
4c6b514d03
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-17 11:15:40 +08:00 |
|
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 |