 alan
|
3d12d6f0e8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
db/schema.rb
|
11 years ago |
|
alan
|
615bc7d444
|
增加课程分组的功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
 zhuhao
|
ebc66af3b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
ebed04c7bf
|
创客空间左侧公共页被拉伸导致出现滚动条的调整
|
11 years ago |
 sw
|
19b61118ac
|
修改加入按钮失败后变为加入课程按钮
|
11 years ago |
|
sw
|
f934824175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
35f2462241
|
修改重复评分时，评分初始值不正确
|
11 years ago |
|
sw
|
3b2c7cc0ec
|
教师评论不能被删除
|
11 years ago |
|
sw
|
d9c3103e6e
|
1.修改留言列表得分显示样式
2.修改获取指定用户对作业评分的方法
|
11 years ago |
|
sw
|
ad8bd131ce
|
调整页面代码
|
11 years ago |
|
sw
|
277e5ecad3
|
1.老师评价、学生匿评、学生留言不同情况下页面刷新
2.修改老师评价、学生匿评、学生留言是载入中在弹出窗后面显示
3.修改老师未批列表
4.取消关闭作业详细信息列表时界面刷新，改为评论时刷新页面
5.修改作业显示界面缺失参数报错
|
11 years ago |
 z9hang
|
97fb7a1f86
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
29d4266c6c
|
引用次数的统计修改及按引用排序
|
11 years ago |
|
alan
|
63c9804da8
|
添加course_group表单到数据库中，并建立对应于members和courses之间的关联，
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
5bd8cc76f4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
0b0763e710
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
a7d7b790d2
|
公共页个性签名的提交按钮显示调整
|
11 years ago |
|
sw
|
6fd68806d5
|
修改课程教师就具有开启、关闭匿评、修改作业的权限
|
11 years ago |
|
z9hang
|
d37d7fb83d
|
修复课程资源模块两个搜索按钮鼠标点击才改变样式问题（代码被还原导致）
|
11 years ago |
|
sw
|
9a61354328
|
1.评分、评论作为一个action发送到服务器
2.修改作业的show方法获取参数不正确的问题
|
11 years ago |
|
sw
|
f5b1cbcfe4
|
优化作业弹出框效率
|
11 years ago |
|
sw
|
38a912672a
|
手写评分相关js
|
11 years ago |
|
z9hang
|
b82523042e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
514dcb97a0
|
完成资源按时间、下载次数排序功能
|
11 years ago |
|
zhuhao
|
a33084545f
|
课程实践平台按钮样式统一的改动
|
11 years ago |
|
zhuhao
|
21c1b63c6d
|
新建作业和留言两处的提交按钮样式统一
|
11 years ago |
|
sw
|
7fa8d2fff8
|
修改竞赛模块标题栏
|
11 years ago |
|
sw
|
cd3f4ef8d3
|
修改标签的显示js
|
11 years ago |
|
sw
|
9a7160178c
|
#1633 课程讨论区：“提交”、“预览”按钮显示问题
|
11 years ago |
|
sw
|
743bfd551a
|
学生提交作业列表增加提交时间的显示
|
11 years ago |
|
sw
|
fe93a9c2c5
|
课程主页，如课程资料数为0，则取消显示
|
11 years ago |
|
sw
|
2b5160f2d9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9898e1650b
|
1、学生看不到私有资源bug。2、引用资源弹框中无课程可显示时不显示引入我的课程按钮。3、引用资源时提示信息样式修改
|
11 years ago |
|
sw
|
86413df277
|
#1624 新建课程/课程配置：”学时总数“后面显示两个学时
|
11 years ago |
|
z9hang
|
f267a3daf8
|
引用课程中已有的资源时提示资源已存在
|
11 years ago |
|
sw
|
8c81346ffb
|
取消实名回复#1622
|
11 years ago |
|
sw
|
e68900b9a0
|
#1616 修改课程时开课日期选项错误
|
11 years ago |
|
sw
|
dd78bc25ff
|
#1619 作业未提交附件时增加提示
|
11 years ago |
|
z9hang
|
8a3669ba3b
|
引用次数统计包括多级引用
|
11 years ago |
|
sw
|
d073cca712
|
修改作业列表相关界面样式
|
11 years ago |
|
sw
|
6f0e18f3a6
|
修改竞赛相关模块的标题栏信息
|
11 years ago |
|
sw
|
54ffd59eaf
|
修改作业、项目、用户base的主页链接
|
11 years ago |
|
sw
|
ff93a62685
|
修改课程，竞赛layout中主页连接。
修改页面显示样式
优化代码
|
11 years ago |
|
sw
|
851ef240c1
|
修改页面代码
|
11 years ago |
|
sw
|
1fee210924
|
1.修改新建、修改作业提交、取消按钮样式
2.修改作业时关联项目会自动清空
|
11 years ago |
|
sw
|
23907c5c01
|
修改课程讨论区按钮样式
|
11 years ago |
|
sw
|
be31444b43
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/tags/_tag.html.erb
|
11 years ago |
|
alan
|
760083ad20
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
ace5b514c6
|
修改bug<测试版--注册登录：成功激活注册的用户后，登录返回资料修改的页面，姓氏、名字还是标识为必填项>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
a8cdd2b64c
|
修改新建缺陷时按钮的样式
|
11 years ago |
|
sw
|
fef005d2d3
|
修改搜索用户报错
|
11 years ago |
|
sw
|
89e5eda397
|
1.修改课程项目编辑讨论区帖子时按钮样式
2.修复修改课程项目编辑讨论区帖子时第一次点击确定失败
|
11 years ago |
|
sw
|
3e3d103828
|
1.增加开启匿评之后学生能提交作业
2.修改学生作业编辑和删除样式
|
11 years ago |
|
sw
|
d19bf06da4
|
修改课程添加tagform表单内元素
|
11 years ago |
|
sw
|
2c135f5e8d
|
修改课程添加标签返回404的BUG
|
11 years ago |
|
sw
|
b475cd51e7
|
修改作业留言实名回复
|
11 years ago |
|
z9hang
|
cb88dd9064
|
添加td_tech_title非空判断
|
11 years ago |
|
z9hang
|
ccaf2f8ee5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
198e2f24ae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
760203ebc7
|
作业内回复改为实名回复
|
11 years ago |
|
sw
|
175ac86217
|
修复课程-课程作业：回复匿评相关问题 #1566
|
11 years ago |
|
sw
|
88764f1a4b
|
修复老师评分时删除评论不可用#1574
|
11 years ago |
|
z9hang
|
f4af0633a3
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
66e2edef0a
|
修复开启匿评之后学生可在作业详细信息列表里提交作业
|
11 years ago |
|
alan
|
c4e64f29da
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
6363208781
|
修改base_user
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
zhuhao
|
da9773e139
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
6b98c2995a
|
添加标签按钮样式调整
|
11 years ago |
|
sw
|
f1aca94a30
|
老师配置课程时成员列表显示异常
|
11 years ago |
|
sw
|
adf75d2e8a
|
修改匿评结束显示样式
|
11 years ago |
|
sw
|
2042555813
|
修改老师启动匿评之后按妞显示样式不正确的BUG
|
11 years ago |
|
z9hang
|
d9a7e2181c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
feccad8fa5
|
用户为创建课程，或没有作为教师的课程时，不显示引入我的课程按钮
|
11 years ago |
|
alan
|
d7d49d2fbd
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
z9hang
|
c5fcb9168e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
e87238497c
|
课程资源库：鼠标移过时改变搜索按钮的颜色
|
11 years ago |
|
alan
|
584944059a
|
huanyuan
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
526e9bc923
|
修改《IE登录不了》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
zhuhao
|
4a2b5f5e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
b222b7a8ed
|
资源库讨论区发帖按钮样式调整
|
11 years ago |
|
alan
|
6963d494ae
|
还原《注册》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
3417b2bce1
|
还原《登录跳转》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
ee53ec544f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
ca7b56cbf0
|
修改当作业提交大于等于2份时才显示开启匿评按钮
|
11 years ago |
|
sw
|
13bf91f954
|
1.修改课程作业列表中、启动、关闭匿评、提交作业、编辑等按钮不见的问题
2.修改匿评、提交评论的样式
|
11 years ago |
|
z9hang
|
3784149112
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
0a6574b542
|
课程主页新建课程按钮，修改为所有人都可以看到
|
11 years ago |
|
sw
|
d788e46546
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
z9hang
|
436cf1175f
|
修改课程资源模块相关问题
|
11 years ago |
|
sw
|
287e9151a2
|
如果课程没有附件，取消显示附件列表
|
11 years ago |
|
sw
|
9908a7f41f
|
修改作业左侧启动匿评按钮样式
|
11 years ago |
|
sw
|
dacad26010
|
作品名称改为作品描述
对齐作品名称和作品描述
增加作品描述不能为空的判断
|
11 years ago |
|
sw
|
a95a68caec
|
增加课程右侧js悬浮框
|
11 years ago |
|
sw
|
74f9bc6404
|
修改右键项目分数页面报500的BUG
|
11 years ago |
|
z9hang
|
36e7b222bb
|
课程资源修改为公开的也需登录才能下载
|
11 years ago |
|
sw
|
56150e44ce
|
修复邮件课程作业在新窗口打开网页报500的BUG
|
11 years ago |
|
sw
|
ea19c1aeef
|
取消教师评分所占比例选项
|
11 years ago |
|
z9hang
|
d1ad7b71c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
c5a9defb3f
|
调整课程资源样式
|
11 years ago |
moon
|
600afdc6e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
moon
|
e4e4c94d53
|
封掉所有列表入口，及页面中更多入口
|
11 years ago |
|
alan
|
5ba33b6d6d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
3317ca4a97
|
修改bug:
<资料修改--登录名不能编辑>
<注册时登录名被标识为只能是英文，但是可以为数字的>
<后台配置密码最短10个字符，注册时输入密码少于10个字符也给出提示信息“密码设置成功”>
<邮箱激活”页面修改若干建议>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
2c28ed0fa1
|
调整作业详细信息留言的样式
|
11 years ago |
|
z9hang
|
909c76b09c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
2348e063d1
|
调整选入课程弹框中列表的显示策略
|
11 years ago |
|
zhuhao
|
64e6394b44
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
ac6305cddb
|
课程讨论区发帖按钮样式调整
|
11 years ago |
|
sw
|
a1b4b2ddae
|
修改作业列表显示样式
|
11 years ago |
|
z9hang
|
1007134ced
|
资源名称过长的显示问题
|
11 years ago |
|
z9hang
|
42e0b47a67
|
修改当前课程的私有属性修改权限
|
11 years ago |
|
sw
|
4b9bc7f0fc
|
调整页面代码
|
11 years ago |
|
z9hang
|
ba11fe25b5
|
全站搜索资源后列表中只能删除当前课程的资源，且需有删除资源的权限
|
11 years ago |
|
z9hang
|
cf808598d2
|
全站搜索不在搜索非本人的私有资源，且他人的公开资源亦不能修改其公开私有属性2、添加迁移文件
|
11 years ago |
|
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
68505239f9
|
课程资源搜索功能，暂时屏蔽排序功能
|
11 years ago |
|
sw
|
6b48e90e77
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
f2da5704ef
|
课程应用的功能实现
|
11 years ago |
|
sw
|
dc480ecd44
|
调整页面代码，修复公共贴吧引用显示不正确的BUG
|
11 years ago |
|
alan
|
f90927313d
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
cb7cd581f6
|
修改bug<admin删除用户出错>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
bc0f3840aa
|
贴吧描述增加自动换行
|
11 years ago |
|
sw
|
1eb9004259
|
调整页面代码
|
11 years ago |
|
zhuhao
|
de5aa252e0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
1adb5925b5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
aef1cb31fa
|
1.设置帖子创建者可修改、删除帖子
2.设置新建、修改帖子时主题最大长度
3.修改权限判断
|
11 years ago |
|
zhuhao
|
cc32bee0f7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
0b5ee5dc4b
|
按钮样式修改（发布课程通知页，新建缺陷页）
|
11 years ago |
|
sw
|
eb15db64ee
|
美化项目工具栏样式显示
修复当缺陷列表为空时缺陷列表样式显示异常
|
11 years ago |
|
sw
|
0e409445cc
|
隐藏我的工作台更多按钮
|
11 years ago |
|
sw
|
43f9d82f5e
|
修改课程老师名称过长时页面显示异常
|
11 years ago |
|
sw
|
4633a13a59
|
修改课程名称过长时页面显示异常
|
11 years ago |
|
sw
|
ddd25f96aa
|
修复课程首页当前学校课程数为9时，页面显示有问题
|
11 years ago |
|
sw
|
14da0c7d73
|
优化base_head代码
|
11 years ago |
|
sw
|
5c4a9ac1f8
|
修改右上角课程的域名
|
11 years ago |
|
z9hang
|
63b91e2cfb
|
资源上传
|
11 years ago |
|
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>
|
11 years ago |
|
alan
|
b2ce8c78bd
|
<修改资料>页面<课程成员><admin/settings>页面样式修改，注册后页面跳转路由修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
4917c63298
|
取消作业截至时间的显示
|
11 years ago |
|
sw
|
82233a4b54
|
修复老师开启匿评、学生匿评提示以及进入学生作业详细信息界面时界面会自动拉下去的BUG
|
11 years ago |
|
sw
|
f560e9f494
|
1.修改未开启匿评学生界面取消匿评列表界面显示
2.修改未开启匿评学生直接进入众评点赞界面
|
11 years ago |
|
z9hang
|
eeda25add1
|
设置资源公开与私有功能
|
11 years ago |
|
sw
|
ff185852eb
|
未开启匿评时老师界面取消开启/关闭匿评按钮显示
|
11 years ago |
|
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
11 years ago |
|
z9hang
|
0821320dfe
|
tag删除功能完成，翻页样式修改
|
11 years ago |
|
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
11 years ago |
|
zhuhao
|
c1361e37b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
zhuhao
|
126c7f558d
|
修改用户信息处控件对齐，新建课程通知提交取消按钮样式统一
|
11 years ago |
|
sw
|
861dbc854e
|
修复个人动态主页课程连接错误
|
11 years ago |
|
sw
|
6245b6ba33
|
修改编辑、启动匿评、关闭匿评、提交作业按钮样式
|
11 years ago |
