 yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
11 years ago |
 nwb
|
3165d97417
|
1.迁移课程新闻数据
2.添加课程新闻index视图
|
11 years ago |
|
nwb
|
b6c9415a4b
|
1.给各角色添加浏览课程资源文件权限
2.修改课程动态显示逻辑
|
11 years ago |
|
nwb
|
a793b8923d
|
1.Non member角色添加add_couese权限
2.course_helper优化排序等相关函数
3.课程index界面修改
|
11 years ago |
|
nwb
|
f741b0581c
|
修改课程资源文件视图BUG
|
11 years ago |
|
yanxd
|
541b22b84d
|
score statistics init
|
11 years ago |
|
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
11 years ago |
|
nwb
|
388d14f075
|
迁移课程原讨论区数据
|
11 years ago |
|
nwb
|
d22ffa84b4
|
1.课程标签迁移，从项目中分离
2.标签control\view添加对课程类标签的处理
|
11 years ago |
|
nwb
|
cd3c69af94
|
课程资源文件迁移，从项目中分离
|
11 years ago |
 sw
|
81a97f6a5e
|
1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业，每个用户只可以进行一次打分，打分后不可修改
|
11 years ago |
|
nwb
|
de201ae8f6
|
添加课程管理员表，并从项目管理员表中迁移原有数据
|
11 years ago |
 wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
11 years ago |
|
nwb
|
69e366d841
|
迁移课程作业数据
|
11 years ago |
|
nwb
|
fb36a0d5ba
|
1.课程control添加create方法
2.课程model添加部分新列及相关逻辑
|
11 years ago |
|
nwb
|
4404222437
|
0604
|
11 years ago |
|
nwb
|
d4bc8139a3
|
修改迁移文件
|
11 years ago |
|
nwb
|
d87b52bedd
|
课程成员迁移
|
11 years ago |
|
nwb
|
cd10dd5433
|
课程权限判断变更，从项目权限分离
|
11 years ago |
|
nwb
|
8460344043
|
课程讨论区逻辑更改
|
11 years ago |
|
nwb
|
e490f7979d
|
添加课程index界面
|
11 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
11 years ago |
|
nwb
|
77006198a1
|
1.导入项目表中已有课程至课程表
2.导入项目状态表至课程状态表
|
11 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
|
nwb
|
e15bad7462
|
course新增列并更改相关逻辑
|
11 years ago |
|
nwb
|
ea3b80fdc6
|
添加CourseStatus表和model
|
11 years ago |
|
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的，只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时，作业最终得分只显示一个分字
|
11 years ago |
|
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500；
修改了作品删除功能报错
|
11 years ago |
|
wanglinchun
|
8d77c62359
|
sdfd
|
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 |
 fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
11 years ago |
|
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
11 years ago |
|
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
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 |
|
fanqiang
|
a07ae9be58
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into 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 |
|
fanqiang
|
4ee9602621
|
..
|
11 years ago |
|
fanqiang
|
74169221a3
|
1234
|
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 |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
11 years ago |
|
yanxd
|
225f25f04c
|
指定utf8，中文编码出错
|
11 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
11 years ago |
|
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
11 years ago |
|
nwb
|
50cc682e02
|
添加数据库脚本文件
|
11 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
11 years ago |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
11 years ago |
Wen
|
d94e15cd94
|
用户打分
|
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 |
|
Wen
|
a8e029da58
|
数据库迁移：更改了默认的学校logo
|
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 |
|
Wen
|
02295e5ca9
|
给严总调试用
|
11 years ago |
|
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性，将integer改为string
|
11 years ago |
yanxd
|
4c3955bca0
|
revert create tmp
This reverts commit 6bfcf094d9.
|
11 years ago |
|
yanxd
|
6bfcf094d9
|
f**k
|
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
|
修改了按标签搜索，并改了一些样式
|
11 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
|
11 years ago |
|
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
11 years ago |
|
Wen
|
c34f2da385
|
课程注册与用户注册页面的学校选择全部搞定！
|
11 years ago |
|
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
11 years ago |
 nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题，修改用户列表显示不一致的问题，修改作业中项目显示分数和项目内部分数不一致的问题
|
11 years ago |
|
nieguanghui
|
b334c02244
|
评分修改迁移文件
|
11 years ago |
|
fanqiang
|
89b668be82
|
添加申请版主功能，目前已经可以写入数据库
|
11 years ago |
|
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西，包括数据库的相应表，新建了发布应用的页面，上传图片功能未实现，界面格式还需调整
|
11 years ago |
|
wanglinchun
|
2a278e0a2d
|
all
|
11 years ago |
|
fanqiang
|
9af808821d
|
修改框架，添加"没有帮助"和"申请成为版主"功能
|
11 years ago |
|
fanqiang
|
cfa5532598
|
建立了open source project部分的框架，并且建立了相应的帖子
|
11 years ago |
|
fanqiang
|
d935152ed7
|
initial crawl
|
11 years ago |
|
Wen
|
337885503e
|
school表done
建立了school和course的一对多关联
|
11 years ago |
|
Wen
|
bfec67a446
|
删除了courses表中的school列。
重新设计下表= =
|
11 years ago |
|
Wen
|
ccca1f7f5f
|
修改大学表，删除列City
|
11 years ago |
|
Wen
|
ebd09e4b1a
|
大学表创建
|
11 years ago |
|
Wen
|
ac0a05bcc7
|
- -
|
11 years ago |
|
nieguanghui
|
f3ce918699
|
留言修改
|
12 years ago |
|
yanxd
|
f79cc4e597
|
记录帖子查看次数
|
12 years ago |
|
fanqiang
|
6e1913d00d
|
修改新建topic界面
|
12 years ago |
|
yanxd
|
48650a2a91
|
init forum. again.
|
12 years ago |
|
fanqiang
|
16f70437d1
|
forum init.
|
12 years ago |
|
yanxd
|
2932f5a940
|
第一次db:migrate时创建admin的用户扩展表，防止第一次部署出错;为项目版本库diff增加过滤器。
|
12 years ago |
|
baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
12 years ago |
|
yanxd
|
98ccc97b27
|
add hidden repository function
|
12 years ago |
|
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式，解决课程列表文件链接错误
|
12 years ago |
|
nieguanghui
|
50b91e3942
|
修改按钮样式，增加附件过滤
|
12 years ago |
|
xianbo
|
271153aa78
|
add db:migrate/20131031071414_add_setup_time_to_courses.rb
|
12 years ago |
|
xianbo
|
2589d429b0
|
add the project what one watch
|
12 years ago |
|
baiyu
|
39c45dff30
|
1、修改了注册里的问题
2、作业名称改为靠左
3、修改了提交作业、参加竞赛等混乱
4、修改了top bar的字体大小
|
12 years ago |
|
baiyu
|
2a9cb28c4e
|
1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
|
12 years ago |
|
fanqiang
|
838894a19c
|
修改了需求评分功能，以及作业的提交
|
12 years ago |
 huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
12 years ago |
 william
|
da82a630e9
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into tmp1
Conflicts:
app/controllers/bids_controller.rb
app/helpers/bids_helper.rb
config/locales/zh.yml
db/schema.rb
|
12 years ago |
|
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
12 years ago |
|
william
|
61e4021625
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/controllers/bids_controller.rb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
config/routes.rb
lib/redmine.rb
|
12 years ago |
baiyu
|
24c99b8f49
|
add db migrate
|
12 years ago |
|
baiyu
|
540f06c769
|
add_student_id_to user
|
12 years ago |
|
william
|
006f381a05
|
新增需求结束方式
|
12 years ago |
|
baiyu
|
4fb040bc61
|
modify register bug
|
12 years ago |
|
huangjingquan
|
3536883248
|
课程合并
|
12 years ago |
 baiyu
|
c2302dc0c7
|
增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
|
12 years ago |
|
nieguanghui
|
45178e178f
|
fix the projects's present bug
|
12 years ago |
|
fanqiang
|
805ad6600b
|
添加了提交作业
|
12 years ago |
|
huangjingquan
|
261c3fc337
|
new version
|
12 years ago |
|
xianbo
|
7dbcc1520c
|
course add data
|
12 years ago |
 zhangyang
|
4d82cad51d
|
move 2013.8.29
|
12 years ago |
|
nieguanghui
|
03415891f5
|
增加需求描述
|
12 years ago |
|
nieguanghui
|
fa27d3bf32
|
增加项目和用户的排序功能
|
12 years ago |
|
baiyu
|
1290a008fc
|
修改新建需求界面
|
12 years ago |
|
william
|
7850a2e6f0
|
修改user_extension
|
12 years ago |
 baiyu
|
51249e26f3
|
修复tag的bug
|
12 years ago |
|
nieguanghui
|
c00575ce84
|
修改新建项目显示，优化列表显示速度
|
12 years ago |
|
fanqiang
|
69e3dcee6c
|
修改用户活动，用户主页的其他部分添加分页
|
12 years ago |
|
fanqiang
|
238b9a416f
|
修改用户主页中与我相关部分的功能，现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈
|
12 years ago |
 kaizheng
|
79b5544bc0
|
将一些中文国际化
|
12 years ago |
|
william
|
0b5ea87f11
|
加入了对赞功能模块，同时预留了踩功能，但暂时不使用。
|
12 years ago |
|
fanqiang
|
bb5052cf30
|
修改了用户活动，可以查看关注好友的活动，并且将需求加入到活动中
修复了一些需求中的BUG
|
12 years ago |
|
kaizheng
|
3d8aa620a5
|
添加分享按钮
|
12 years ago |
|
kaizheng
|
e635237acd
|
添加app\controllers\shares_controller.rb及相关文件用来作为api演示的小例子，Client.html放在根目录下作为演示客户端
|
12 years ago |
|
huangjingquan
|
70b211e355
|
first commit
|
12 years ago |
