alan
|
b5d007ccf7
|
增加《点击分组名,该分组名底色发生改变》
Signed-off-by: alan <547533434@qq.com>
|
2014-12-06 00:52:06 +08:00 |
alan
|
fbe6ce16d7
|
修改《分组界面》样式
Signed-off-by: alan <547533434@qq.com>
|
2014-12-05 23:34:16 +08:00 |
alan
|
62497913d7
|
修改《分组名可以为空格》bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-05 17:13:05 +08:00 |
alan
|
63a9fcd483
|
修改《加入分组后分组人数未改变》bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-05 16:44:05 +08:00 |
alan
|
747fb84ef6
|
修改《添加,修改分组名》bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-05 16:33:55 +08:00 |
alan
|
c5a7baa454
|
修改合并引起的bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-05 16:21:53 +08:00 |
alan
|
a51d0e88dc
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
app/controllers/courses_controller.rb
|
2014-12-05 16:05:53 +08:00 |
alan
|
9d0e39e708
|
修改孙涛提出的bug
Signed-off-by: alan <547533434@qq.com>
|
2014-12-05 16:03:41 +08:00 |
sw
|
1706fffb4b
|
修改留言的父级留言删除后,页面报错的BUG
|
2014-12-05 16:02:26 +08:00 |
sw
|
2ce49c041b
|
#1664 用户个人主页中的留言页面中登陆用户可以删除别人回复
|
2014-12-05 15:25:33 +08:00 |
sw
|
d5de3dcb56
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/courses_controller.rb
|
2014-12-05 14:48:22 +08:00 |
sw
|
1084cda730
|
#1665 “软件创客”链接入口,点击报404
|
2014-12-05 11:37:37 +08:00 |
alan
|
020242a8c9
|
增减《查询显示人数以及显示全部人数》功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-05 11:27:51 +08:00 |
alan
|
078639b35a
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
2014-12-05 10:53:58 +08:00 |
alan
|
cfb8edbfe2
|
分组功能样式微调
Signed-off-by: alan <547533434@qq.com>
|
2014-12-05 10:53:43 +08:00 |
sw
|
a64cae5da3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-05 10:30:39 +08:00 |
sw
|
ecfce02de7
|
修改留言超过5条时界面显示异常
|
2014-12-05 10:22:10 +08:00 |
sw
|
dde20ba458
|
修改部分浏览器评分弹出框位置不正确
|
2014-12-05 10:20:37 +08:00 |
sw
|
bef4735f40
|
修改教师查看匿评列表不正确
|
2014-12-05 10:03:49 +08:00 |
z9hang
|
2b3edbc8fb
|
#1663 课程资源库--全站搜索:老师不能引用其他资源至我的课程了
|
2014-12-05 09:54:13 +08:00 |
sw
|
bed9adaa7a
|
1.修改添加评论、留言的action
2.添加评论、留言时界面数据刷新
3.修改删除留言的action
4.删除留言后界面刷新
5.增加权限控制
|
2014-12-05 09:43:03 +08:00 |
alan
|
c9b84d0a35
|
增加《学生加入,退出分组》功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-04 22:02:10 +08:00 |
alan
|
66f93150f6
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
|
2014-12-04 19:09:51 +08:00 |
alan
|
9765f11f7e
|
增加<修改,添加分组>功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-04 19:09:10 +08:00 |
sw
|
4bbc76a217
|
1.重写homework_attach的show方法,优化弹出框的弹出效率
2.修改相关的view层代码
3.增加获取指定评分的评论的方法
|
2014-12-04 18:01:53 +08:00 |
sw
|
803847585e
|
#1661 学生、老师打分界面:提交评论->确认
|
2014-12-04 15:40:12 +08:00 |
sw
|
c1852670dd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-04 15:35:17 +08:00 |
zhuhao
|
307dacb319
|
变价课程通知后,保存取消按钮样式统一
|
2014-12-04 11:07:26 +08:00 |
alan
|
3d12d6f0e8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
db/schema.rb
|
2014-12-03 19:20:25 +08:00 |
alan
|
615bc7d444
|
增加课程分组的功能
Signed-off-by: alan <547533434@qq.com>
|
2014-12-03 19:17:10 +08:00 |
zhuhao
|
ebc66af3b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-03 11:06:13 +08:00 |
zhuhao
|
ebed04c7bf
|
创客空间左侧公共页被拉伸导致出现滚动条的调整
|
2014-12-03 11:05:52 +08:00 |
sw
|
19b61118ac
|
修改加入按钮失败后变为加入课程按钮
|
2014-12-02 18:00:57 +08:00 |
sw
|
f934824175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-02 17:05:27 +08:00 |
sw
|
35f2462241
|
修改重复评分时,评分初始值不正确
|
2014-12-02 17:00:35 +08:00 |
sw
|
3b2c7cc0ec
|
教师评论不能被删除
|
2014-12-02 16:57:54 +08:00 |
sw
|
d9c3103e6e
|
1.修改留言列表得分显示样式
2.修改获取指定用户对作业评分的方法
|
2014-12-02 16:55:16 +08:00 |
sw
|
ad8bd131ce
|
调整页面代码
|
2014-12-02 16:29:47 +08:00 |
sw
|
277e5ecad3
|
1.老师评价、学生匿评、学生留言不同情况下页面刷新
2.修改老师评价、学生匿评、学生留言是载入中在弹出窗后面显示
3.修改老师未批列表
4.取消关闭作业详细信息列表时界面刷新,改为评论时刷新页面
5.修改作业显示界面缺失参数报错
|
2014-12-02 16:21:36 +08:00 |
z9hang
|
97fb7a1f86
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-02 15:30:42 +08:00 |
z9hang
|
29d4266c6c
|
引用次数的统计修改及按引用排序
|
2014-12-02 15:30:32 +08:00 |
alan
|
63c9804da8
|
添加course_group表单到数据库中,并建立对应于members和courses之间的关联,
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
2014-12-02 14:41:36 +08:00 |
sw
|
5bd8cc76f4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-02 08:46:23 +08:00 |
zhuhao
|
0b0763e710
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-12-01 20:26:41 +08:00 |
zhuhao
|
a7d7b790d2
|
公共页个性签名的提交按钮显示调整
|
2014-12-01 20:26:21 +08:00 |
sw
|
6fd68806d5
|
修改课程教师就具有开启、关闭匿评、修改作业的权限
|
2014-12-01 16:45:03 +08:00 |
z9hang
|
d37d7fb83d
|
修复课程资源模块两个搜索按钮鼠标点击才改变样式问题(代码被还原导致)
|
2014-12-01 16:34:25 +08:00 |
sw
|
9a61354328
|
1.评分、评论作为一个action发送到服务器
2.修改作业的show方法获取参数不正确的问题
|
2014-12-01 15:41:49 +08:00 |
sw
|
f5b1cbcfe4
|
优化作业弹出框效率
|
2014-12-01 14:47:07 +08:00 |
sw
|
38a912672a
|
手写评分相关js
|
2014-12-01 11:15:03 +08:00 |
z9hang
|
b82523042e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-28 11:34:27 +08:00 |
z9hang
|
514dcb97a0
|
完成资源按时间、下载次数排序功能
|
2014-11-28 11:33:51 +08:00 |
zhuhao
|
a33084545f
|
课程实践平台按钮样式统一的改动
|
2014-11-28 09:27:43 +08:00 |
zhuhao
|
21c1b63c6d
|
新建作业和留言两处的提交按钮样式统一
|
2014-11-27 17:34:27 +08:00 |
sw
|
7fa8d2fff8
|
修改竞赛模块标题栏
|
2014-11-27 17:05:53 +08:00 |
sw
|
cd3f4ef8d3
|
修改标签的显示js
|
2014-11-27 16:44:14 +08:00 |
sw
|
9a7160178c
|
#1633 课程讨论区:“提交”、“预览”按钮显示问题
|
2014-11-27 16:33:17 +08:00 |
sw
|
743bfd551a
|
学生提交作业列表增加提交时间的显示
|
2014-11-27 16:22:59 +08:00 |
sw
|
fe93a9c2c5
|
课程主页,如课程资料数为0,则取消显示
|
2014-11-27 15:39:57 +08:00 |
sw
|
2b5160f2d9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-27 10:27:02 +08:00 |
z9hang
|
9898e1650b
|
1、学生看不到私有资源bug。2、引用资源弹框中无课程可显示时不显示引入我的课程按钮。3、引用资源时提示信息样式修改
|
2014-11-27 10:18:41 +08:00 |
sw
|
86413df277
|
#1624 新建课程/课程配置:”学时总数“后面显示两个学时
|
2014-11-26 17:09:52 +08:00 |
z9hang
|
f267a3daf8
|
引用课程中已有的资源时提示资源已存在
|
2014-11-26 16:51:09 +08:00 |
sw
|
8c81346ffb
|
取消实名回复#1622
|
2014-11-26 16:29:17 +08:00 |
sw
|
e68900b9a0
|
#1616 修改课程时开课日期选项错误
|
2014-11-26 16:08:14 +08:00 |
sw
|
dd78bc25ff
|
#1619 作业未提交附件时增加提示
|
2014-11-26 15:33:36 +08:00 |
z9hang
|
8a3669ba3b
|
引用次数统计包括多级引用
|
2014-11-26 15:26:57 +08:00 |
sw
|
d073cca712
|
修改作业列表相关界面样式
|
2014-11-26 15:24:41 +08:00 |
sw
|
6f0e18f3a6
|
修改竞赛相关模块的标题栏信息
|
2014-11-26 14:49:55 +08:00 |
sw
|
54ffd59eaf
|
修改作业、项目、用户base的主页链接
|
2014-11-26 14:46:08 +08:00 |
sw
|
ff93a62685
|
修改课程,竞赛layout中主页连接。
修改页面显示样式
优化代码
|
2014-11-26 11:44:39 +08:00 |
sw
|
851ef240c1
|
修改页面代码
|
2014-11-26 10:57:53 +08:00 |
sw
|
1fee210924
|
1.修改新建、修改作业提交、取消按钮样式
2.修改作业时关联项目会自动清空
|
2014-11-25 16:51:22 +08:00 |
sw
|
23907c5c01
|
修改课程讨论区按钮样式
|
2014-11-25 16:02:11 +08:00 |
sw
|
be31444b43
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/tags/_tag.html.erb
|
2014-11-25 14:22:46 +08:00 |
alan
|
760083ad20
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-25 14:17:27 +08:00 |
alan
|
ace5b514c6
|
修改bug<测试版--注册登录:成功激活注册的用户后,登录返回资料修改的页面,姓氏、名字还是标识为必填项>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-25 14:17:04 +08:00 |
sw
|
a8cdd2b64c
|
修改新建缺陷时按钮的样式
|
2014-11-25 13:57:30 +08:00 |
sw
|
fef005d2d3
|
修改搜索用户报错
|
2014-11-25 11:29:09 +08:00 |
sw
|
89e5eda397
|
1.修改课程项目编辑讨论区帖子时按钮样式
2.修复修改课程项目编辑讨论区帖子时第一次点击确定失败
|
2014-11-25 10:52:07 +08:00 |
sw
|
3e3d103828
|
1.增加开启匿评之后学生能提交作业
2.修改学生作业编辑和删除样式
|
2014-11-25 10:15:34 +08:00 |
sw
|
d19bf06da4
|
修改课程添加tagform表单内元素
|
2014-11-25 09:16:22 +08:00 |
sw
|
2c135f5e8d
|
修改课程添加标签返回404的BUG
|
2014-11-25 09:12:15 +08:00 |
sw
|
b475cd51e7
|
修改作业留言实名回复
|
2014-11-24 18:23:56 +08:00 |
z9hang
|
cb88dd9064
|
添加td_tech_title非空判断
|
2014-11-24 17:12:12 +08:00 |
z9hang
|
ccaf2f8ee5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 17:06:02 +08:00 |
sw
|
198e2f24ae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 17:04:40 +08:00 |
sw
|
760203ebc7
|
作业内回复改为实名回复
|
2014-11-24 16:59:56 +08:00 |
sw
|
175ac86217
|
修复课程-课程作业:回复匿评相关问题 #1566
|
2014-11-24 16:51:27 +08:00 |
sw
|
88764f1a4b
|
修复老师评分时删除评论不可用#1574
|
2014-11-24 16:35:37 +08:00 |
z9hang
|
f4af0633a3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 16:31:11 +08:00 |
sw
|
66e2edef0a
|
修复开启匿评之后学生可在作业详细信息列表里提交作业
|
2014-11-24 16:06:07 +08:00 |
alan
|
c4e64f29da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-24 15:29:35 +08:00 |
alan
|
6363208781
|
修改base_user
Signed-off-by: alan <547533434@qq.com>
|
2014-11-24 15:29:19 +08:00 |
zhuhao
|
da9773e139
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 15:28:13 +08:00 |
zhuhao
|
6b98c2995a
|
添加标签按钮样式调整
|
2014-11-24 15:27:43 +08:00 |
sw
|
f1aca94a30
|
老师配置课程时成员列表显示异常
|
2014-11-24 15:03:34 +08:00 |
sw
|
adf75d2e8a
|
修改匿评结束显示样式
|
2014-11-24 15:00:20 +08:00 |
sw
|
2042555813
|
修改老师启动匿评之后按妞显示样式不正确的BUG
|
2014-11-24 14:55:10 +08:00 |
z9hang
|
d9a7e2181c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 14:39:51 +08:00 |
z9hang
|
feccad8fa5
|
用户为创建课程,或没有作为教师的课程时,不显示引入我的课程按钮
|
2014-11-24 14:39:31 +08:00 |
alan
|
d7d49d2fbd
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-24 11:33:54 +08:00 |
z9hang
|
c5fcb9168e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 11:26:45 +08:00 |
z9hang
|
e87238497c
|
课程资源库:鼠标移过时改变搜索按钮的颜色
|
2014-11-24 11:26:29 +08:00 |
alan
|
584944059a
|
huanyuan
Signed-off-by: alan <547533434@qq.com>
|
2014-11-24 11:25:23 +08:00 |
alan
|
526e9bc923
|
修改《IE登录不了》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-24 10:48:53 +08:00 |
zhuhao
|
4a2b5f5e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-24 09:22:04 +08:00 |
zhuhao
|
b222b7a8ed
|
资源库讨论区发帖按钮样式调整
|
2014-11-24 09:21:48 +08:00 |
alan
|
6963d494ae
|
还原《注册》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-23 10:44:51 +08:00 |
alan
|
3417b2bce1
|
还原《登录跳转》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-22 22:50:48 +08:00 |
sw
|
ee53ec544f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-22 16:11:33 +08:00 |
sw
|
ca7b56cbf0
|
修改当作业提交大于等于2份时才显示开启匿评按钮
|
2014-11-22 15:56:42 +08:00 |
sw
|
13bf91f954
|
1.修改课程作业列表中、启动、关闭匿评、提交作业、编辑等按钮不见的问题
2.修改匿评、提交评论的样式
|
2014-11-22 15:50:14 +08:00 |
z9hang
|
3784149112
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-22 15:35:46 +08:00 |
z9hang
|
0a6574b542
|
课程主页新建课程按钮,修改为所有人都可以看到
|
2014-11-22 15:35:28 +08:00 |
sw
|
d788e46546
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
2014-11-22 13:52:46 +08:00 |
z9hang
|
436cf1175f
|
修改课程资源模块相关问题
|
2014-11-22 13:45:17 +08:00 |
sw
|
287e9151a2
|
如果课程没有附件,取消显示附件列表
|
2014-11-22 12:43:42 +08:00 |
sw
|
9908a7f41f
|
修改作业左侧启动匿评按钮样式
|
2014-11-22 12:40:53 +08:00 |
sw
|
dacad26010
|
作品名称改为作品描述
对齐作品名称和作品描述
增加作品描述不能为空的判断
|
2014-11-22 11:19:58 +08:00 |
sw
|
a95a68caec
|
增加课程右侧js悬浮框
|
2014-11-22 10:46:15 +08:00 |
sw
|
74f9bc6404
|
修改右键项目分数页面报500的BUG
|
2014-11-22 10:07:28 +08:00 |
z9hang
|
36e7b222bb
|
课程资源修改为公开的也需登录才能下载
|
2014-11-22 10:06:56 +08:00 |
sw
|
56150e44ce
|
修复邮件课程作业在新窗口打开网页报500的BUG
|
2014-11-22 09:49:51 +08:00 |
sw
|
ea19c1aeef
|
取消教师评分所占比例选项
|
2014-11-22 09:33:37 +08:00 |
z9hang
|
d1ad7b71c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 17:08:19 +08:00 |
z9hang
|
c5a9defb3f
|
调整课程资源样式
|
2014-11-21 17:06:58 +08:00 |
moon
|
600afdc6e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 17:00:14 +08:00 |
moon
|
e4e4c94d53
|
封掉所有列表入口,及页面中更多入口
|
2014-11-21 16:59:58 +08:00 |
alan
|
5ba33b6d6d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-21 16:27:40 +08:00 |
alan
|
3317ca4a97
|
修改bug:
<资料修改--登录名不能编辑>
<注册时登录名被标识为只能是英文,但是可以为数字的>
<后台配置密码最短10个字符,注册时输入密码少于10个字符也给出提示信息“密码设置成功”>
<邮箱激活”页面修改若干建议>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-21 16:27:20 +08:00 |
sw
|
2c28ed0fa1
|
调整作业详细信息留言的样式
|
2014-11-21 16:07:29 +08:00 |
z9hang
|
909c76b09c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 15:54:52 +08:00 |
z9hang
|
2348e063d1
|
调整选入课程弹框中列表的显示策略
|
2014-11-21 15:54:29 +08:00 |
zhuhao
|
64e6394b44
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 15:49:57 +08:00 |
zhuhao
|
ac6305cddb
|
课程讨论区发帖按钮样式调整
|
2014-11-21 15:49:21 +08:00 |
sw
|
a1b4b2ddae
|
修改作业列表显示样式
|
2014-11-21 15:48:08 +08:00 |
z9hang
|
1007134ced
|
资源名称过长的显示问题
|
2014-11-21 15:35:08 +08:00 |
z9hang
|
42e0b47a67
|
修改当前课程的私有属性修改权限
|
2014-11-21 15:23:54 +08:00 |
sw
|
4b9bc7f0fc
|
调整页面代码
|
2014-11-21 15:03:56 +08:00 |
z9hang
|
ba11fe25b5
|
全站搜索资源后列表中只能删除当前课程的资源,且需有删除资源的权限
|
2014-11-21 15:02:34 +08:00 |
z9hang
|
cf808598d2
|
全站搜索不在搜索非本人的私有资源,且他人的公开资源亦不能修改其公开私有属性2、添加迁移文件
|
2014-11-21 14:57:10 +08:00 |
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
2014-11-21 11:41:38 +08:00 |
z9hang
|
68505239f9
|
课程资源搜索功能,暂时屏蔽排序功能
|
2014-11-21 11:38:53 +08:00 |
sw
|
6b48e90e77
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-21 11:33:48 +08:00 |
z9hang
|
f2da5704ef
|
课程应用的功能实现
|
2014-11-20 17:44:30 +08:00 |
sw
|
dc480ecd44
|
调整页面代码,修复公共贴吧引用显示不正确的BUG
|
2014-11-20 17:24:45 +08:00 |
alan
|
f90927313d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-20 17:08:34 +08:00 |
alan
|
cb7cd581f6
|
修改bug<admin删除用户出错>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-20 17:08:10 +08:00 |
sw
|
bc0f3840aa
|
贴吧描述增加自动换行
|
2014-11-20 17:02:39 +08:00 |
sw
|
1eb9004259
|
调整页面代码
|
2014-11-20 16:49:47 +08:00 |
zhuhao
|
de5aa252e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-20 16:20:07 +08:00 |
sw
|
1adb5925b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-20 15:56:45 +08:00 |
sw
|
aef1cb31fa
|
1.设置帖子创建者可修改、删除帖子
2.设置新建、修改帖子时主题最大长度
3.修改权限判断
|
2014-11-20 15:55:43 +08:00 |
zhuhao
|
cc32bee0f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-20 11:39:04 +08:00 |
zhuhao
|
0b5ee5dc4b
|
按钮样式修改(发布课程通知页,新建缺陷页)
|
2014-11-20 11:38:39 +08:00 |
sw
|
eb15db64ee
|
美化项目工具栏样式显示
修复当缺陷列表为空时缺陷列表样式显示异常
|
2014-11-20 11:16:58 +08:00 |
sw
|
0e409445cc
|
隐藏我的工作台更多按钮
|
2014-11-20 10:54:03 +08:00 |
sw
|
43f9d82f5e
|
修改课程老师名称过长时页面显示异常
|
2014-11-20 09:30:04 +08:00 |
sw
|
4633a13a59
|
修改课程名称过长时页面显示异常
|
2014-11-20 09:29:10 +08:00 |
sw
|
ddd25f96aa
|
修复课程首页当前学校课程数为9时,页面显示有问题
|
2014-11-20 09:25:33 +08:00 |
sw
|
14da0c7d73
|
优化base_head代码
|
2014-11-20 09:15:29 +08:00 |
sw
|
5c4a9ac1f8
|
修改右上角课程的域名
|
2014-11-19 17:45:13 +08:00 |
z9hang
|
63b91e2cfb
|
资源上传
|
2014-11-19 17:40:24 +08:00 |
alan
|
972b788687
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
Conflicts:
public/stylesheets/application.css
Signed-off-by: alan <547533434@qq.com>
|
2014-11-19 17:30:53 +08:00 |
alan
|
b2ce8c78bd
|
<修改资料>页面<课程成员><admin/settings>页面样式修改,注册后页面跳转路由修改
Signed-off-by: alan <547533434@qq.com>
|
2014-11-19 17:25:10 +08:00 |
sw
|
4917c63298
|
取消作业截至时间的显示
|
2014-11-19 14:35:58 +08:00 |
sw
|
82233a4b54
|
修复老师开启匿评、学生匿评提示以及进入学生作业详细信息界面时界面会自动拉下去的BUG
|
2014-11-19 11:28:54 +08:00 |
sw
|
f560e9f494
|
1.修改未开启匿评学生界面取消匿评列表界面显示
2.修改未开启匿评学生直接进入众评点赞界面
|
2014-11-19 11:11:28 +08:00 |
z9hang
|
eeda25add1
|
设置资源公开与私有功能
|
2014-11-19 11:03:23 +08:00 |
sw
|
ff185852eb
|
未开启匿评时老师界面取消开启/关闭匿评按钮显示
|
2014-11-19 10:53:22 +08:00 |
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
2014-11-19 10:34:36 +08:00 |
z9hang
|
0821320dfe
|
tag删除功能完成,翻页样式修改
|
2014-11-19 10:07:49 +08:00 |
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
2014-11-18 18:02:01 +08:00 |
zhuhao
|
c1361e37b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-18 17:04:09 +08:00 |
zhuhao
|
126c7f558d
|
修改用户信息处控件对齐,新建课程通知提交取消按钮样式统一
|
2014-11-18 17:03:40 +08:00 |
sw
|
861dbc854e
|
修复个人动态主页课程连接错误
|
2014-11-18 16:51:19 +08:00 |
sw
|
6245b6ba33
|
修改编辑、启动匿评、关闭匿评、提交作业按钮样式
|
2014-11-18 16:47:04 +08:00 |
sw
|
6bfbf5bd2b
|
1.增加匿评阶段课程作业列表界面不可提交作业
2.增加匿评关闭阶段可提交作业
|
2014-11-18 16:13:11 +08:00 |
sw
|
d0e549fc85
|
增加作业倒计时显示
|
2014-11-18 16:00:04 +08:00 |
sw
|
2de2355e5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-18 15:24:40 +08:00 |
sw
|
3ac023e7a5
|
悬浮框增加屏幕绝对定位
问题:貌似IE6不兼容
|
2014-11-18 11:18:00 +08:00 |
moon
|
e0571a888e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-18 10:57:18 +08:00 |
moon
|
e359b987e5
|
增加“课程作业”权限提示
|
2014-11-18 10:56:56 +08:00 |
sw
|
90f5cd2e60
|
修改缩放html页面时悬浮框位置显示不正确的BUG
|
2014-11-18 10:39:50 +08:00 |
sw
|
804b23f0f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-18 10:29:20 +08:00 |
sw
|
3aaf2247dc
|
修改作业右侧悬浮框css、js
|
2014-11-18 10:29:00 +08:00 |
z9hang
|
4b5ad833b0
|
课程资源界面各按钮失效问题
|
2014-11-18 10:26:33 +08:00 |
z9hang
|
33555e598e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-17 16:21:05 +08:00 |
z9hang
|
22696fe4f9
|
#985 micros版:资源搜索,下载资源控件显示错误
|
2014-11-17 16:20:48 +08:00 |
moon
|
f21767cb16
|
增加其他角色新建课程权限
|
2014-11-17 16:13:40 +08:00 |
moon
|
c086009313
|
国际化
|
2014-11-17 15:48:05 +08:00 |
moon
|
34d7208deb
|
课程联系界面
|
2014-11-17 15:21:36 +08:00 |
sw
|
aa0f10e9fd
|
修改课程通知页面访问报404
|
2014-11-17 11:34:53 +08:00 |
sw
|
c74b5d7bb4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-17 10:33:01 +08:00 |
sw
|
63a141a75a
|
1.修改右上侧课程作业快捷栏显示js、css
|
2014-11-17 10:32:33 +08:00 |
z9hang
|
46e97b7ae4
|
删除多出来的页脚
|
2014-11-17 10:31:48 +08:00 |
z9hang
|
096b0e271f
|
课程页面页脚偏移问题
|
2014-11-17 09:54:21 +08:00 |
z9hang
|
ae19532601
|
修改帮助的浮动边框
|
2014-11-14 17:35:07 +08:00 |
zhuhao
|
3fd1f77535
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-14 16:38:57 +08:00 |
zhuhao
|
b1e58f3fd5
|
新增弹框
|
2014-11-14 16:38:14 +08:00 |
sw
|
512f16a036
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-14 15:04:53 +08:00 |
sw
|
61c8feac8f
|
课程后增加课程作业的快捷栏
|
2014-11-14 15:04:35 +08:00 |
alan
|
857578dc92
|
修改bug<contest网站的作品提交界面需要改进>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-14 11:15:46 +08:00 |
alan
|
e0cf3bd6de
|
修改bug<贴吧换行显示不正确>
Signed-off-by: alan <547533434@qq.com>
|
2014-11-14 10:54:05 +08:00 |
alan
|
e7545b1cd9
|
增加《注册后跳转邮箱》页面
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 10:20:55 +08:00 |
alan
|
12de248e87
|
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 10:18:07 +08:00 |
alan
|
e86ef8e6f0
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-13 09:59:34 +08:00 |
alan
|
b7a89d6108
|
Merge branch 'shaproup' into szzh
Conflicts:
app/models/course.rb
app/models/project.rb
app/views/contests/show_attendingcontest.html.erb
app/views/files/_course_file.html.erb
app/views/files/_course_new.html.erb
app/views/layouts/_base_footer.html.erb
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:59:20 +08:00 |
alan
|
e9d75bde6f
|
《修改资料》页面:工作单位为不必填
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:14:40 +08:00 |
alan
|
baacf328b7
|
增加《注册跳转邮箱页面》
Signed-off-by: alan <547533434@qq.com>
|
2014-11-13 09:13:44 +08:00 |
sw
|
56cc2a7ad3
|
修复老师编辑作业时课程作业tab没有高亮显示
|
2014-11-12 17:07:27 +08:00 |
z9hang
|
227a7c1f31
|
z作业留言的字数控制
|
2014-11-12 17:02:35 +08:00 |
sw
|
a24d1493f9
|
1.修复点击课程动态,课程动态tab页不高亮显示
2.修复点击新建作业,课程作业tab页不高亮显示
|
2014-11-12 16:51:07 +08:00 |
z9hang
|
e6aa9d3592
|
修复用户、课程、项目、竞赛、留言模块样式,去除回复时的回复某某字样,及字数控制
|
2014-11-12 15:09:39 +08:00 |
alan
|
ad6b32ff50
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
2014-11-11 17:01:29 +08:00 |
alan
|
2cea3178d6
|
添加邮箱验证功能
Signed-off-by: alan <547533434@qq.com>
|
2014-11-11 17:01:07 +08:00 |
sw
|
dbf08bc486
|
Merge branch 'Homework' into szzh
|
2014-11-11 15:19:28 +08:00 |
sw
|
3c2c9149b1
|
取消新建、修改作业的必填标志
|
2014-11-11 11:51:17 +08:00 |
z9hang
|
2b829db804
|
教师打开评分界面时,评分处显示其上次的评分
|
2014-11-11 11:05:56 +08:00 |
sw
|
9d971069b5
|
Merge branch 'Homework' into szzh
|
2014-11-11 08:49:42 +08:00 |
sw
|
e3d735ecfc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-11-11 08:48:27 +08:00 |
sw
|
7d93a4e4aa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
2014-11-11 08:38:58 +08:00 |
alan
|
421d47a687
|
注册的优化
Signed-off-by: alan <547533434@qq.com>
|
2014-11-10 16:08:41 +08:00 |
z9hang
|
9bd1af9541
|
#1480 项目留言区回复时间显示问题
|
2014-11-10 15:09:48 +08:00 |
z9hang
|
b707cbae16
|
评分保留两位小数点
|
2014-11-10 10:37:12 +08:00 |
z9hang
|
dd95335a67
|
没有附件时打包下载500错误问题
|
2014-11-10 10:21:16 +08:00 |
z9hang
|
3a9ef1cfff
|
暂时屏蔽作品打包下载
|
2014-11-10 09:22:50 +08:00 |
alan
|
1468f4a8df
|
修改《修改资料》页面
Signed-off-by: alan <547533434@qq.com>
|
2014-11-10 08:58:38 +08:00 |
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
2014-11-08 16:40:36 +08:00 |
z9hang
|
b45e23d837
|
学生匿评份初始值显示修正
|
2014-11-08 15:20:43 +08:00 |
z9hang
|
e297bb2687
|
修改匿评
|
2014-11-08 14:03:02 +08:00 |
sw
|
6157a67e23
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-08 13:44:41 +08:00 |
sw
|
e0d85f72a1
|
1.匿评作业列表我的分数显示不正确
2.学生可多次进行匿评评分
|
2014-11-08 13:43:29 +08:00 |
z9hang
|
cd1be67b8c
|
学生可多次评分、评分完毕不在提示评分成功
|
2014-11-08 13:43:07 +08:00 |
sw
|
e550f9d91d
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-07 11:02:33 +08:00 |
sw
|
ffaa9c51ba
|
修复作业列表报错
修复2个关闭按钮
|
2014-11-07 10:39:17 +08:00 |
sw
|
759d69892e
|
修改弹出框样式
|
2014-11-07 10:37:10 +08:00 |
sw
|
be500eb0d2
|
增加开启匿评关闭匿评弹出框动态显示
|
2014-11-07 10:02:13 +08:00 |
gonglexin
|
972d748199
|
#1434 解决文件重复上传的问题
|
2014-11-06 19:34:31 +08:00 |
z9hang
|
89732c51ef
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
Conflicts:
app/views/homework_attach/_homework.html.erb
|
2014-11-06 16:58:05 +08:00 |
z9hang
|
9b4e9bd04a
|
1、部分星星显示不正确问题,2、评分初始值设置为0
|
2014-11-06 16:52:29 +08:00 |
sw
|
6c13a682c0
|
修改评分为nil报错
|
2014-11-06 16:37:30 +08:00 |
sw
|
0a8d0182fd
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-06 16:08:14 +08:00 |
z9hang
|
0d31ec53b5
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-06 16:06:08 +08:00 |
z9hang
|
5034769ab3
|
星星显示不全问题
|
2014-11-06 16:05:47 +08:00 |
sw
|
2a8e40603c
|
修改作业弹出框样式
|
2014-11-06 16:05:12 +08:00 |
sw
|
f3edbe4b79
|
修改作业连接错误
|
2014-11-06 16:01:07 +08:00 |
alan
|
fd8a8d1fe2
|
Signed-off-by: alan <547533434@qq.com>
|
2014-11-06 15:58:15 +08:00 |
z9hang
|
3689b5e228
|
Merge branch 'Homework' of http://repository.trustie.net/xianbo/trustie2 into Homework
|
2014-11-06 15:19:55 +08:00 |