fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
2014-05-27 09:01:36 +08:00 |
yanxd
|
98444ef01e
|
remove fuzzy routes|add school missing row
|
2014-05-27 08:32:43 +08:00 |
yanxd
|
4b1d7e049d
|
233
|
2014-05-26 14:27:47 +08:00 |
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
2014-05-23 09:49:36 +08:00 |
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 09:44:33 +08:00 |
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
2014-05-22 17:04:45 +08:00 |
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 16:38:04 +08:00 |
yanxd
|
f44b930037
|
233
|
2014-05-22 15:33:38 +08:00 |
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
2014-05-22 11:58:43 +08:00 |
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 09:51:05 +08:00 |
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
2014-05-21 16:45:11 +08:00 |
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 15:31:05 +08:00 |
sw
|
c7b19d8f2e
|
修改作业提交流程
|
2014-05-21 14:10:11 +08:00 |
wanglinchun
|
518de57123
|
将参赛作品编辑更新后的提示语修改为汉语
|
2014-05-21 11:24:11 +08:00 |
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
2014-05-21 11:16:46 +08:00 |
wanglinchun
|
a5cb14274c
|
修改参赛作品页面中未登录状态下的提示
|
2014-05-21 09:43:42 +08:00 |
wanglinchun
|
dd43e2c3fc
|
竞赛页面我要参赛中添加判断,当用户未登录时提示登录后参赛
|
2014-05-21 09:38:08 +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 |
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 |
sw
|
4de089250f
|
修改删除留言方法为destroy_jour,以及相关路由,访问action的改变
|
2014-05-20 09:59:33 +08:00 |
sw
|
9a62fe22c6
|
修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
|
2014-05-20 08:48:42 +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
|
7ead12dba6
|
1.优化路由代码
2.修改当查询学校课程数数量少于8个时,推荐9-当前学校课程数量门最好的课程给用户,并且排除当前学校课程
|
2014-05-19 10:00:24 +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 |
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
|
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 |
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 |
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 |
nwb
|
f2f81e1d02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 13:54:06 +08:00 |
nwb
|
8ef716b920
|
1.个人动态留言显示出留言人
2.留言添加跳转链接
|
2014-05-15 13:37:24 +08:00 |
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-15 11:26:45 +08:00 |
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
2014-05-15 10:50:46 +08:00 |
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:46:38 +08:00 |
wanglinchun
|
d019a4d9ce
|
重新调整了:评奖,暂未评奖,未评奖
|
2014-05-14 16:29:46 +08:00 |
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
2014-05-14 16:19:12 +08:00 |
nwb
|
4235ca8984
|
修正BUG
|
2014-05-14 15:23:26 +08:00 |
nwb
|
c0c184d8bf
|
1.修正错误
2.添加全部资源视图时的对资源分类的编辑
|
2014-05-14 15:16:11 +08:00 |
nwb
|
1caa7940dc
|
1、资源发布者的分类和tag编辑;
2、网站管理者对资源的再分类和tag再编辑
|
2014-05-14 15:08:06 +08:00 |
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
2014-05-14 15:03:04 +08:00 |
wanglinchun
|
65340f604d
|
sdf
|
2014-05-14 09:23:04 +08:00 |
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址;
参赛应用页面添加所属项目网址;
|
2014-05-13 16:49:23 +08:00 |