 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 |
|
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 |