 sw
|
c7caa08c70
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
 z9hang
|
cb8b0e0f41
|
admin页面中问题追踪项相关错误（课程、项目分离此处代码未改导致的问题）、项目列表中项目提交次数改为从数据库中读取（运行bundle exec rake project_score:calculate统计项目提交次数）
|
11 years ago |
|
sw
|
eb5d1c9efe
|
修复项目动态首页文明名过长超出页面的BUG
|
11 years ago |
|
sw
|
c6a19209f4
|
修复课程、项目无法上传资源的问题
|
11 years ago |
 chenmin
|
73537a30cb
|
修复资源上传人不能下载项目讨论区非公开资源的问题
|
11 years ago |
|
z9hang
|
a3fb08817c
|
分数不能为0、更新readme
|
11 years ago |
|
z9hang
|
2b6a376d31
|
修复数据库为初始状态时会出现的部分bug、去除部分连接的域名
|
11 years ago |
|
z9hang
|
7b14be7310
|
错误提示页面导航栏丢失问题、新建问题跟踪red_project_scores问题
|
11 years ago |
|
sw
|
445d29d036
|
1.修改新建帖子的长度上限设置，设置为2G
2.修改新建贴吧时贴吧的描述字段类型
|
11 years ago |
|
sw
|
f99543ab4b
|
#1294
1.修改缺陷列表中缺陷描述样式
2.修改缺陷、日历查询时，Closed->关闭于，角色成员减少学生、老师、助教等3个角色
|
11 years ago |
|
sw
|
f2f06a9d28
|
调整管理员用户配置界面，表格样式
|
11 years ago |
|
z9hang
|
caed78327a
|
积分计算修改
|
11 years ago |
|
sw
|
c155ebdfd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |
|
z9hang
|
80b2a2dc45
|
修正公共贴吧新建帖子问题
修正课程列表错误
|
11 years ago |
 linhk
|
54a246b6e6
|
中国高校搜索文本Enter快捷操作
|
11 years ago |
|
sw
|
9e5f7e6fc6
|
取消主页加入课程链接
|
11 years ago |
|
sw
|
b8f27b51c0
|
取消主页加入课程链接
|
11 years ago |
|
sw
|
5564ca063b
|
整理迁移文件，修改迁移文件运行错误
|
11 years ago |
|
sw
|
bb6be3ed8a
|
修改html错误
|
11 years ago |
|
z9hang
|
03b212e363
|
首页定制，是否显示课程，竞赛
|
11 years ago |
|
sw
|
c1bbd8a535
|
对于设置了完成日期的缺陷，到日期还没解决，给相关人员发一个通知邮件
|
11 years ago |
|
sw
|
e344f16f5c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
sw
|
2141fcc3ca
|
将是否启用DTS测试移入项目模块配置
|
11 years ago |
 nwb
|
cb4efd914e
|
修正项目文档删除BUG
|
11 years ago |
|
z9hang
|
8871652e01
|
添加首页定制，设置是否显示"我的课程"功能
|
11 years ago |
|
z9hang
|
a1e06991d5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
97531960da
|
首页定制添加剂修改图片大小功能
|
11 years ago |
|
sw
|
ea322d6177
|
修复项目提交时间字的长度过长时会换行的BUG
|
11 years ago |
|
z9hang
|
3b54def1c7
|
首页定制修改
|
11 years ago |
|
z9hang
|
4542b9e21a
|
积分修改
|
11 years ago |
|
z9hang
|
80b5871756
|
竞赛首页定制中添加编辑通知通告的编辑框并存入数据库
添加新的表记录个人得分相关细节，及各种得分更新方法
|
11 years ago |
|
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
11 years ago |
|
z9hang
|
41ea3a1baf
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
|
z9hang
|
dee09aad75
|
修复导航bug
|
11 years ago |
|
nwb
|
42c2f6c2ee
|
更改项目文档按作者排序
|
11 years ago |
|
z9hang
|
513fd32ec5
|
修复查看个人动态无权限bug
|
11 years ago |
|
sw
|
c8aaa2776c
|
1.作品类别增加其他选项，当用户选择其他时，显示一编辑框用于用户输入其作品所属类别
2.添加竞赛支持自定义类别
|
11 years ago |
|
sw
|
890bc7459d
|
修改项目列表页面当管理人员过多时，显示更多。点击更多按钮，跳转到该项目的成员列表页面
|
11 years ago |
|
z9hang
|
0322258386
|
去掉一个参加竞赛中多出来的项目创建
|
11 years ago |
|
z9hang
|
5c0e3e96cc
|
修复不分页面导航栏缺失问题、修复部分域名错误问题、添加修复FirstPage表数据的迁移文件
|
11 years ago |
|
sw
|
bcaaa02bed
|
取消已完成课程在软件创客列表的显示
|
11 years ago |
|
nwb
|
6dcc50e60b
|
添加gitlab创建项目(版本库)接口
|
11 years ago |
|
nwb
|
297fe9a3f4
|
添加gitlab远程登录接口
|
11 years ago |
|
z9hang
|
6a45a0287d
|
添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因）
|
11 years ago |
|
z9hang
|
cf339edb6c
|
添加首页定制的非空验证，长度验证
|
11 years ago |
|
z9hang
|
e1c7aaa220
|
冲突编辑
|
11 years ago |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
11 years ago |
|
nwb
|
9b3ffc90ba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/controllers/repositories_controller.rb
db/schema.rb
|
11 years ago |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
11 years ago |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
11 years ago |
|
sw
|
65c137e617
|
修复进入课程作业报错的问题
|
11 years ago |
|
sw
|
41823fbddf
|
test
|
11 years ago |
|
z9hang
|
9634046d11
|
权限管理机制优化
|
11 years ago |
|
z9hang
|
5e3a763776
|
添加引用项目权限、修改引用判断
|
11 years ago |
|
nwb
|
2395ee4b1d
|
留言发送邮件优化
|
11 years ago |
|
nwb
|
864ef17941
|
清理课程状态表，修正同一课程出现多次的BUG
|
11 years ago |
|
sw
|
2bdb0e20e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/course.html.erb
|
11 years ago |
|
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
11 years ago |
|
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
11 years ago |
|
nwb
|
e94ed86ead
|
部分BUG修正
|
11 years ago |
|
nwb
|
cf00942261
|
更新迁移文件
|
11 years ago |
|
nwb
|
993ac23a36
|
课程各数据迁移时不再做验证，以兼容老数据
|
11 years ago |
|
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
12 years ago |
|
z9hang
|
9a8c5ebecc
|
个人得分规则显示
留言回复未加分bug修改
|
12 years ago |
|
z9hang
|
2501f31ef1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
12 years ago |
|
z9hang
|
7399e1aca2
|
添加项目个人得分统计功能
|
12 years ago |
|
nwb
|
9ae5f59a29
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
f8e5c2358a
|
学生角色添加回复讨论区权限
|
12 years ago |
|
sw
|
7702b746c6
|
修复作业显示界面，提交作业按钮不显示的问题
|
12 years ago |
|
nwb
|
88c3347f7c
|
修正合并分支后的创建课程错误
|
12 years ago |
|
nwb
|
c5a837c689
|
修改资源文件测试用例
|
12 years ago |
|
nwb
|
ae3457e68b
|
1.添加代码评审(CodeReview)插件
2.添加代码评审插件使用文档
|
12 years ago |
|
nwb
|
91f0b58a7a
|
gem修改
|
12 years ago |
|
nwb
|
f33dc6bff6
|
1.修改测试环境搭建文档
2.添加部分测试用例
|
12 years ago |
|
sw
|
8f78177d47
|
增加数据迁移文件
|
12 years ago |
|
sw
|
efb6c1fd19
|
1.修改、新增作业增加提交项目选项(可以为空)
2.homework_attach与project增加关联关系
|
12 years ago |
|
sw
|
97a4aaf8ab
|
homework_attach增加列project_id及相关数据迁移
编辑作业页面增加选择关联项目，以及数据更新项目的实现
|
12 years ago |
|
z9hang
|
50dbe3d04a
|
添加记录得分变化功能
|
12 years ago |
|
z9hang
|
697a6034b2
|
新得分显示
|
12 years ago |
|
sw
|
d832a5eecf
|
rake db:migrate
|
12 years ago |
 yanxd
|
541b22b84d
|
score statistics init
|
12 years ago |
|
yanxd
|
dfde06248c
|
打分初步
|
12 years ago |
|
sw
|
81a97f6a5e
|
1.老师创建作业增加功能：是否启用互评，以及该功能的修改。对不启用互评的作业，学生不可下载作业，不可互相打分，但可以留言；老师可以进行评分、下载作业等操作。启用互评作业功能和现在一样
2.对启用互评的作业，每个用户只可以进行一次打分，打分后不可修改
|
12 years ago |
|
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
12 years ago |
|
nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
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 |
 fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
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
|
c5dd0317c2
|
修改合并后的bug（open_source_project）
|
12 years ago |
 wanglinchun
|
dd43e2c3fc
|
竞赛页面我要参赛中添加判断，当用户未登录时提示登录后参赛
|
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 |
|
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
12 years ago |
|
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
12 years ago |
|
wanglinchun
|
a8b58016fa
|
df
|
12 years ago |
|
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址；
参赛应用页面添加所属项目网址；
|
12 years ago |
|
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
12 years ago |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
12 years ago |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
12 years ago |
Wen
|
d94e15cd94
|
用户打分
|
12 years ago |
|
Wen
|
a8e029da58
|
数据库迁移：更改了默认的学校logo
|
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 |
|
Wen
|
02295e5ca9
|
给严总调试用
|
12 years ago |
|
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性，将integer改为string
|
12 years ago |
|
Wen
|
3ba524668f
|
用户评分未完成版本= =
上传一下以防丢了
|
12 years ago |
yanxd
|
b4209b7cc5
|
jrating
|
12 years ago |
 alan
|
dd09c36a8f
|
Added the message of creating the project in the project's activities
|
12 years ago |
|
wanglinchun
|
abef68d13a
|
修改了添加项目时不能自动刷新的问题
|
12 years ago |
|
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
12 years ago |
|
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前，目前部分代码由于数据表及关联没考虑清楚，导致无法关联，下一步修改代码，重新建表，完成关联功能及应用的正常显示
|
12 years ago |
|
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication，以防和系统中的application冲突
|
12 years ago |
|
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
xianbo
|
5c63ea2378
|
add contest and fix url
|
12 years ago |
|
Wen
|
337885503e
|
school表done
建立了school和course的一对多关联
|
12 years ago |
|
Wen
|
bfec67a446
|
删除了courses表中的school列。
重新设计下表= =
|
12 years ago |
|
Wen
|
ebd09e4b1a
|
大学表创建
|
12 years ago |
|
Wen
|
5200e238a9
|
= =|
|
12 years ago |
|
yanxd
|
ff317e48e9
|
words jourformessage design ing...
|
12 years ago |
 nieguanghui
|
f3ce918699
|
留言修改
|
12 years ago |
|
yanxd
|
f79cc4e597
|
记录帖子查看次数
|
12 years ago |
|
yanxd
|
c6f4dbbafa
|
10%
|
12 years ago |
|
yanxd
|
48650a2a91
|
init forum. again.
|
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 |
|
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 |
|
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 |
|
william
|
4f72b68442
|
bug 修复。
|
12 years ago |
|
william
|
2079c87362
|
增加tag删除。
|
12 years ago |
|
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
12 years ago |
|
baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
12 years ago |
|
xianbo
|
633104b493
|
modify some bug about course and add db migrate
|
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 |
|
william
|
7d919fd3c3
|
Merge branch 'liuping' into develop
Conflicts:
app/helpers/bids_helper.rb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
config/locales/zh.yml
db/schema.rb
|
12 years ago |
|
xianbo
|
806fae7b19
|
Merge branch 'develop' of 10.0.47.245:/home/zhangyang into develop
Conflicts:
app/controllers/account_controller.rb
app/controllers/my_controller.rb
app/controllers/projects_controller.rb
app/controllers/users_controller.rb
app/helpers/projects_helper.rb
app/helpers/users_helper.rb
app/models/project.rb
app/models/user.rb
app/models/user_extensions.rb
app/views/account/register.html.erb
app/views/bids/_bid_show.html.erb
app/views/bids/_history.html.erb
app/views/bids/_project_list.html.erb
app/views/bids/show.html.erb
app/views/files/index.html.erb
app/views/layouts/base_bids.html.erb
app/views/layouts/base_users.html.erb
app/views/my/account.html.erb
app/views/users/watch_bids.html.erb
config/locales/en.yml
config/locales/zh.yml
config/routes.rb
db/schema.rb
lib/redmine.rb
public/stylesheets/application.css
|
12 years ago |
|
william
|
dcbaf1c02b
|
增加需求结束方法。
|
12 years ago |
baiyu
|
4fb040bc61
|
modify register bug
|
12 years ago |
|
baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
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 |
|
baiyu
|
a2cc191a4e
|
1、增加“我的账号”里的了工作单位
2、增加了“注册”里的“身份”
|
12 years ago |
|
xianbo
|
1e7d127998
|
new course table
|
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 |
|
fanqiang
|
7287e151d0
|
将issue加入活动中，添加读取活动数据的方法
|
12 years ago |
|
fanqiang
|
69e3dcee6c
|
修改用户活动，用户主页的其他部分添加分页
|
12 years ago |
|
fanqiang
|
238b9a416f
|
修改用户主页中与我相关部分的功能，现在可以查找在问题中的引用以及对指派给我的问题中的所有反馈
|
12 years ago |
|
william
|
9cc86f3cd8
|
移除seems_ratabale插件。
|
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 |
