 sw
|
e5547b953e
|
增加教师功能用户打包下载所有作业的功能
|
2014-07-22 13:35:10 +08:00 |
 nwb
|
3ba8ba010d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-22 10:52:21 +08:00 |
|
nwb
|
09f13409de
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 10:51:12 +08:00 |
|
nwb
|
840a7b337b
|
添加课程资源内容类型更新脚本
|
2014-07-22 10:50:58 +08:00 |
|
sw
|
d9b9b2152f
|
增加教师功能用户打包下载所有作业的功能
|
2014-07-22 09:56:29 +08:00 |
|
nwb
|
68be9c25b8
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/contest.html.erb
|
2014-07-22 09:52:16 +08:00 |
|
sw
|
58c3e98a21
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-22 09:44:24 +08:00 |
|
sw
|
ab55043880
|
修复当作业附件列表为空时，点击打包下载会报500错的BUG
|
2014-07-22 09:42:41 +08:00 |
 yanxd
|
87671e9d73
|
base footer merge bug.
|
2014-07-22 09:39:27 +08:00 |
|
nwb
|
5954ba1788
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 09:32:54 +08:00 |
|
nwb
|
cf11cac0ad
|
项目文档权限判断优化
|
2014-07-22 09:32:46 +08:00 |
|
yanxd
|
8496d6e0d2
|
删除project多余导致删除项目失败的关联关系
|
2014-07-22 09:17:21 +08:00 |
|
yanxd
|
edee2b2327
|
删掉welcome没用的方法
|
2014-07-22 09:17:21 +08:00 |
|
nwb
|
67dfd72845
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 09:15:28 +08:00 |
|
nwb
|
518edeac68
|
项目文档浏览BUG修改
|
2014-07-22 09:15:19 +08:00 |
 z9hang
|
513fd32ec5
|
修复查看个人动态无权限bug
|
2014-07-22 09:11:37 +08:00 |
|
z9hang
|
221aef4a7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-22 08:53:24 +08:00 |
|
z9hang
|
3e79dd6e32
|
竞赛通知鼠标悬停
导航丢失问题
|
2014-07-22 08:53:14 +08:00 |
|
nwb
|
b49344107c
|
用户动态权限判定修改
|
2014-07-22 08:51:35 +08:00 |
|
nwb
|
aebae800dd
|
竞赛首页修改
|
2014-07-22 08:37:07 +08:00 |
|
nwb
|
79eac39dc2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 17:50:51 +08:00 |
|
sw
|
6e954d314f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 17:45:01 +08:00 |
|
sw
|
bfda30ee80
|
1.增加修改竞赛作品页面作品类型、关联项目的默认选择
|
2014-07-21 17:44:14 +08:00 |
|
nwb
|
feaea8375e
|
优化资源下载界面
|
2014-07-21 17:33:13 +08:00 |
|
nwb
|
774eed0dbf
|
优化公开资源的下载权限判断
|
2014-07-21 17:29:30 +08:00 |
|
sw
|
b1251db30c
|
1.修改竞赛作品时增加作品类别下拉框选择
2.修改竞赛作品时增加获取选择其他时作品类别
|
2014-07-21 17:23:45 +08:00 |
|
nwb
|
5e462f1ae7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 17:00:36 +08:00 |
|
nwb
|
51e4d00691
|
课程回复后编辑框隐藏
|
2014-07-21 17:00:27 +08:00 |
|
sw
|
c8aaa2776c
|
1.作品类别增加其他选项，当用户选择其他时，显示一编辑框用于用户输入其作品所属类别
2.添加竞赛支持自定义类别
|
2014-07-21 16:59:00 +08:00 |
|
yanxd
|
fb138d1593
|
remove user_activities path, 3path bug.
|
2014-07-21 16:41:11 +08:00 |
|
nwb
|
222959d1da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 16:19:54 +08:00 |
|
nwb
|
27fda1f938
|
竞赛首页修改
|
2014-07-21 16:19:45 +08:00 |
|
yanxd
|
04ec6ff27a
|
course model validations testing.
|
2014-07-21 15:50:40 +08:00 |
|
yanxd
|
472b61fefe
|
删除了不能通过的测试，修改user_activities。所有原路由测试可以通过。
|
2014-07-21 15:49:23 +08:00 |
|
nwb
|
aea41ba997
|
修改竞赛首页搜索功能
|
2014-07-21 15:45:00 +08:00 |
|
sw
|
890bc7459d
|
修改项目列表页面当管理人员过多时，显示更多。点击更多按钮，跳转到该项目的成员列表页面
|
2014-07-21 15:31:15 +08:00 |
|
nwb
|
5adac1a32a
|
课程讨论区回复内容为空时提示
|
2014-07-21 15:15:10 +08:00 |
|
nwb
|
35ab3a2c7d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 13:53:45 +08:00 |
|
nwb
|
d8d8473811
|
优化课程列表成员数计算
|
2014-07-21 13:52:23 +08:00 |
|
nwb
|
3a249e7196
|
修正课程通知编辑BUG
|
2014-07-21 13:40:38 +08:00 |
|
nwb
|
ec71e8eeeb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 13:37:48 +08:00 |
|
nwb
|
c7f80effb7
|
修正课程讨论区删除帖子BUG
|
2014-07-21 13:37:36 +08:00 |
|
z9hang
|
5e4571d6af
|
修复部分页面导航丢失问题
|
2014-07-21 11:14:17 +08:00 |
|
nwb
|
2a8929b90f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-21 10:11:36 +08:00 |
|
z9hang
|
f273b60f32
|
更新ReadMe.txt
|
2014-07-19 17:04:44 +08:00 |
|
z9hang
|
162a4cfa84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-19 16:53:02 +08:00 |
|
z9hang
|
0322258386
|
去掉一个参加竞赛中多出来的项目创建
|
2014-07-19 16:52:43 +08:00 |
|
z9hang
|
376ba1d793
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
2014-07-19 16:48:14 +08:00 |
|
sw
|
8db6b50a65
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/courses_helper.rb
|
2014-07-19 16:47:05 +08:00 |
|
sw
|
e24323147d
|
修复项目描述过长不会自动换行的BUG
|
2014-07-19 16:45:27 +08:00 |