 nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
 yanxd
|
19aba25625
|
course revert search project
|
11 years ago |
|
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
11 years ago |
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
 fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
11 years ago |
|
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
11 years ago |
|
nwb
|
4156983494
|
缺陷添加缩略图显示
|
11 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
|
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构， 不再是一对一的匹配帖子，而是添加了一个中间表
|
11 years ago |
 sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
11 years ago |
 wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
11 years ago |
|
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
11 years ago |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
11 years ago |
|
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
11 years ago |
|
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
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 |
|
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
sw
|
029eb1a195
|
作业回复
|
11 years ago |
|
nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
11 years ago |
|
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
11 years ago |
|
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
 z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
11 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
11 years ago |
|
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
11 years ago |
|
nwb
|
6f0e621f3c
|
添加项目成员界面，显示用户的account
|
11 years ago |
|
nwb
|
9c24102e65
|
清理部分不需要的文件
|
11 years ago |
|
nwb
|
b237f578f4
|
提交缺陷发送邮件，问题编号修改
|
11 years ago |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
11 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
11 years ago |
|
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中，可以直接关联到竞赛中
|
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 |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
11 years ago |
yanxd
|
19e851d65a
|
路由注册验证ajax，课程边栏的单位
|
11 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
11 years ago |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
11 years ago |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
11 years ago |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
11 years ago |
|
nwb
|
b94bd99311
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
11 years ago |
 kg
|
57e5cda513
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
|
kg
|
db2ab5b945
|
modify issue filter and base_footer
|
11 years ago |
|
fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
11 years ago |
|
wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
11 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
|
11 years ago |
|
fanqiang
|
dbef2f958a
|
osp_id validate
|
11 years ago |
yan
|
a191b634c5
|
forum memocount error, footer margin
|
11 years ago |
|
fanqiang
|
87c70909be
|
可以在开源社区添加帖子，并且添加了帖子的URL,即帖子来源
|
11 years ago |
|
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性，将integer改为string
|
11 years ago |
|
yanxd
|
653fe6c1ea
|
所有发邮件都新开线程
|
11 years ago |
|
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
11 years ago |
|
wanglinchun
|
3608cecca5
|
增加应用软件包的后缀格式
|
11 years ago |
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
11 years ago |
|
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
11 years ago |
|
yanxd
|
0791c35df1
|
赞踩关联关系
|
11 years ago |
|
fanqiang
|
28b10ed3fd
|
修改了搜索功能，并能对搜索进行过滤
|
11 years ago |
|
yanxd
|
daf7e8d200
|
user added rater
|
11 years ago |
|
yanxd
|
e802424e2a
|
merge jrating
|
11 years ago |
|
yanxd
|
b4209b7cc5
|
jrating
|
11 years ago |
 baiyu
|
f0b497e455
|
user score merge
|
11 years ago |
|
baiyu
|
36cd91401f
|
user score
|
11 years ago |
|
fanqiang
|
a611ed4848
|
修改了按标签搜索，并改了一些样式
|
12 years ago |
|
wanglinchun
|
76ccfe8ac4
|
fix
|
12 years ago |
|
wanglinchun
|
9ac0cbe6a3
|
Merge branch 'competition' into develop
Conflicts:
Gemfile
app/controllers/tags_controller.rb
app/views/layouts/_base_header.html.erb
config/routes.rb
db/schema.rb
|
12 years ago |
|
wanglinchun
|
8f6d9fc6a5
|
0418
|
12 years ago |
|
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
12 years ago |
|
wanglinchun
|
589a21204c
|
应用下载功能实现
|
12 years ago |
|
yanxd
|
4f5eff09c8
|
发帖内容验证不通过不会丢失信息了，加上了所有验证
|
12 years ago |
|
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
12 years ago |
|
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
12 years ago |
|
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
12 years ago |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
12 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
12 years ago |
|
wanglinchun
|
be61b9d1ac
|
调整了具体应用页面评价应用的功能
|
12 years ago |
|
yanxd
|
7a31b3f4ea
|
去掉项目描述长度验证
|
12 years ago |
|
yanxd
|
383d62a353
|
修改错误处理文字显示
|
12 years ago |
|
nieguanghui
|
bad170fdb2
|
应用上传附件功能
|
12 years ago |
|
yanxd
|
045b55236f
|
作业提交临时解决方案
|
12 years ago |
|
fanqiang
|
6fdb037b6b
|
开源项目基本框架完成
|
12 years ago |
|
fanqiang
|
d381423c0e
|
添加了版主功能
|
12 years ago |
|
fanqiang
|
89b668be82
|
添加申请版主功能，目前已经可以写入数据库
|
12 years ago |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
12 years ago |
|
xianbo
|
b1fc33a697
|
add by nyan
|
12 years ago |
|
wanglinchun
|
2a278e0a2d
|
all
|
12 years ago |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
12 years ago |
|
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
12 years ago |
|
fanqiang
|
e8de48dd24
|
修改osp的show界面，建立框架
|
12 years ago |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
xianbo
|
233901577f
|
fix
|
12 years ago |
|
fanqiang
|
cfa5532598
|
建立了open source project部分的框架，并且建立了相应的帖子
|
12 years ago |
|
xianbo
|
06b2c25f3d
|
fix
|
12 years ago |
|
fanqiang
|
d935152ed7
|
initial crawl
|
12 years ago |
|
yanxd
|
c38a8e4f6a
|
socialForge#324
|
12 years ago |
|
yanxd
|
378e8cbefd
|
socailForge#329
|
12 years ago |
|
yanxd
|
a8d1608603
|
nil
|
12 years ago |
