 sw
|
3fee4211a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
12 years ago |
 z9hang
|
ea095a6f61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
fc1d5baf95
|
课程、竞赛、项目的主页的上下间距缩小
logo和大学名称的居中对齐，以及搜索条的上下居中。
|
12 years ago |
 nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
7df6be8ff4
|
调整资源文件界面
|
12 years ago |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
12 years ago |
|
sw
|
4c6b514d03
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
12 years ago |
 yanxd
|
63af60d7b6
|
edit 图标丢失
bid修改文件保存
|
12 years ago |
|
z9hang
|
cb23b54d01
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
5d15349482
|
编辑作业时显示已添加的附件
|
12 years ago |
|
nwb
|
7e4343f00f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
t430
|
00b866f06a
|
Merge branch 'develop'
|
12 years ago |
 wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
nwb
|
8f153520b4
|
调整上传资源界面
|
12 years ago |
|
wanglinchun
|
84ae8a1cde
|
调整了新建参赛作品的显示样式
|
12 years ago |
|
nwb
|
5c71d7e8be
|
1.资源上传默认类型修改为课件
2.调整标签显示
|
12 years ago |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
029eb1a195
|
作业回复
|
12 years ago |
ganyiang
|
08562c48fe
|
修复osp所有帖子页面布局错乱问题
|
12 years ago |
|
z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业，优化代码
|
12 years ago |
|
yanxd
|
be87e02e4c
|
Revert "从主页登陆时跳转到个人主页"
This reverts commit a794d612af.
|
12 years ago |
|
yanxd
|
53a9d29292
|
Revert "acount"
This reverts commit 03dbcb1168.
|
12 years ago |
|
nwb
|
b736dc91ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
4f7087f9ae
|
课程修正为只有的教师才能查看学生学号
|
12 years ago |
|
z9hang
|
e0592cd6f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
03dbcb1168
|
acount
|
12 years ago |
|
wanglinchun
|
73175aa9b8
|
调整好了参加竞赛的项目列表显示样式
|
12 years ago |
|
xianbo
|
9cdd101cc7
|
fix
|
12 years ago |
|
nwb
|
fa7227931d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
12 years ago |
|
wanglinchun
|
44ec6eabf6
|
完成了竞赛中参赛应用列表显示的调整
|
12 years ago |
|
z9hang
|
06706b577d
|
贴吧、讨论区回复的样式修改
|
12 years ago |
|
z9hang
|
a794d612af
|
从主页登陆时跳转到个人主页
|
12 years ago |
|
yanxd
|
4db228f88e
|
调整tag高度为啥要修改两个地方我自己也忘了，改天再说
|
12 years ago |
|
wanglinchun
|
a0a2d04bd7
|
参赛项目取出提交的人
|
12 years ago |
|
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
12 years ago |
|
nwb
|
22c37602db
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
be73a232e8
|
修改显示
|
12 years ago |
|
nwb
|
f2f81e1d02
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
4b064f3c2a
|
1.用户留言添加了竞赛类信息
2.优化跳转显示
|
12 years ago |
|
yanxd
|
0c302c7aea
|
1s ===> 0.005s
|
12 years ago |
|
nwb
|
8ef716b920
|
1.个人动态留言显示出留言人
2.留言添加跳转链接
|
12 years ago |
|
yanxd
|
13a5aa988a
|
issues#623
|
12 years ago |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
12 years ago |
|
z9hang
|
dcc2789aae
|
修正附件型作业已提交数量显示问题
|
12 years ago |
|
z9hang
|
fb9d6f74af
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
12 years ago |
|
wanglinchun
|
bb3536a7d5
|
调整了参赛作品页面中最终得分和打分总人数和下面文字的剧中对其
|
12 years ago |
|
wanglinchun
|
65f1e2a8d1
|
参赛作品页面添加托管项目网址+超链接+判断网址是否为空
|
12 years ago |
|
wanglinchun
|
f88322f2a1
|
参赛作品页面添加托管项目网址+超链接
|
12 years ago |
 fanqiang
|
c6ee7e53e6
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
fanqiang
|
1a7c82174c
|
修改表结构
|
12 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
12 years ago |
|
nwb
|
aa89900813
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/files/index.html.erb
|
12 years ago |
|
nwb
|
81596d674b
|
屏蔽了温馨提示
|
12 years ago |
|
z9hang
|
6086b25db7
|
贴吧帖子倒序去掉楼层
|
12 years ago |
|
nwb
|
cea01b4df5
|
优化错误提示
|
12 years ago |
|
z9hang
|
7137f2663c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
d2fd2f90e6
|
作业删除图标添加
|
12 years ago |
|
wanglinchun
|
cea41a7aab
|
df
|
12 years ago |
|
wanglinchun
|
fd87245251
|
sdew
|
12 years ago |
|
yanxd
|
14e4bf5bcc
|
typo
|
12 years ago |
|
wanglinchun
|
75853bca01
|
调整竞赛中参赛作品各项指标的位置
|
12 years ago |
|
yanxd
|
665a17eda5
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
yanxd
|
829c77879a
|
typo
|
12 years ago |
|
nwb
|
b733f5c2b9
|
修正后台注册用户问题
|
12 years ago |
|
z9hang
|
a19a1b74a7
|
修正作业数显示不一致问题
|
12 years ago |
|
wanglinchun
|
d019a4d9ce
|
重新调整了：评奖，暂未评奖，未评奖
|
12 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
12 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
12 years ago |
|
nwb
|
4235ca8984
|
修正BUG
|
12 years ago |
|
z9hang
|
5649cc545e
|
修正项目列表界面搜索空值报错问题
|
12 years ago |
|
nwb
|
c0c184d8bf
|
1.修正错误
2.添加全部资源视图时的对资源分类的编辑
|
12 years ago |
|
nwb
|
4136cd27c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
1caa7940dc
|
1、资源发布者的分类和tag编辑；
2、网站管理者对资源的再分类和tag再编辑
|
12 years ago |
|
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
12 years ago |
|
ganyiang
|
eda5121195
|
1.新增osp项目所有帖子的显示页面（待改进）
2.修改osp社区主页的[全球热帖]显示数量，默认25条->10条
|
12 years ago |
|
z9hang
|
77b5ce658b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
8dab599fd2
|
讨论区回帖顺序改为与留言一致（新回复在前）
|
12 years ago |
|
z9hang
|
91d2b58cf4
|
当前用户没有提交作业权限时屏蔽该按钮
|
12 years ago |
|
yanxd
|
603010c30a
|
remove map
|
12 years ago |
|
xianbo
|
a22e082cb5
|
fix repository info
|
12 years ago |
|
xianbo
|
95dab82823
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
ganyiang
|
27ade53af3
|
针对OSP社区的新需求的界面展示：
1.开源项目社区(OSP)index界面增加[软件安全漏洞]展示
2.osp项目主页增加[项目安全态势]、[技术创新趋势] 展示
ps.此次为不负责任的提交~
|
12 years ago |
|
z9hang
|
da37a12158
|
优化代码
|
12 years ago |
|
wanglinchun
|
a8b58016fa
|
df
|
12 years ago |
|
nwb
|
9c24102e65
|
清理部分不需要的文件
|
12 years ago |
|
z9hang
|
57a4f45cad
|
修复编辑作业提交返回错误信息时填入正确信息后异常bug
|
12 years ago |
|
z9hang
|
fcc5f220ce
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
b237f578f4
|
提交缺陷发送邮件，问题编号修改
|
12 years ago |
|
wanglinchun
|
69c1ddad5c
|
新建参赛作品中添加托管项目网址并调整新建参赛作品列表的相关样式
|
12 years ago |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
12 years ago |
|
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
12 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
12 years ago |
|
z9hang
|
73dcf3679d
|
去除课程、项目配置中的讨论区配置
|
12 years ago |
|
nwb
|
0772e04510
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
79b498914a
|
修改错误
|
12 years ago |
|
nwb
|
75f584a6e2
|
1.完成分类资源下载视图显示
2.优化代码，删除冗余代码
|
12 years ago |
|
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中，可以直接关联到竞赛中
|
12 years ago |
|
sw
|
64900b1fd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表，点击更多由显示所有课程可能改为显示当前学校课程列表，之后排序也一样
2.当查询学校课程列表为空时，推荐改为本系统中本年度开设的最好的课程，同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
12 years ago |
|
wanglinchun
|
cf18b94326
|
调整了竞赛中的参赛作品列表按得分排序；
增加参赛作品页面和竞赛中参赛作品得分
|
12 years ago |
|
wanglinchun
|
da48b5ba36
|
swd
|
12 years ago |
|
wanglinchun
|
81c3659a89
|
调整新建参赛作品的显示样式
|
12 years ago |
|
wanglinchun
|
62c81ad884
|
给竞赛中的参赛作品添加最终得分
|
12 years ago |
|
wanglinchun
|
73a82662af
|
应用最终得分数值保留两位小数
|
12 years ago |
|
wanglinchun
|
121b6389d5
|
应用页面增加显示最终得分的分值
|
12 years ago |
|
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
12 years ago |
|
wanglinchun
|
dcc4167e06
|
将竞赛中参赛作品列表的排序方式改为按打分高低
|
12 years ago |
|
xianbo
|
297835e25b
|
fix
|
12 years ago |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
12 years ago |
|
wanglinchun
|
47b3c55b40
|
修改首页中的app为作品
|
12 years ago |
yanxd
|
f35dd2a30d
|
提交作业字段不合验证，返回页面bug
|
12 years ago |
|
sw
|
75902ff118
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
z9hang
|
a80da022cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
xianbo
|
2140b45cc5
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
19e851d65a
|
路由注册验证ajax，课程边栏的单位
|
12 years ago |
|
xianbo
|
a7d2bc3f76
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
c702867250
|
Merge remote-tracking branch 'origin/develop' into develop
|
12 years ago |
|
yanxd
|
e6e001246f
|
# 必填自己的工作单位，其实就是学校
|
12 years ago |
|
sw
|
b97c2e230f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
74a9aa14d6
|
增加获取学校列表按学校开设课程数排序的方法
增加当当前学校开设课程数目为0时按照上方法推荐其进入其他学校查看课程
|
12 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
12 years ago |
|
wanglinchun
|
1e0e5a5ab1
|
Merge branch 'competition' into develop
Conflicts:
config/routes.rb
|
12 years ago |
|
wanglinchun
|
19eb071a77
|
dfd
|
12 years ago |
|
wanglinchun
|
38c7216097
|
添加了新建参赛作品后弹出新建成功的提示框
|
12 years ago |
|
wanglinchun
|
1e39080cf1
|
将参赛作品列表中所属竞赛的链接调整为跳转到我要参赛
|
12 years ago |
|
wanglinchun
|
e46ca4c879
|
将参赛作品页面中的所属竞赛链接调整为跳转到竞赛中的我要参赛
|
12 years ago |
|
yanxd
|
49d6e408b4
|
修改资料页面结构调整
|
12 years ago |
|
xianbo
|
7a4127a3f7
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
wanglinchun
|
2b44b1b893
|
将竞赛中参赛作品列表按照时间顺序逆序排列（针对参赛应用）
|
12 years ago |
|
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
12 years ago |
|
wanglinchun
|
ca38afff61
|
调整了参赛项目的显示顺序，按照时间降序
|
12 years ago |
|
wanglinchun
|
7d33bb9b2d
|
将原有的新建参赛作品时弹出新页面变为了本页弹出下拉框
|
12 years ago |
|
wanglinchun
|
bc07f4c9e5
|
修改参赛应用页面中所属类别的显示长度
|
12 years ago |
|
wanglinchun
|
72e9515f4d
|
修正竞赛子站首页和竞赛列表页面中参赛作品的统计数量（由于以前的参赛项目有私有项目导致统计数量有误）
|
12 years ago |
|
nwb
|
9f1d0d3437
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
12 years ago |
|
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
12 years ago |
|
wanglinchun
|
4d5ac2780d
|
调整新建参赛作品弹出框样式
|
12 years ago |
|
wanglinchun
|
d96e1045d7
|
er
|
12 years ago |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
12 years ago |
|
wanglinchun
|
b182debc16
|
将竞赛页面中“新建参赛作品”的弹出形式由弹出新页面改为本页弹出下拉框，目前已有效果，写数据库有问题
|
12 years ago |
|
z9hang
|
2077b1e8b8
|
课程，竞赛页面问题反馈前添加吧名
|
12 years ago |
|
yanxd
|
845186a600
|
把课程列表中的学校信息修改为，显示老师身份中的学校信息
|
12 years ago |
|
z9hang
|
425e2bb11e
|
course网站中未选学校，有登陆用户，且登陆用户已填学校时添加链接
|
12 years ago |
|
z9hang
|
7a341972e7
|
course网站中大学名加上该大学在本站的链接
|
12 years ago |
