whimlex
|
11da65c9ad
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
config/locales/en.yml
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
57c8575470
|
新版项目模块国际化，目前完成各项目主页，项目动态，项目评分
|
10 years ago |
 huang
|
3ee9ac2b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
|
10 years ago |
|
huang
|
8f0af4c00d
|
修改了未登陆情况下通过URL访问不允访问的
|
10 years ago |
 sw
|
52dfb0b0ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
sw
|
27e72c1f39
|
#2000 增加项目每个模块的访问控制
|
10 years ago |
|
huang
|
cbfb72bd5b
|
修改新建资源库显示
|
10 years ago |
|
whimlex
|
540ddd4a1b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
0eafbb92d5
|
意见反馈模块国际化
|
10 years ago |
|
huang
|
32a2e7ae1f
|
修改默认情况下 用户反馈框处于关闭状态
|
10 years ago |
|
sw
|
9060c9acbc
|
#1977 项目发布新贴跳转有问题
|
10 years ago |
|
whimlex
|
4b19463db7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/base_projects.html.erb
app/views/users/show.html.erb
config/locales/zh.yml
|
10 years ago |
|
whimlex
|
115eb38a02
|
完善用户资料模块，用户主页课程栏、留言栏、项目栏和标签模块国际化；对一些存储在数据表中的固定的中文属性，比如学期，职称，在helper和model中定义方法封装；平台导航模块，包括各模块内部导航的国际化；课程平台模块国际化整理和修改，去除重复功能标签
|
10 years ago |
|
sw
|
81b58e5c87
|
修改base_project中代码错误
|
10 years ago |
|
huang
|
d947ebff0c
|
添加国际化
|
10 years ago |
|
huang
|
e22b389971
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
10 years ago |
|
huang
|
b043d07d61
|
修改发布新贴显示问题
|
10 years ago |
 alan
|
5ff43fdea7
|
项目添加新用户邮件发送功能
Signed-off-by: alan <547533434@qq.com>
|
10 years ago |
|
huang
|
ce792f6ce8
|
修改邮件发送界面
|
10 years ago |
|
huang
|
b3cbfd39ca
|
修改一些缺陷，删掉多余的文件
|
10 years ago |
|
huang
|
c159bb2c48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/projects_controller.rb
app/views/issues/show.html.erb
app/views/layouts/base_projects.html.erb
app/views/projects/_form.html.erb
app/views/projects/new.html.erb
app/views/projects/show.html.erb
|
10 years ago |
|
huang
|
beac15475d
|
新项目及用户反馈框的修改！！
|
10 years ago |
|
sw
|
1f2b5eedb8
|
Merge branch 'dev_zanle' into szzh
Conflicts:
app/views/projects/show.html.erb
db/schema.rb
|
10 years ago |
|
sw
|
a2d986f70c
|
修改页面代码
|
10 years ago |
|
sw
|
032e28067d
|
#1959 项目评分是0的，就不显示了！
|
10 years ago |
|
sw
|
5bba54432d
|
#1930 项目缺陷显示个数修改
|
10 years ago |
|
whimlex
|
22aae1910b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/_search_project.html.erb
config/locales/en.yml
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
59a2c8283a
|
国际化结构调整
|
11 years ago |
 lizanle
|
d902d76ae2
|
将google统计换为了百度统计
|
11 years ago |
|
sw
|
78d8a0a1c6
|
修改意见反馈折叠后背景为透明
|
11 years ago |
|
alan
|
b5e49e2e1c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
a265556cfe
|
搜索项目时增加js验证增加
|
11 years ago |
|
whimlex
|
617107f0cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/index.html.erb
config/locales/zh.yml
|
11 years ago |
|
whimlex
|
f05e046751
|
首页国际化
|
11 years ago |
|
sw
|
ce526fde77
|
Merge branch 'dev_zanle' into szzh
Conflicts:
config/routes.rb
|
11 years ago |
|
sw
|
2978d9020f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
sw
|
b71d714103
|
#1887 用户职称显示问题
|
11 years ago |
|
sw
|
bf75f32903
|
修改个人留言界面，左侧个人信息样式显示不正确
|
11 years ago |
|
whimlex
|
b7c7cc4c64
|
意见反馈栏实现cookie缓存收拉属性，实现页面刷新跳转，意见反馈栏收拉一致
|
11 years ago |
|
lizanle
|
ff23ecb9a8
|
Merge branch 'szzh' into dev_zanle
|
11 years ago |
|
sw
|
5950f0404b
|
#1832 不显示无数据的字段，字段名
|
11 years ago |
|
whimlex
|
0ff22b1ac0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
whimlex
|
e5e24c1163
|
resolve conflict
|
11 years ago |
|
whimlex
|
64cbeddd13
|
项目“缺陷”修改为“问题跟踪”，sidebar栏“缺陷”修改为“问题”；项目新建新闻按钮样式统一；新建课程样式统一；课程重开和关闭国际化；竞赛导航锁定；翻译缺失修正
|
11 years ago |
|
alan
|
0944cc4ca8
|
< 邮件格式调整>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
472ccc45bf
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
a3cf79db96
|
修改编码问题
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
90661374a5
|
Merge branch 'szzh' into dev_zanle
Conflicts:
Gemfile
app/controllers/projects_controller.rb
config/locales/zh.yml
|
11 years ago |
|
sw
|
bb64dc9452
|
修改问卷调查按钮的样式
|
11 years ago |
|
sw
|
89ee38481b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
|
huang
|
c65bab8c38
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
c6deffe245
|
修改首页样式显示异常
|
11 years ago |
|
sw
|
2b5928602e
|
1.修改由于意见悬浮框引起的界面的padding不正确的问题
2.修改问卷调查左侧会出现滚动条的问题
|
11 years ago |
|
whimlex
|
3fcb2f14a5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/mailer/issue_edit.html.erb
|
11 years ago |
|
whimlex
|
1e36ca504a
|
多种邮箱邮件样式调整，回复内容样式更改
|
11 years ago |
|
sw
|
a0e6b9c2fe
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
huang
|
388ddac96b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
84bfd30fc5
|
修改问题反馈弹框！
|
11 years ago |
|
sw
|
e72ed1054e
|
修改问卷调查按钮的样式
|
11 years ago |
|
whimlex
|
3279928bef
|
邮件样式调整，国际化；用户资料页面调整
|
11 years ago |
|
alan
|
3315116832
|
修改《课程--留言：给课程留言却返回404》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
lizanle
|
49ff5659d9
|
系统日志查看相关代码，资源
|
11 years ago |
|
alan
|
0b0b6c9b6e
|
修改《托管平台中点击某项目进入该项目主页，右上角的搜索处不输入内容点击搜索按钮，给出的提示信息显示不合理》
增加《课程平台进入某一课程搜索风格保持与项目及竞赛的一致》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
092265d53c
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
1e8c6374d7
|
Merge branch 'szzh' into Poll
Conflicts:
app/views/layouts/_base_feedback.html.erb
|
11 years ago |
|
sw
|
2f9e658697
|
增加问卷调查按钮的样式
|
11 years ago |
|
alan
|
ade0720331
|
邮件系统界面重置
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
b3f37f5154
|
111
|
11 years ago |
|
sw
|
bba213dec9
|
1.#1802 修复页面下方有很大一片空白
2.修复系统文本框的padding、margin都为0
|
11 years ago |
|
alan
|
b9ea3e589e
|
修改《邮件系统》页面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
9c45e372b4
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
app/views/layouts/base_newcontest.html.erb
|
11 years ago |
|
alan
|
479a1249ae
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
90925edce2
|
修改《意见反馈页面css引起的css错乱》和《课程首页动态太少》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d2dfff33d0
|
课程页面增加问卷调查的链接
|
11 years ago |
|
huang
|
2cd805ef4c
|
去掉课程单独的弹框
|
11 years ago |
|
alan
|
74af44a826
|
修改《修改个人资料页面》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
3db80fc3fc
|
修改《contest链接bug》
|
11 years ago |
|
huang
|
293b3a3b42
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
huang
|
f7c1b76b3d
|
用户反馈弹框模块！
|
11 years ago |
|
alan
|
fb6c297a37
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
575b641e25
|
merge dev_chuangbin
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
6c9f5136c0
|
修改《竞赛主页显示错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
3f354a019f
|
修改（个人主页个人签名格式乱了）
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
53b57d4c53
|
修改《个人主页积分弹框显示错误》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
9bbc8d64eb
|
课程母版页加载缓慢
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
2262997c31
|
修改《新建课程时：课程名中有空格或者特殊符号会提示名称无效,》
《 缺陷 Trustie-Forge#1782 (已解决): lable标签和对应的显示值之间间距过大的问题，例如个人主页左侧的信息，具体如图所示》
《本地版中关于学生列表的分组出现的问题：当前已存在A组，再次添加A组应给出提示“A组已存在”，该功能目前只有在学生列表首次加载时才正常》
《托管，课程，竞赛主页中任意点击某一项目，进入该项目主页，右上角的搜索按钮风格和大小不统一。》
《进入某竞赛主页，点击创新竞赛链接没反应》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alanlong9278
|
da85c3efb8
|
进入某竞赛主页，点击创新竞赛链接没反应
|
11 years ago |
|
sw
|
16201f79cf
|
去掉首页更新提示
|
11 years ago |
|
alan
|
23140307aa
|
实现<去存储过程功能，并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
a07bb18dcb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
=
|
305cbae008
|
维护浮动框
|
11 years ago |
|
sw
|
0bce2ae8f3
|
#1752“竞赛通知”，“参加竞赛”时,左侧以及上方布局不同
|
11 years ago |
|
sw
|
819c4c0bc1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/users_controller.rb
|
11 years ago |
|
sw
|
3caf5c8657
|
#1736 猎豹浏览器中，打开某竞赛，进入竞赛主页看到右上方搜索按钮下移了
|
11 years ago |
|
sw
|
30d8d82f37
|
#1734 某竞赛主页中当搜索框为空时，点击搜索的提示问题
|
11 years ago |
 zhuhao
|
61a859f91a
|
托管平台项目主业搜索按钮样式调整
|
11 years ago |
|
alan
|
49cb52146f
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
alan
|
815d2ceb3d
|
添加《添加相同组时应该给出相关提示信息》功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
d6d7331ec6
|
修改竞赛中搜索，搜索条件可以为空，且为空时搜出所有竞赛
|
11 years ago |
|
sw
|
c6be2317a7
|
项目搜索，增加搜索条件不能为空的提示
|
11 years ago |
|
sw
|
b6327460a8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
7c1b86556d
|
增加《作业评分弹窗》《学生列表增加作业评分》两项功能
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
cf2810f1c6
|
#1712点击打开某竞赛作品，网页名显示为托管项目的名称
|
11 years ago |
|
sw
|
36b7c9ca90
|
修改部分页面导航栏点击课程实践报404
|
11 years ago |
|
sw
|
0c1088be58
|
#1706点击导航链接“课程实践平台”跳转到404.具体如图所示
|
11 years ago |
|
sw
|
da751d1dcc
|
#1706点击导航链接“课程实践平台”跳转到404.具体如图所示
|
11 years ago |
|
sw
|
8eb583b971
|
修改课程左侧创建时间padding
|
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
|
5bd8cc76f4
|
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 |
|
sw
|
7fa8d2fff8
|
修改竞赛模块标题栏
|
11 years ago |
|
sw
|
cd3f4ef8d3
|
修改标签的显示js
|
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 |
|
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 |
 z9hang
|
cb88dd9064
|
添加td_tech_title非空判断
|
11 years ago |
|
sw
|
198e2f24ae
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
6363208781
|
修改base_user
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
adf75d2e8a
|
修改匿评结束显示样式
|
11 years ago |
|
sw
|
ca7b56cbf0
|
修改当作业提交大于等于2份时才显示开启匿评按钮
|
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 |
|
sw
|
287e9151a2
|
如果课程没有附件，取消显示附件列表
|
11 years ago |
|
sw
|
9908a7f41f
|
修改作业左侧启动匿评按钮样式
|
11 years ago |
|
sw
|
a95a68caec
|
增加课程右侧js悬浮框
|
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 |
|
sw
|
f9b3cc6588
|
Merge branch 'szzh' into CouerseResources
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
eb15db64ee
|
美化项目工具栏样式显示
修复当缺陷列表为空时缺陷列表样式显示异常
|
11 years ago |
|
sw
|
14da0c7d73
|
优化base_head代码
|
11 years ago |
|
sw
|
5c4a9ac1f8
|
修改右上角课程的域名
|
11 years ago |
|
sw
|
82233a4b54
|
修复老师开启匿评、学生匿评提示以及进入学生作业详细信息界面时界面会自动拉下去的BUG
|
11 years ago |
|
sw
|
ff185852eb
|
未开启匿评时老师界面取消开启/关闭匿评按钮显示
|
11 years ago |
|
z9hang
|
a7a6fbcd22
|
课程资源界面修改
|
11 years ago |
|
sw
|
aa0f10e9fd
|
修改课程通知页面访问报404
|
11 years ago |
|
sw
|
c74b5d7bb4
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
63a141a75a
|
1.修改右上侧课程作业快捷栏显示js、css
|
11 years ago |
|
z9hang
|
46e97b7ae4
|
删除多出来的页脚
|
11 years ago |
|
z9hang
|
096b0e271f
|
课程页面页脚偏移问题
|
11 years ago |
|
z9hang
|
ae19532601
|
修改帮助的浮动边框
|
11 years ago |
|
sw
|
512f16a036
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
61c8feac8f
|
课程后增加课程作业的快捷栏
|
11 years ago |
|
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>
|
11 years ago |
|
sw
|
56cc2a7ad3
|
修复老师编辑作业时课程作业tab没有高亮显示
|
11 years ago |
|
sw
|
a24d1493f9
|
1.修复点击课程动态，课程动态tab页不高亮显示
2.修复点击新建作业，课程作业tab页不高亮显示
|
11 years ago |
|
alan
|
ad6b32ff50
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into szzh
|
11 years ago |
|
sw
|
e3d735ecfc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
421d47a687
|
注册的优化
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
alan
|
1468f4a8df
|
修改《修改资料》页面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
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
|
11 years ago |
|
sw
|
ffaa9c51ba
|
修复作业列表报错
修复2个关闭按钮
|
11 years ago |
|
sw
|
759d69892e
|
修改弹出框样式
|
11 years ago |
|
sw
|
8fbbbe82e0
|
修改作业左上角课程、作业名称显示
|
11 years ago |
 gonglexin
|
c52e87c74f
|
统计数据
|
11 years ago |
|
gonglexin
|
ed258a98ba
|
作业分配算法优化
|
11 years ago |
|
gonglexin
|
1c7b6aa17e
|
阻止用户多次点击启动匿评链接
|
11 years ago |
|
sw
|
b0886e0663
|
增加开启、关闭匿评之前的提示
|
11 years ago |
|
sw
|
13c362b08d
|
1.作业排序按钮显示顺序
2.配置课程->配置 关闭课程 -> 关闭 加入课程->加入
|
11 years ago |
|
sw
|
cc69b06616
|
作业左侧增加开启/关闭匿评按钮
|
11 years ago |
|
alan
|
495c4db43e
|
增加功能<增加学生列表是否公开功能>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
978cfcaa5e
|
1.匿评列表隐藏学生姓名显示，学生头像显示为默认头像
2.取消左边提交作业学生头像列表显示
|
11 years ago |
|
z9hang
|
79b7373446
|
留言修改
|
11 years ago |
|
alan
|
9c4c1679af
|
修改bug<有些课程school_id=0 或为空则课程进不去>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
z9hang
|
b59ff98006
|
修改留言界面
|
11 years ago |
|
z9hang
|
f5e9528b12
|
修改base_homework界面
|
11 years ago |
|
z9hang
|
cc42511a38
|
修改base_homwwork显示的内容
|
11 years ago |
|
sw
|
7ec738dd87
|
增加相关css文件
|
11 years ago |
|
sw
|
9434ec69d2
|
1
|
11 years ago |
|
alan
|
7487c538f3
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
7aa2e5c553
|
修复部分浏览器课程作业界面左边课程信息部分显示不正确的问题
|
11 years ago |
|
sw
|
a594326bce
|
修改课程详细信息界面教师单位为开设课程单位
|
11 years ago |
|
sw
|
01120d063d
|
#1127修复发布作业时，菜单栏相关父菜单变色问题
|
11 years ago |
|
z9hang
|
5f7d7c821c
|
添加网站的默认页脚（使空数据库时显示更合理）
|
11 years ago |
|
alan
|
6e77c5a0b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/my_controller.rb
app/views/contestnotifications/index.html.erb
app/views/courses/_join_private_course.html.erb
app/views/wiki/edit.html.erb
|
11 years ago |
|
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
e9124c62ce
|
#1250修改帐号后将帐号更新成功放在一个显眼的位置
|
11 years ago |
|
alan
|
42f3fbd4b8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
alan
|
859a1122b7
|
修改contest中contestnotification列表和通知公告的界面
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
34c7b47580
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
09f6adbd8d
|
1.修复点击作业左边工作单位会跳入正式版该学校课程列表的BUG
2.格式化页面代码
|
11 years ago |
|
sw
|
a001f85502
|
#1379
1.隐藏作业类型
2.取消无效作业描述
|
11 years ago |
|
z9hang
|
a8bc274621
|
admin操作时提示信息多一条问题（去掉一条）。编辑角色时“问题可指派给此角色”标签显示不全问题（修改css样式）
|
11 years ago |
|
z9hang
|
f15c870053
|
1、代码优化。2、项目新建项目后个人主页中项目tab页点击报错问题
|
11 years ago |
|
z9hang
|
e4ff85894d
|
1、部分代码优化。2、未参加课程或项目的用户个人主页界面不显示对应的tab页
|
11 years ago |
|
z9hang
|
2cabec22f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
258967263e
|
1、代码优化。2、很多页面标题不正确问题
|
11 years ago |
|
z9hang
|
57776d67c5
|
优化代码
|
11 years ago |
|
sw
|
4c41c10e0d
|
首页增加加入课程按钮，用户可以输入课程ID以及课程密码加入对应的课程，已过期课程会给出对应提示
|
11 years ago |
|
sw
|
208940dd86
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ff95178ce7
|
修正页脚合作单位不显示问题，原因：控制中的变量名被修改，但未改view中对应的变量名，解决：改为一致的
|
11 years ago |
|
sw
|
d541309455
|
#1295取消竞赛创建这的关注功能
|
11 years ago |
|
sw
|
802c0ea565
|
1.修改未配置页脚时进入首页报错的BUG
|
11 years ago |
|
sw
|
97f66a2b08
|
Merge branch 'develop' into szzh
|
11 years ago |
|
z9hang
|
2ed4ace7c9
|
添加非网站页脚的空判断
|
11 years ago |
|
z9hang
|
af59cef90b
|
网站页脚配置功能
|
11 years ago |
|
sw
|
864d969c15
|
#1173 重启课程、关闭课程、加入课程、退出课程等按钮页面的刷新
|
11 years ago |
|
sw
|
85d28ba2fa
|
#1170 修复课程主讲教师显示错误
|
11 years ago |
|
sw
|
2e3ff531f6
|
1.#1181课程描述显示的问题
2.修改项目首页用户动态显示按字符长度截取导致页面不协调的BUG
|
11 years ago |
|
sw
|
caabbd44cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
9217351b1c
|
公共贴吧--编辑帖子，页面最下方“主办单位”移位 上一次的修改错误，会引起其他页面异常，去除贴吧帖子页面多出的</div>修复“主办单位”位置异常问题
|
11 years ago |
|
z9hang
|
879ede46f0
|
#1337 公共贴吧--编辑帖子，页面最下方“主办单位”移位 footer页面位置错误，修正
|
11 years ago |
|
z9hang
|
ddca1a0316
|
#1331 创新竞赛：点击竞赛“ 2014 年 Android 程序设计竞赛 ”返回404错误 原因，1、路由缺失，补上路由。2、更多链接处加上参数。3、对应show_contest_user方法中一个@users写错成@uers修正之
|
11 years ago |
|
sw
|
ecfcbf1078
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
ba93d07938
|
#1301所有教师都能配置课程、发布作业
|
11 years ago |
|
sw
|
8ac2640a09
|
#1293修复用户可以通过课程实践页面url进入加入私有课程界面的BUG
解决方案：加入课程按钮增加权限判断；课程实践界面增加权限判断
|
11 years ago |
|
sw
|
b6551f8955
|
#1297修复学生能看到发布通知按钮的BUG
2.增加课程是否对学生开发的数据迁移
3.页面代码整理
解决方案：增加当前登录用户是否在课程有发布通知权限的判断
|
11 years ago |
|
z9hang
|
d1b20dddef
|
添加非空判断
|
11 years ago |
|
alan
|
43e940eb1d
|
修复竞赛作品附件删除报错的bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
27ad49282c
|
控制层增加退出项目的限制
|
11 years ago |
|
sw
|
57835abb37
|
1.增加管理员不能退出项目
2.增加退出项目时的提示
|
11 years ago |
|
sw
|
7e6546d828
|
Merge branch 'szzh' into develop
|
11 years ago |
linhk
|
c31b50421e
|
菜单栏项目、课程样式调整
|
11 years ago |
|
sw
|
d3bd97acbf
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
6b4e2ae37b
|
1.修改竞赛作品分类下拉列表选项
2.修改竞赛标题为全部显示
修改思路：更改数据库数据
|
11 years ago |
|
alan
|
8c19ec8aa0
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/projects_helper.rb
app/views/contest_notification/show.html.erb
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
|
sw
|
04b0f77532
|
修改帖子详细信息页面，贴吧描述格式不正确的BUG
|
11 years ago |
|
sw
|
b5edc0a686
|
#1233 修复进入其他人动态首页时，项目连接报500错误
解决方案：和进入自己的动态首页同一方法处理
|
11 years ago |
|
sw
|
d159b4324a
|
修复创新竞赛中，竞赛名称过长时，页面显示不协调的BUG #1231
解决方案：当超过指定字符数时以省略号代替
|
11 years ago |
|
sw
|
1ce3a78a16
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
535cf74f1f
|
公共贴吧描述显示有html代码的BUG #1215
解决方案:修改描述字段解析方法
|
11 years ago |
|
sw
|
9ff4fee8da
|
修改项目描述为1级标题时文字会重叠的BUG #1210
解决方案：修改css样式
|
11 years ago |
|
z9hang
|
ab052d645b
|
空数据库发布帖子报错问题
|
11 years ago |
|
z9hang
|
63470476a5
|
空数据库时，留下的新手讨论吧、网站建议吧创建人为空，引用时加上非空判断
|
11 years ago |
|
z9hang
|
bd636115d5
|
#1177 正式版：项目--文档，点击下载上传文件的图标按钮，弹出窗口中有两个“新增”评审任务按钮,解决：屏蔽掉页面右下角那个
|
11 years ago |
|
sw
|
fbb19480f5
|
修复火狐不兼容自动换行的问题
|
11 years ago |
|
z9hang
|
f0db3e1b4a
|
添加负积分修正为0的说明
|
11 years ago |
|
linhk
|
fa90219a52
|
在没有“我的课程”菜单项时"我的项目”显示子页显示位置错误的Bug
|
11 years ago |
luguo
|
075b43f836
|
解决版权符号问题
|
11 years ago |
ShengYue.Xu
|
e6c8dbef4f
|
修改了版权符号，由原来的@改成了©
|
11 years ago |
|
linhk
|
a0a8868c24
|
个人主页的课程项目tab页显示优化
|
11 years ago |
|
sw
|
5a7aabd7cf
|
#1357
1.注释无效代码
2.修改wiki、DTS测试logo不见的BUG
|
11 years ago |
|
sw
|
1cd00f55fb
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
linhk
|
ecae8d1f35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
linhk
|
4f0817a146
|
项目--文档--文件--代码评审 中用户头像显示错误
|
11 years ago |
|
sw
|
3d6ee127cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
a3fb08817c
|
分数不能为0、更新readme
|
11 years ago |
|
sw
|
2b12654796
|
Merge branch 'szzh' into develop
|
11 years ago |
|
z9hang
|
746022506d
|
用户列表排序问题、项目得分不一致问题
|
11 years ago |
|
z9hang
|
2b6a376d31
|
修复数据库为初始状态时会出现的部分bug、去除部分连接的域名
|
11 years ago |
|
sw
|
ea0b7ef3f1
|
Merge branch 'szzh' into develop
|
11 years ago |
|
linhk
|
0028c11426
|
退出项目功能
|
11 years ago |
|
linhk
|
70a1839e74
|
英文界面-用户下拉菜单（我的课程、项目、编辑资料）显示问题
|
11 years ago |
|
sw
|
08821b9391
|
Merge branch 'szzh' into develop
|
11 years ago |
|
z9hang
|
1ca6447478
|
修复项目缺陷、新闻、讨论区等页面无法查看bug
|
11 years ago |
|
z9hang
|
7907edf168
|
更新项目得分规则
调整项目列表显示样式
|
11 years ago |
