 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 |
