 yanxd
|
37232cd5b2
|
把所有user_extensions的逻辑移到了user中，业务代码还没有修改,下一步是user_score和projectxxx,先测测效果
|
12 years ago |
 wanglinchun
|
81a45fe977
|
dfs
|
12 years ago |
|
wanglinchun
|
528af32f91
|
修改forge，localhost首页不能显示的问题
|
12 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
12 years ago |
 z9hang
|
4747375499
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
12 years ago |
|
z9hang
|
45d17db8b6
|
实现给教师发课程留言邮件时根据教师设置判断是否发送邮件
|
12 years ago |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
 fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
12 years ago |
|
z9hang
|
866ae3a38d
|
发送邮件部分代码优化
|
12 years ago |
|
z9hang
|
2e36949604
|
添加课程列表查看权限（需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看）
|
12 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
|
12 years ago |
 sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
12 years ago |
|
z9hang
|
daecf1a53b
|
老师收到课程留言区的直接留言及对老师的回复的邮件提醒
|
12 years ago |
|
z9hang
|
31804b3d45
|
发邮件
|
12 years ago |
|
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
12 years ago |
|
fanqiang
|
4c3e2376f0
|
修改帖子页面
|
12 years ago |
yanxd
|
a9b88b8e66
|
issues#show words typo
|
12 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
12 years ago |
|
t430
|
edfd7372bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
12 years ago |
|
yanxd
|
3ae7729539
|
Merge branch 'szzh' into develop
|
12 years ago |
|
yanxd
|
213939b474
|
realname
|
12 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
|
12 years ago |
|
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
12 years ago |
|
yanxd
|
62f9ed052b
|
issues#655
|
12 years ago |
|
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
12 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮，修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示，取消描述
|
12 years ago |
|
yanxd
|
f44b930037
|
233
|
12 years ago |
 nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
12 years ago |
|
fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
12 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
12 years ago |
|
yanxd
|
19aba25625
|
course revert search project
|
12 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
12 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
12 years ago |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
12 years ago |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
12 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
12 years ago |
|
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构， 不再是一对一的匹配帖子，而是添加了一个中间表
|
12 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
12 years ago |
|
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
12 years ago |
|
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
12 years ago |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
12 years ago |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
12 years ago |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
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 |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
029eb1a195
|
作业回复
|
12 years ago |
|
nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
12 years ago |
|
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
12 years ago |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
12 years ago |
|
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
12 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
12 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
12 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
12 years ago |
|
nwb
|
9c24102e65
|
清理部分不需要的文件
|
12 years ago |
|
nwb
|
b237f578f4
|
提交缺陷发送邮件，问题编号修改
|
12 years ago |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
12 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
12 years ago |
|
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中，可以直接关联到竞赛中
|
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 |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
12 years ago |
|
yanxd
|
19e851d65a
|
路由注册验证ajax，课程边栏的单位
|
12 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
12 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
12 years ago |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
12 years ago |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
12 years ago |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
12 years ago |
|
nwb
|
b94bd99311
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
12 years ago |
 kg
|
57e5cda513
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
kg
|
db2ab5b945
|
modify issue filter and base_footer
|
12 years ago |
|
fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
12 years ago |
|
wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
12 years ago |
|
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
12 years ago |
|
fanqiang
|
dbef2f958a
|
osp_id validate
|
12 years ago |
yan
|
a191b634c5
|
forum memocount error, footer margin
|
12 years ago |
|
fanqiang
|
87c70909be
|
可以在开源社区添加帖子，并且添加了帖子的URL,即帖子来源
|
12 years ago |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
wanglinchun
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性，将integer改为string
|
12 years ago |
|
yanxd
|
653fe6c1ea
|
所有发邮件都新开线程
|
12 years ago |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
12 years ago |
|
wanglinchun
|
3608cecca5
|
增加应用软件包的后缀格式
|
12 years ago |
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
12 years ago |
|
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
12 years ago |
|
yanxd
|
0791c35df1
|
赞踩关联关系
|
12 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
12 years ago |
|
yanxd
|
daf7e8d200
|
user added rater
|
12 years ago |
|
yanxd
|
e802424e2a
|
merge jrating
|
12 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
12 years ago |
 baiyu
|
f0b497e455
|
user score merge
|
12 years ago |
|
baiyu
|
36cd91401f
|
user score
|
12 years ago |
