ganyiang
|
0335e06df0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
ganyiang
|
c8ca5277a6
|
新增osp项目“聚焦”标签 （演示用）
|
11 years ago |
 fanqiang
|
150bb1ba1e
|
修改开源社区主页中的漏洞展示部分
|
11 years ago |
 wanglinchun
|
9f29a6c82a
|
将base的格式引入竞赛通知中，使其局部不同，接下来将通知的功能逐步引入
|
11 years ago |
 sw
|
96504d6806
|
1.修改作业提交流程，
2.增加修改作业、删除作业方法
3.修改作业页面显示
|
11 years ago |
|
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
11 years ago |
|
fanqiang
|
b47cec9c3a
|
修改bug展示界面问题
|
11 years ago |
|
fanqiang
|
d17ce35596
|
修改项目展示界面中bug的链接问题，将会重新打开页面
|
11 years ago |
|
fanqiang
|
91d61502a2
|
将软件漏洞改为软件态势
|
11 years ago |
 yanxd
|
006e4ae45e
|
user tab bar
|
11 years ago |
 z9hang
|
866ae3a38d
|
发送邮件部分代码优化
|
11 years ago |
|
sw
|
86cb496f3f
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
ganyiang
|
4b1212f279
|
修正OSP在rubymine下报红的小问题
删掉一些无用代码
|
11 years ago |
|
sw
|
5a2226af37
|
修改作业html
|
11 years ago |
|
z9hang
|
c4b292b711
|
个人主页项目课程动态，不能查看真名时不显示括号
|
11 years ago |
|
z9hang
|
4b119e2f00
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
03c8f39729
|
1.修复登录提示描述不正确的问题
2.修改作业显示界面html
|
11 years ago |
|
z9hang
|
97ae2356bf
|
引用被遮住不能点问题
|
11 years ago |
|
sw
|
cbb2312047
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
b9550cedb9
|
课程作业显示界面修改
|
11 years ago |
|
z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
11 years ago |
|
sw
|
91497d3f95
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
3546355f70
|
增加修改昵称功能以及昵称是否重复的判断
|
11 years ago |
|
z9hang
|
2d77975221
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/helpers/courses_helper.rb
app/views/bids/_homework_list.html.erb
config/locales/en.yml
|
11 years ago |
|
z9hang
|
1c92007ac6
|
课程个人主页动态改为 昵称（真名） 形式显示（对该课程的老师助教）
作业里老师助教看到真名
|
11 years ago |
|
sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
11 years ago |
|
sw
|
e0273d320c
|
1.登录增加js提示可以用昵称和邮箱登录
2.修改资料界面增加昵称的修改以及修改昵称的验证
3.修改昵称的描述
|
11 years ago |
 nwb
|
b52690adc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
11 years ago |
|
z9hang
|
eb0e149ac7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
daecf1a53b
|
老师收到课程留言区的直接留言及对老师的回复的邮件提醒
|
11 years ago |
|
yanxd
|
5d8edb218f
|
管理员查看user_projects 课程项目混淆的问题
|
11 years ago |
|
z9hang
|
31804b3d45
|
发邮件
|
11 years ago |
|
yanxd
|
306ae9f685
|
用户tag点击之后的名字显示修改，用户邮箱隐藏
|
11 years ago |
|
sw
|
8227c5222a
|
修复老师未进行综评的用户进入互评界面报错的BUG
|
11 years ago |
|
z9hang
|
cd333c8f35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
11 years ago |
xianbo
|
a70593ad76
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
yanxd
|
200c052bb4
|
watchers
|
11 years ago |
|
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
11 years ago |
|
fanqiang
|
06a775e3f9
|
修改帖子显示数字错误
修改来源显示错误问题
|
11 years ago |
|
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
4c3e2376f0
|
修改帖子页面
|
11 years ago |
|
nwb
|
68b9a7efc5
|
修正批准成员申请未选择角色时的BUG
|
11 years ago |
|
fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
11 years ago |
|
yanxd
|
a9b88b8e66
|
issues#show words typo
|
11 years ago |
|
fanqiang
|
6dba5aaae6
|
修改帖子中 回复，关注，浏览的链接错误
|
11 years ago |
|
wanglinchun
|
d20114cc42
|
竞赛子站国际化完成
|
11 years ago |
|
wanglinchun
|
4afc41a171
|
修改了编辑参赛作品不能更新托管项目的问题
|
11 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
11 years ago |
|
z9hang
|
ddf5590c54
|
修复个人主页查看关注的项目时报user_id指代不明的sql错误
|
11 years ago |
|
z9hang
|
5d4eec010e
|
隐藏点击描述用户的标签后跳到的标签页面显示的用户邮箱
|
11 years ago |
|
wanglinchun
|
8d77c62359
|
sdfd
|
11 years ago |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
11 years ago |
|
yanxd
|
654cb404e2
|
bootstrap test
|
11 years ago |
|
fanqiang
|
401f097079
|
项目展示页面添加帖子的发布者信息
|
11 years ago |
|
fanqiang
|
f392fc244f
|
修改连接，进入帖子后应该进入新的界面
去掉项目展示部分的发布帖子连接
|
11 years ago |
|
wanglinchun
|
b416d69639
|
vxc
|
11 years ago |
|
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
2273a6fd0b
|
Merge remote-tracking branch 'origin/develop' into develop
|
11 years ago |
|
yanxd
|
d77d7e14c7
|
home page memo css no wrap
|
11 years ago |
|
yanxd
|
7a4e5afba0
|
test
|
11 years ago |
|
wanglinchun
|
b13638bb95
|
竞赛子站国际化
|
11 years ago |
|
wanglinchun
|
7b6c96a8b6
|
view中contests中的文件已经全部国际化
|
11 years ago |
|
wanglinchun
|
8b356cddb1
|
修改用户留言页面中未登录状态下的提示语位置
|
11 years ago |
|
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
ee3a5f5719
|
代码修改
|
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
|
be1a0e0fea
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
xianbo
|
734caef3dc
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
xianbo
|
a3a95556a3
|
fix 王林春提交了冲突文件
|
11 years ago |
|
z9hang
|
ad5ac329f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
11 years ago |
|
t430
|
edfd7372bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
11 years ago |
|
yanxd
|
4eebd48f92
|
realname
|
11 years ago |
|
yanxd
|
3ae7729539
|
Merge branch 'szzh' into develop
|
11 years ago |
|
yanxd
|
213939b474
|
realname
|
11 years ago |
|
wanglinchun
|
4081ef93a3
|
参赛作品发布人不能打分和评论；
匿名用户隐藏打分功能
|
11 years ago |
|
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
11 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
6b5fda1c78
|
read txt attachment
|
11 years ago |
|
sw
|
0ec7d6b4e7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
71bbc50542
|
增加作业留言的分页显示
|
11 years ago |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
11 years ago |
|
yanxd
|
62f9ed052b
|
issues#655
|
11 years ago |
|
nwb
|
eb5138e103
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
9c75b701f4
|
修改BUG
|
11 years ago |
|
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
11 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
|
11 years ago |
|
ganyiang
|
5374addb5a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
ganyiang
|
c70352011d
|
修复buglist.css对整体界面的影响
|
11 years ago |
|
yanxd
|
f44b930037
|
233
|
11 years ago |
|
ganyiang
|
f0f807b2de
|
修改OSP社区的态势分析图表显示；
仅供演示！
|
11 years ago |
|
nwb
|
4f9625b265
|
修改BUG
|
11 years ago |
|
wanglinchun
|
2f709c92ba
|
重构bid_helper，contest_helper以及application_helper中共同用到的方法
|
11 years ago |
|
nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
11 years ago |
|
fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
11 years ago |
|
yanxd
|
34aa8433de
|
import hubspot
|
11 years ago |
|
fanqiang
|
0b79cbac32
|
修改帖子的链接，帖子不在自己社区显示，而是直接链接到其他的网站
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
fanqiang
|
10aa8eee81
|
显示帖子的发布者和时间
|
11 years ago |
|
wanglinchun
|
a22678f36f
|
彻底调好了新建参赛作品后弹出的提示框问题
|
11 years ago |
|
wanglinchun
|
e10c6adf7a
|
隐藏掉新建参赛作品中完成后上传文件小框中出现的提示语
|
11 years ago |
|
wanglinchun
|
88b7fd24b1
|
给新建参赛作品中托管项目添加默认选项，使用户自行选择是否需要将参赛作品托管到制定的项目中
|
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 |
|
wanglinchun
|
56b66c8f5f
|
给参赛作品页面中托管项目添加超链接
|
11 years ago |
|
z9hang
|
7d9b2c751b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
4fffd321d2
|
竞赛、课程主页贴吧动态及贴吧内帖子列表添加最后回复人
|
11 years ago |
|
yanxd
|
3e8decf1d1
|
student user_course
|
11 years ago |
|
yanxd
|
c5a3a5bac3
|
user_courses.html
|
11 years ago |
|
z9hang
|
21e58ce3df
|
课程列表中课程成员数量显示n+（不显示精确数）
只有课程成员能点击教师数量学生数量的链接和查看已提交作业的列表
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
yanxd
|
19aba25625
|
course revert search project
|
11 years ago |
|
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
11 years ago |
|
sw
|
c7b19d8f2e
|
修改作业提交流程
|
11 years ago |
|
wanglinchun
|
12f3da8416
|
sdf
|
11 years ago |
|
wanglinchun
|
518de57123
|
将参赛作品编辑更新后的提示语修改为汉语
|
11 years ago |
|
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
11 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
0f340a7cda
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
624a7f7bdd
|
还原资源文件管理的tag显示为一行
|
11 years ago |
|
fanqiang
|
45fa8b384a
|
修改字体颜色
|
11 years ago |
|
fanqiang
|
290d07ffdd
|
修改新建帖子bug（open_source_project）
|
11 years ago |
|
fanqiang
|
c5dd0317c2
|
修改合并后的bug（open_source_project）
|
11 years ago |
|
yanxd
|
0ab17f1e90
|
contest image show
|
11 years ago |
|
wanglinchun
|
a5cb14274c
|
修改参赛作品页面中未登录状态下的提示
|
11 years ago |
|
wanglinchun
|
dd43e2c3fc
|
竞赛页面我要参赛中添加判断，当用户未登录时提示登录后参赛
|
11 years ago |
|
xianbo
|
e3fe69c445
|
Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/open_source_projects/_show_topics.html.erb
|
11 years ago |
|
z9hang
|
45339e53d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
fanqiang
|
973a59042c
|
修改帖子显示用户名与链接问题
|
11 years ago |
|
wanglinchun
|
bcb3bf0c19
|
调整参赛作品编辑页面中托管项目列表的显示宽度
|
11 years ago |
|
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
11 years ago |
|
wanglinchun
|
77b7da81fd
|
参赛作品页面编辑功能中添加修改托管项目列表完成
|
11 years ago |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
11 years ago |
|
yanxd
|
4aed14228a
|
project/course/ members remove link
|
11 years ago |
|
yanxd
|
85c77ca074
|
xss, ckeditor js bug.
|
11 years ago |
|
yanxd
|
dac992548a
|
course_form
|
11 years ago |
|
nwb
|
0b4c95711a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
11 years ago |
|
yanxd
|
7189d9a14a
|
course_form
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
yanxd
|
9ae8494c97
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
z9hang
|
5b8b2045f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
b3489d3e68
|
修改删除文件后跳转错误问题
|
11 years ago |
|
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
11 years ago |
|
wanglinchun
|
10b34341c7
|
修改参赛作品编辑页面说明文字：应用--》作品
|
11 years ago |
|
wanglinchun
|
2c30008981
|
竞赛页面中我要参赛下面修改温馨提示内容
|
11 years ago |
|
yanxd
|
2aeb12616b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构， 不再是一对一的匹配帖子，而是添加了一个中间表
|
11 years ago |
|
sw
|
4de089250f
|
修改删除留言方法为destroy_jour，以及相关路由，访问action的改变
|
11 years ago |
|
yanxd
|
112b8de921
|
issues#575
|
11 years ago |
|
wanglinchun
|
f815410381
|
修改了新建参赛作品中托管项目的显示颜色和宽度
|
11 years ago |
|
yanxd
|
f9166a71a7
|
issues#555
|
11 years ago |
|
sw
|
c141501085
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
9a62fe22c6
|
修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
|
11 years ago |
|
yanxd
|
9373666576
|
混淆课程数量
|
11 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
11 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
11 years ago |
|
sw
|
0de77bdc44
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
14a468066f
|
修复打开首页，SQL没有默认的school_id的问题
|
11 years ago |
|
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
11 years ago |
|
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
11 years ago |
|
z9hang
|
e78a309842
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
19d1682077
|
修改编辑作业提交文件处样式
|
11 years ago |
|
z9hang
|
eaa9c94290
|
自己的用户界面也不现实邮箱
|
11 years ago |
|
z9hang
|
2b12d31fb8
|
去除网站中的邮箱地址显示
|
11 years ago |
|
sw
|
7ead12dba6
|
1.优化路由代码
2.修改当查询学校课程数数量少于8个时，推荐9-当前学校课程数量门最好的课程给用户，并且排除当前学校课程
|
11 years ago |
|
z9hang
|
edf2a84072
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
2524600aeb
|
修正贴吧留言删除附件后跳转错误问题
|
11 years ago |
|
sw
|
3fee4211a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
11 years ago |
|
z9hang
|
ea095a6f61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
fc1d5baf95
|
课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐，以及搜索条的上下居中。
|
11 years ago |
|
nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
7df6be8ff4
|
调整资源文件界面
|
11 years ago |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
11 years ago |
|
sw
|
4c6b514d03
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
11 years ago |
|
yanxd
|
63af60d7b6
|
edit 图标丢失
bid修改文件保存
|
11 years ago |
|
z9hang
|
cb23b54d01
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
5d15349482
|
编辑作业时显示已添加的附件
|
11 years ago |
|
nwb
|
7e4343f00f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
t430
|
00b866f06a
|
Merge branch 'develop'
|
11 years ago |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
8f153520b4
|
调整上传资源界面
|
11 years ago |
|
wanglinchun
|
84ae8a1cde
|
调整了新建参赛作品的显示样式
|
11 years ago |
|
nwb
|
5c71d7e8be
|
1.资源上传默认类型修改为课件
2.调整标签显示
|
11 years ago |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
029eb1a195
|
作业回复
|
11 years ago |
|
ganyiang
|
08562c48fe
|
修复osp所有帖子页面布局错乱问题
|
11 years ago |
|
z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
11 years ago |
|
yanxd
|
be87e02e4c
|
Revert "从主页登陆时跳转到个人主页"
This reverts commit a794d612af.
|
11 years ago |
|
yanxd
|
53a9d29292
|
Revert "acount"
This reverts commit 03dbcb1168.
|
11 years ago |
|
nwb
|
b736dc91ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4f7087f9ae
|
课程修正为只有的教师才能查看学生学号
|
11 years ago |
|
z9hang
|
e0592cd6f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
03dbcb1168
|
acount
|
11 years ago |
|
wanglinchun
|
73175aa9b8
|
调整好了参加竞赛的项目列表显示样式
|
11 years ago |
|
xianbo
|
9cdd101cc7
|
fix
|
11 years ago |
|
nwb
|
fa7227931d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
11 years ago |
|
wanglinchun
|
44ec6eabf6
|
完成了竞赛中参赛应用列表显示的调整
|
11 years ago |
|
z9hang
|
06706b577d
|
贴吧、讨论区回复的样式修改
|
11 years ago |
|
z9hang
|
a794d612af
|
从主页登陆时跳转到个人主页
|
11 years ago |
|
yanxd
|
4db228f88e
|
调整tag高度为啥要修改两个地方我自己也忘了，改天再说
|
11 years ago |
|
wanglinchun
|
a0a2d04bd7
|
参赛项目取出提交的人
|
11 years ago |
|
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
11 years ago |
|
nwb
|
22c37602db
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
be73a232e8
|
修改显示
|
11 years ago |
|
nwb
|
f2f81e1d02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
4b064f3c2a
|
1.用户留言添加了竞赛类信息
2.优化跳转显示
|
11 years ago |
|
yanxd
|
0c302c7aea
|
1s ===> 0.005s
|
11 years ago |
|
nwb
|
8ef716b920
|
1.个人动态留言显示出留言人
2.留言添加跳转链接
|
11 years ago |
|
yanxd
|
13a5aa988a
|
issues#623
|
11 years ago |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
z9hang
|
dcc2789aae
|
修正附件型作业已提交数量显示问题
|
11 years ago |
|
z9hang
|
fb9d6f74af
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
11 years ago |
|
wanglinchun
|
bb3536a7d5
|
调整了参赛作品页面中最终得分和打分总人数和下面文字的剧中对其
|
11 years ago |
|
wanglinchun
|
65f1e2a8d1
|
参赛作品页面添加托管项目网址+超链接+判断网址是否为空
|
11 years ago |
|
wanglinchun
|
f88322f2a1
|
参赛作品页面添加托管项目网址+超链接
|
11 years ago |
|
fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
nwb
|
aa89900813
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/files/index.html.erb
|
11 years ago |
|
nwb
|
81596d674b
|
屏蔽了温馨提示
|
11 years ago |
|
z9hang
|
6086b25db7
|
贴吧帖子倒序去掉楼层
|
11 years ago |
|
nwb
|
cea01b4df5
|
优化错误提示
|
11 years ago |
|
z9hang
|
7137f2663c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
d2fd2f90e6
|
作业删除图标添加
|
11 years ago |
|
wanglinchun
|
cea41a7aab
|
df
|
11 years ago |
|
wanglinchun
|
fd87245251
|
sdew
|
11 years ago |
|
yanxd
|
14e4bf5bcc
|
typo
|
11 years ago |
|
wanglinchun
|
75853bca01
|
调整竞赛中参赛作品各项指标的位置
|
11 years ago |
|
yanxd
|
665a17eda5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
yanxd
|
829c77879a
|
typo
|
11 years ago |
|
nwb
|
b733f5c2b9
|
修正后台注册用户问题
|
11 years ago |
|
z9hang
|
a19a1b74a7
|
修正作业数显示不一致问题
|
11 years ago |
|
wanglinchun
|
d019a4d9ce
|
重新调整了：评奖，暂未评奖，未评奖
|
11 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
11 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
11 years ago |
|
nwb
|
4235ca8984
|
修正BUG
|
11 years ago |
|
z9hang
|
5649cc545e
|
修正项目列表界面搜索空值报错问题
|
11 years ago |
|
nwb
|
c0c184d8bf
|
1.修正错误
2.添加全部资源视图时的对资源分类的编辑
|
11 years ago |
|
nwb
|
4136cd27c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
1caa7940dc
|
1、资源发布者的分类和tag编辑；
2、网站管理者对资源的再分类和tag再编辑
|
11 years ago |
|
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
11 years ago |
|
ganyiang
|
eda5121195
|
1.新增osp项目所有帖子的显示页面（待改进）
2.修改osp社区主页的[全球热帖]显示数量，默认25条->10条
|
11 years ago |
|
z9hang
|
77b5ce658b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
8dab599fd2
|
讨论区回帖顺序改为与留言一致（新回复在前）
|
11 years ago |
|
z9hang
|
91d2b58cf4
|
当前用户没有提交作业权限时屏蔽该按钮
|
11 years ago |
|
yanxd
|
603010c30a
|
remove map
|
11 years ago |
|
xianbo
|
a22e082cb5
|
fix repository info
|
11 years ago |
|
xianbo
|
95dab82823
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
ganyiang
|
27ade53af3
|
针对OSP社区的新需求的界面展示：
1.开源项目社区(OSP)index界面增加[软件安全漏洞]展示
2.osp项目主页增加[项目安全态势]、[技术创新趋势] 展示
ps.此次为不负责任的提交~
|
11 years ago |
|
z9hang
|
da37a12158
|
优化代码
|
11 years ago |
|
wanglinchun
|
a8b58016fa
|
df
|
11 years ago |
|
nwb
|
9c24102e65
|
清理部分不需要的文件
|
11 years ago |
|
z9hang
|
57a4f45cad
|
修复编辑作业提交返回错误信息时填入正确信息后异常bug
|
11 years ago |
|
z9hang
|
fcc5f220ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
b237f578f4
|
提交缺陷发送邮件，问题编号修改
|
11 years ago |
|
wanglinchun
|
69c1ddad5c
|
新建参赛作品中添加托管项目网址并调整新建参赛作品列表的相关样式
|
11 years ago |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
11 years ago |
|
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
11 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
11 years ago |
|
z9hang
|
73dcf3679d
|
去除课程、项目配置中的讨论区配置
|
11 years ago |
|
nwb
|
0772e04510
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
79b498914a
|
修改错误
|
11 years ago |
|
nwb
|
75f584a6e2
|
1.完成分类资源下载视图显示
2.优化代码，删除冗余代码
|
11 years ago |
|
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中，可以直接关联到竞赛中
|
11 years ago |
|
sw
|
64900b1fd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
11 years ago |
|
wanglinchun
|
cf18b94326
|
调整了竞赛中的参赛作品列表按得分排序；
增加参赛作品页面和竞赛中参赛作品得分
|
11 years ago |
|
wanglinchun
|
da48b5ba36
|
swd
|
11 years ago |
|
wanglinchun
|
81c3659a89
|
调整新建参赛作品的显示样式
|
11 years ago |
|
wanglinchun
|
62c81ad884
|
给竞赛中的参赛作品添加最终得分
|
11 years ago |
|
wanglinchun
|
73a82662af
|
应用最终得分数值保留两位小数
|
11 years ago |
|
wanglinchun
|
121b6389d5
|
应用页面增加显示最终得分的分值
|
11 years ago |
|
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
11 years ago |
|
wanglinchun
|
dcc4167e06
|
将竞赛中参赛作品列表的排序方式改为按打分高低
|
11 years ago |
|
xianbo
|
297835e25b
|
fix
|
11 years ago |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
11 years ago |
|
wanglinchun
|
47b3c55b40
|
修改首页中的app为作品
|
11 years ago |
|
yanxd
|
f35dd2a30d
|
提交作业字段不合验证，返回页面bug
|
11 years ago |
|
sw
|
75902ff118
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
z9hang
|
a80da022cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
xianbo
|
2140b45cc5
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
19e851d65a
|
路由注册验证ajax，课程边栏的单位
|
11 years ago |
|
xianbo
|
a7d2bc3f76
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
yanxd
|
c702867250
|
Merge remote-tracking branch 'origin/develop' into develop
|
11 years ago |
|
yanxd
|
e6e001246f
|
# 必填自己的工作单位，其实就是学校
|
11 years ago |
|
sw
|
b97c2e230f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
