 sw
|
a07bb18dcb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-12-30 15:39:23 +08:00 |
|
sw
|
d08bce46dd
|
调整页面代码
|
2014-12-30 14:52:44 +08:00 |
 =
|
098b8094b1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-30 14:35:57 +08:00 |
|
=
|
305cbae008
|
维护浮动框
|
2014-12-30 14:35:35 +08:00 |
 z9hang
|
101be35f19
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-30 14:29:41 +08:00 |
|
z9hang
|
899ac6f654
|
添加作品列表导出excel功能
|
2014-12-30 14:29:30 +08:00 |
|
sw
|
66d67e2cc9
|
修改通知界面主题最多为60个字符
|
2014-12-30 14:14:20 +08:00 |
 alan
|
6a86e1c386
|
<分组点击两次>bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-30 14:00:48 +08:00 |
|
sw
|
933a84f51d
|
项目、课程主页用户搜索后结果界面也支持按姓名、昵称、邮箱搜索
|
2014-12-30 11:09:47 +08:00 |
|
sw
|
ee1df78f13
|
课程、项目首页增加用户姓名、邮箱、昵称等搜索功能
|
2014-12-30 10:57:39 +08:00 |
|
sw
|
0bce2ae8f3
|
#1752“竞赛通知”，“参加竞赛”时,左侧以及上方布局不同
|
2014-12-30 09:48:30 +08:00 |
|
alan
|
36eca5e425
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-29 20:46:41 +08:00 |
|
alan
|
e39e801c61
|
增加《学生列表按作业评分排序功能》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-29 20:46:27 +08:00 |
|
z9hang
|
058d19f8d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-29 17:45:05 +08:00 |
|
z9hang
|
61e1f0fa52
|
导出作品列表功能
|
2014-12-29 17:44:39 +08:00 |
|
sw
|
3545a8b0bc
|
修改竞赛评分显示异常
|
2014-12-29 17:34:07 +08:00 |
|
sw
|
05b9b26314
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-12-29 17:00:35 +08:00 |
|
alan
|
9ba0c75ddb
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-29 16:57:47 +08:00 |
|
alan
|
fb398904b6
|
优化《学生列表》分页查询
Signed-off-by: alan <547533434@qq.com>
|
2014-12-29 16:57:31 +08:00 |
|
z9hang
|
cd6508efa2
|
提交部分代码
|
2014-12-29 16:30:39 +08:00 |
|
sw
|
afbcc3f8d3
|
1.#1742 首次加载课程实践平台主页时，点击“加入课程”快捷通道，课程ID默认是当前登录用户名，口令默认为当前登录用户密码
2.修改加入课程弹出框样式
|
2014-12-29 10:42:48 +08:00 |
|
alan
|
329be27567
|
增加《分班查询》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-26 17:31:01 +08:00 |
|
sw
|
2e1387b9e4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-26 15:37:22 +08:00 |
|
alan
|
d2aef552e6
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-26 14:50:14 +08:00 |
|
sw
|
f549530744
|
取消课程动态中描述显示为最多30个字母或汉字的限制
|
2014-12-25 17:36:53 +08:00 |
|
sw
|
9545b1da0c
|
优化课程成员列表访问效率
|
2014-12-25 09:02:58 +08:00 |
|
sw
|
a3910477e4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-25 08:40:14 +08:00 |
|
alan
|
0e7f7a4254
|
优化《作业评分》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-24 18:31:45 +08:00 |
|
sw
|
b0c2958a72
|
修复作业倒计时和截至提示未和提交作业按钮对齐
|
2014-12-24 17:25:16 +08:00 |
|
sw
|
92c7ba49d1
|
修复作业倒计时和截至提示未和提交作业按钮对齐
|
2014-12-24 17:24:25 +08:00 |
|
sw
|
63bc66adc3
|
修复关联版本库会默认登录帐号密码的BUG
|
2014-12-24 11:12:12 +08:00 |
|
sw
|
98cfeeee82
|
#1050 wiki界面部分意思不明确的按钮隐藏
|
2014-12-24 10:20:41 +08:00 |
|
sw
|
819c4c0bc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/users_controller.rb
|
2014-12-24 09:45:23 +08:00 |
|
sw
|
e6aab5baf2
|
#1650 老师应该可以删除自己课程的留言，或帖子
|
2014-12-24 09:30:45 +08:00 |
|
sw
|
3caf5c8657
|
#1736 猎豹浏览器中，打开某竞赛，进入竞赛主页看到右上方搜索按钮下移了
|
2014-12-23 15:18:55 +08:00 |
|
sw
|
30d8d82f37
|
#1734 某竞赛主页中当搜索框为空时，点击搜索的提示问题
|
2014-12-23 15:13:16 +08:00 |
|
sw
|
f68e62d1c1
|
修改403、404的html错误
|
2014-12-23 09:33:39 +08:00 |
|
sw
|
053edb7934
|
#1730 修改课程作业中，当作业名字过长时显示不能换行，贴近按钮显示
|
2014-12-22 17:22:22 +08:00 |
 zhuhao
|
8bd42054d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-22 17:13:36 +08:00 |
|
zhuhao
|
61a859f91a
|
托管平台项目主业搜索按钮样式调整
|
2014-12-22 17:12:59 +08:00 |
|
alan
|
b8e00e16df
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-22 17:02:49 +08:00 |
|
alan
|
629641d065
|
《调整学生列表页面》和《优化个人主页查询》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 17:02:32 +08:00 |
|
z9han
|
7f57bd97ff
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-22 16:17:07 +08:00 |
|
z9han
|
67ffc03fee
|
#1708 课程--资源库：非课程成员可以引用私有课程里面的公开资源,改为提示没有权限引用
|
2014-12-22 16:16:33 +08:00 |
|
alan
|
2084a17191
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-22 15:48:51 +08:00 |
|
alan
|
6c09228139
|
根据凌彬设计修改学生列表样式
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 15:48:35 +08:00 |
|
z9han
|
b143093e49
|
1、#1707 课程--资源库：全站搜索得到当前作业模块的资源，应显示为“选入我的课程”.2、公开私有字样未居中问题
|
2014-12-22 15:45:55 +08:00 |
|
alan
|
683acfcafc
|
优化《学生列表作业评分查询太慢》功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 10:31:09 +08:00 |
|
alan
|
d81240e63c
|
修改《关注老师后，老师发布的作业都会在我主页的动态中显示出来，若我未加入该课程但感兴趣点击后返回403页面，提示不够人性化》bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-22 01:29:53 +08:00 |
|
alan
|
49cb52146f
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-12-19 23:12:46 +08:00 |