 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 |
|
sw
|
d66dc65cca
|
Merge branch 'szzh' into develop
|
11 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
11 years ago |
|
sw
|
28606f030d
|
修复搜索参赛作品结果翻页跳转不正确的BUG
|
11 years ago |
|
sw
|
b05e112a3f
|
1.修改邮件服务器配置
2.查询竞赛作品在js中提交，增加搜索条件是不是为空的判断
3.查询结果取消按照时间/活跃度排序功能
|
11 years ago |
|
sw
|
3119d9a9aa
|
增加竞赛作品的搜索功能
|
11 years ago |
|
z9hang
|
90a35fa24a
|
竞赛、课程首页，贴吧动态名字过长显示问题
课程、项目编辑贴子导航丢失问题
|
11 years ago |
|
z9hang
|
8871652e01
|
添加首页定制，设置是否显示"我的课程"功能
|
11 years ago |
 nwb
|
f8a59220e3
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
b5b246f098
|
修复个性签名未自动换行的问题
|
11 years ago |
|
nwb
|
1257e67380
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
2bfc7aa93f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
dd589c4811
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
a7debdae98
|
格式化代码
|
11 years ago |
|
z9hang
|
dee09aad75
|
修复导航bug
|
11 years ago |
|
nwb
|
68be9c25b8
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/contest.html.erb
|
11 years ago |
 yanxd
|
87671e9d73
|
base footer merge bug.
|
11 years ago |
|
z9hang
|
3e79dd6e32
|
竞赛通知鼠标悬停
导航丢失问题
|
11 years ago |
|
nwb
|
35ab3a2c7d
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
z9hang
|
5e4571d6af
|
修复部分页面导航丢失问题
|
11 years ago |
|
nwb
|
2a8929b90f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
e24323147d
|
修复项目描述过长不会自动换行的BUG
|
11 years ago |
|
nwb
|
4259d9c282
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
206aeeccfb
|
优化2级菜单效果
|
11 years ago |
|
nwb
|
f20f0aaa45
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
z9hang
|
4bd083b059
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/users/show.html.erb
|
11 years ago |
|
z9hang
|
b44b488807
|
导航栏调整
|
11 years ago |
|
z9hang
|
bd43ef5d61
|
网站两边空白颜色调整、网站导航栏调整、admin账户新建用户bug修复
|
11 years ago |
|
nwb
|
b655f0c7b0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
29618d6a72
|
竞赛界面调整
|
11 years ago |
|
nwb
|
b7c4f87a8f
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
Conflicts:
app/views/welcome/index.html.erb
|
11 years ago |
|
z9hang
|
5b7fc4048a
|
user.trustie.net域名下课程主页导航栏多个课程实践菜单
页面跳转时域名不正确问题重新修正
|
11 years ago |
|
z9hang
|
0f4933240b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
7c3a81735c
|
user。trustie.net域名下跳转到项目页面时主域名没变bug（尚需测试）
user.trustie.net域名下主导航栏多一个项目托管菜单问题
|
11 years ago |
|
nwb
|
3b1b057f0a
|
课程描述自动换行
|
11 years ago |
|
nwb
|
634ef8df5f
|
界面修改
|
11 years ago |
|
nwb
|
615b3ac2ac
|
课程界面调整
|
11 years ago |
|
nwb
|
a58a747cfa
|
屏蔽用户界面的关注需求功能
|
11 years ago |
|
nwb
|
3254c4a237
|
修正二级菜单名称显示问题
|
11 years ago |
|
nwb
|
1d4dad22ad
|
Merge commit '6d698cb5d8fa00faf3cb59a1c657c419bd2da6d5' into develop
Conflicts:
ReadMe.txt
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
nwb
|
bdaf59513b
|
Merge commit '6688ba61dd67ce7bea195d6f5a7a4458b86956d7' into develop
Conflicts:
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
yanxd
|
0998438e67
|
bootstrap fine tuning.
|
11 years ago |
|
yanxd
|
449b87e38d
|
remove cnzz
|
11 years ago |
xianbo
|
25ee1d8672
|
for adjust test domain and give a setting reposwq
|
11 years ago |
|
yanxd
|
ab03962e9a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
aca63146e9
|
搜索文件归属，课程相关逻辑修改，查询把过滤去掉了。暂时没想有什么过滤的好办法
|
11 years ago |
|
nwb
|
dd396a6da2
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
nwb
|
bc179fbc39
|
右上角菜单增加二级菜单
|
11 years ago |
|
z9hang
|
470f40db82
|
去除绝对网址
|
11 years ago |
|
nwb
|
efbffa7436
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
11 years ago |
|
sw
|
eac725a0f4
|
修改作业、用户、课程界面中相关学校的链接
|
11 years ago |
|
yanxd
|
f664ec10b4
|
Merge branch 'szzh' into develop
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
11 years ago |
|
yanxd
|
663634b9da
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
xianbo
|
830e2d4fb4
|
隐藏 站长统计
|
11 years ago |
|
z9hang
|
bc587f3e7d
|
屏蔽个人分数实时刷新功能
修复个人分数计分异常
|
11 years ago |
|
sw
|
12b16f0bb6
|
1.修复作业界面点击所属任务链接出错的BUG
2.点击所属任务返回作业列表界面
|
11 years ago |
|
sw
|
392dc0c365
|
增加访问作业显示列表的权限
|
11 years ago |
|
sw
|
ed9b97f987
|
增加访问作业显示列表的权限
|
11 years ago |
|
sw
|
c4b2c47dc7
|
调整作业显示样式
|
11 years ago |
|
sw
|
7702b746c6
|
修复作业显示界面，提交作业按钮不显示的问题
|
11 years ago |
|
nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
11 years ago |
|
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
11 years ago |
|
z9hang
|
02e221eedb
|
修改：网站中的旧分数显示为新分数
|
11 years ago |
|
z9hang
|
df89e5e173
|
去掉多的一个分数显示
|
11 years ago |
|
z9hang
|
9d9bc76af4
|
定时刷新分数
|
11 years ago |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
11 years ago |
|
z9hang
|
9061a77221
|
修改user.user_score为空问题的解决方式
|
11 years ago |
|
z9hang
|
d2db58050d
|
修复部分未填工作单位报错问题
|
11 years ago |
|
z9hang
|
08ba10c32d
|
添加超链接
已添加的超链接：
学校主页，课程信息中的学校名称
竞赛中项目列表： 参赛人
竞赛中参入竞赛tab页：参赛代表
修改作业界面教师单位不显示问题，并添加超链接
作业界面作业名称添加超链接
软件众包页面：软件众包名称
软件众包页面：关注栏下头像添加链接，参与项目栏：图片添加链接
贴吧帖子：修复 发帖回帖下方 “由xxx在XXX之前添加”中名子未链接问题
|
11 years ago |
|
z9hang
|
1cb1eeeb1d
|
个人主页：姓名、工作单位
课程主页：课程名称、教师单位
项目主页：项目名称
竞赛主页：竞赛名称
主页：课程列=>单位名称
修复部分个人主页报错问题
|
11 years ago |
|
nwb
|
0de6cc8a31
|
修改作业基础视图
|
11 years ago |
|
nwb
|
78612488e5
|
1.修改新建作业及视图
2.修改编辑作业及视图
|
11 years ago |
|
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
11 years ago |
|
z9hang
|
697a6034b2
|
新得分显示
|
11 years ago |
|
yanxd
|
c5d892a214
|
footer
|
11 years ago |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
11 years ago |
|
yanxd
|
b58c5685ac
|
Merge branch 'szzh' into develop
|
11 years ago |
|
sw
|
b7458abd9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
277aa81a60
|
修复占位列表界面显示的作业描述样式不正确的问题
|
11 years ago |
|
yanxd
|
0536af6625
|
Merge branch 'szzh' into develop
|
11 years ago |
|
nwb
|
c8900c279c
|
课程标签增加、删除
|
11 years ago |
|
yanxd
|
858a7936b5
|
revert userscore catch exception, added cache to footer.
|
11 years ago |
|
yanxd
|
cccb19e733
|
cnzz
|
11 years ago |
|
nwb
|
ae8fcca14f
|
1.课程接触视图修改
2.添加课程成员列表视图
|
11 years ago |
|
sw
|
43736ba8d6
|
兼容历史数据
|
11 years ago |
|
sw
|
541ced18ec
|
作业显示界面增加导航栏
|
11 years ago |
|
sw
|
26b933dddb
|
t
|
11 years ago |
 wanglinchun
|
1393aebace
|
完成了按钮样式
|
11 years ago |
|
yanxd
|
4c7bcd50f5
|
contests delete routes error
|
11 years ago |
|
wanglinchun
|
372de9932a
|
英文版竞赛子站完成
|
11 years ago |
|
wanglinchun
|
42aba52111
|
竞赛子站英文版5
|
11 years ago |
|
yanxd
|
57994edc06
|
load user in homework
|
11 years ago |
|
yanxd
|
1c7923e5bd
|
sql
|
11 years ago |
|
sw
|
8e2288a362
|
1.封装获取作业平均评分方法
2.优化作业列表界面效率
|
11 years ago |
|
nwb
|
d22ffa84b4
|
1.课程标签迁移，从项目中分离
2.标签control\view添加对课程类标签的处理
|
11 years ago |
|
nwb
|
cd3c69af94
|
课程资源文件迁移，从项目中分离
|
11 years ago |
|
nwb
|
6ff26d06ab
|
修改课程基础页面逻辑(base_courses.html.erb)
|
11 years ago |
|
sw
|
39ce95a950
|
美化作业显示界面
|
11 years ago |
|
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
11 years ago |
|
sw
|
03c8f39729
|
1.修复登录提示描述不正确的问题
2.修改作业显示界面html
|
11 years ago |
|
sw
|
b9550cedb9
|
课程作业显示界面修改
|
11 years ago |
|
yanxd
|
654cb404e2
|
bootstrap test
|
11 years ago |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
11 years ago |
|
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
yanxd
|
5364687160
|
bootstrap & tag bug
|
11 years ago |
|
xianbo
|
a3a95556a3
|
fix 王林春提交了冲突文件
|
11 years ago |
|
yanxd
|
f44b930037
|
233
|
11 years ago |
|
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
11 years ago |
|
z9hang
|
21e58ce3df
|
课程列表中课程成员数量显示n+（不显示精确数）
只有课程成员能点击教师数量学生数量的链接和查看已提交作业的列表
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
yanxd
|
f9166a71a7
|
issues#555
|
11 years ago |
|
yanxd
|
9373666576
|
混淆课程数量
|
11 years ago |
|
z9hang
|
eaa9c94290
|
自己的用户界面也不现实邮箱
|
11 years ago |
|
z9hang
|
2b12d31fb8
|
去除网站中的邮箱地址显示
|
11 years ago |
|
z9hang
|
fc1d5baf95
|
课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐，以及搜索条的上下居中。
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
yanxd
|
19e851d65a
|
路由注册验证ajax，课程边栏的单位
|
11 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
wanglinchun
|
1e0e5a5ab1
|
Merge branch 'competition' into develop
Conflicts:
config/routes.rb
|
11 years ago |
|
wanglinchun
|
30f9bc9178
|
隐藏竞赛页面参赛项目和参赛应用；
隐藏竞赛页面中关注的“更多”功能
|
11 years ago |
|
wanglinchun
|
3edb1114c3
|
修改参赛作品列表页面的部分显示方式
|
11 years ago |
