 fanqiang
|
c5dd0317c2
|
修改合并后的bug（open_source_project）
|
2014-05-21 09:54:05 +08:00 |
 yanxd
|
0ab17f1e90
|
contest image show
|
2014-05-21 09:46:40 +08:00 |
 wanglinchun
|
a5cb14274c
|
修改参赛作品页面中未登录状态下的提示
|
2014-05-21 09:43:42 +08:00 |
|
wanglinchun
|
dd43e2c3fc
|
竞赛页面我要参赛中添加判断，当用户未登录时提示登录后参赛
|
2014-05-21 09:38:08 +08:00 |
xianbo
|
e3fe69c445
|
Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/open_source_projects/_show_topics.html.erb
|
2014-05-21 08:25:20 +08:00 |
 z9hang
|
45339e53d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 18:07:25 +08:00 |
|
fanqiang
|
973a59042c
|
修改帖子显示用户名与链接问题
|
2014-05-20 16:33:50 +08:00 |
|
wanglinchun
|
bcb3bf0c19
|
调整参赛作品编辑页面中托管项目列表的显示宽度
|
2014-05-20 16:13:59 +08:00 |
|
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
2014-05-20 16:10:05 +08:00 |
|
wanglinchun
|
77b7da81fd
|
参赛作品页面编辑功能中添加修改托管项目列表完成
|
2014-05-20 15:58:34 +08:00 |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
2014-05-20 15:56:51 +08:00 |
|
yanxd
|
4aed14228a
|
project/course/ members remove link
|
2014-05-20 15:53:23 +08:00 |
|
yanxd
|
85c77ca074
|
xss, ckeditor js bug.
|
2014-05-20 15:48:02 +08:00 |
|
yanxd
|
dac992548a
|
course_form
|
2014-05-20 15:47:48 +08:00 |
 nwb
|
0b4c95711a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 15:06:18 +08:00 |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
2014-05-20 15:05:54 +08:00 |
|
yanxd
|
7189d9a14a
|
course_form
|
2014-05-20 14:52:30 +08:00 |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
2014-05-20 14:33:50 +08:00 |
|
yanxd
|
9ae8494c97
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-20 13:58:37 +08:00 |
|
z9hang
|
5b8b2045f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 11:36:12 +08:00 |
|
z9hang
|
b3489d3e68
|
修改删除文件后跳转错误问题
|
2014-05-20 11:36:01 +08:00 |
|
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 11:33:36 +08:00 |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
2014-05-20 11:33:17 +08:00 |
|
wanglinchun
|
10b34341c7
|
修改参赛作品编辑页面说明文字：应用--》作品
|
2014-05-20 10:48:11 +08:00 |
|
wanglinchun
|
2c30008981
|
竞赛页面中我要参赛下面修改温馨提示内容
|
2014-05-20 10:32:15 +08:00 |
|
yanxd
|
2aeb12616b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-20 10:09:09 +08:00 |
|
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构， 不再是一对一的匹配帖子，而是添加了一个中间表
|
2014-05-20 10:06:59 +08:00 |
 sw
|
4de089250f
|
修改删除留言方法为destroy_jour，以及相关路由，访问action的改变
|
2014-05-20 09:59:33 +08:00 |
|
yanxd
|
112b8de921
|
issues#575
|
2014-05-20 09:50:28 +08:00 |
|
wanglinchun
|
f815410381
|
修改了新建参赛作品中托管项目的显示颜色和宽度
|
2014-05-20 09:40:13 +08:00 |
|
yanxd
|
f9166a71a7
|
issues#555
|
2014-05-20 09:12:15 +08:00 |
|
sw
|
c141501085
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-20 08:49:00 +08:00 |
|
sw
|
9a62fe22c6
|
修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
|
2014-05-20 08:48:42 +08:00 |
|
yanxd
|
9373666576
|
混淆课程数量
|
2014-05-19 17:56:50 +08:00 |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
2014-05-19 17:44:36 +08:00 |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
2014-05-19 17:39:51 +08:00 |
|
sw
|
0de77bdc44
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-19 16:53:47 +08:00 |
|
sw
|
14a468066f
|
修复打开首页，SQL没有默认的school_id的问题
|
2014-05-19 16:53:38 +08:00 |
|
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
2014-05-19 16:12:18 +08:00 |
|
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
2014-05-19 15:40:53 +08:00 |
|
fanqiang
|
a07ae9be58
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-19 15:38:18 +08:00 |
|
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 |