lizanle
|
7ee58d1d44
|
项目动态重写,并去掉首页缓存
|
11 years ago |
huang
|
d0a675f2b8
|
企业版模块
|
11 years ago |
z9hang
|
db1cd8851c
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
db/schema.rb
|
11 years ago |
sw
|
6645648027
|
学生是否看到问卷结果老师可配置增加数据库
|
11 years ago |
alan
|
6ccb154cc3
|
课程留言,发邮件给课程所有人
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
z9hang
|
b6826a74d3
|
问卷显示
|
11 years ago |
z9hang
|
0f9915fc2a
|
Merge branch 'szzh' into api
Conflicts:
Gemfile
Gemfile.lock
app/controllers/bids_controller.rb
app/controllers/users_controller.rb
db/schema.rb
|
11 years ago |
sw
|
c0fa21eb9f
|
问卷调查表增加描述列
|
11 years ago |
alan
|
9f807438d6
|
教师数目显示:-1 ,同时动态大量不显示。是不是只显示近期3个月的?
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
sw
|
ee9d82bfc7
|
1.实现文件调查的model、control、view的架构
2.修正完善新增表之间的关系
3.修正代码中单复数不正确的问题
|
11 years ago |
sw
|
c9de30bd83
|
增加问卷调查相关表,以及对应的model、control、view的文件夹
|
11 years ago |
alan
|
c1705bd65b
|
增加《导入student_for_course数据》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
486f0b69b1
|
数据迁移student_for_course的数据
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
23140307aa
|
实现<去存储过程功能,并修改打分的表更新>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
ed54248494
|
修改《查找学生信息》bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
6a86e1c386
|
<分组点击两次>bug
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
4f5fe52485
|
基于苏稳添加的字段优化存储过程
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
5874450d14
|
修改《学生列表排序用的存储过程》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
sw
|
05b9b26314
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
alan
|
fb398904b6
|
优化《学生列表》分页查询
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
sw
|
0a58fce251
|
优化数据迁移效率
|
11 years ago |
sw
|
259799eb89
|
1.增加评分的model
2.修改评分表中为教师评分的历史数据的is_teacher_score的值
|
11 years ago |
sw
|
fa36e6d2b0
|
增加判断评分是不是老师评分的列
|
11 years ago |
alan
|
b79b08fa8f
|
编写《作业查询存储过程》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
=
|
bb23468c7d
|
Merge branch 'szzh' into api
Conflicts:
app/controllers/account_controller.rb
app/controllers/courses_controller.rb
db/schema.rb
|
11 years ago |
sw
|
2dab864199
|
#1689修改部分学生匿评得分大于5分
|
11 years ago |
alan
|
3d12d6f0e8
|
Merge branch 'szzh' of http://xianbo_trustie2@repository.trustie.net/xianbo/trustie2.git into course_group
Conflicts:
db/schema.rb
|
11 years ago |
z9hang
|
29d4266c6c
|
引用次数的统计修改及按引用排序
|
11 years ago |
alan
|
63c9804da8
|
添加course_group表单到数据库中,并建立对应于members和courses之间的关联,
对相应页面的修改
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
www
|
53ecf8718f
|
[api]用户认证完成
|
11 years ago |
sw
|
bb1c1a0bb0
|
修改部分学生作业评分居然是6分
|
11 years ago |
z9hang
|
cf808598d2
|
全站搜索不在搜索非本人的私有资源,且他人的公开资源亦不能修改其公开私有属性2、添加迁移文件
|
11 years ago |
sw
|
91cb6e29d5
|
数据库增加是否开启匿评字段
新建作业是增加是否开启匿评功能以及相关页面效果显示
修改相关js判断
|
11 years ago |
sw
|
460ba55dde
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/models/user.rb
app/views/courses/_course_form.html.erb
db/schema.rb
|
11 years ago |
sw
|
54a9044679
|
修改匿评个数可配置、以及增加其相关js验证
|
11 years ago |
alan
|
8cec84dca7
|
添加<公共贴吧 无帖子置顶功能 建议增加>,<管理员可以根据贴吧的热度选择将贴吧置顶>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
gonglexin
|
e8e7708d6e
|
作业匿评功能
|
11 years ago |
alan
|
12cf56d201
|
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
9c4c1679af
|
修改bug<有些课程school_id=0 或为空则课程进不去>
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
sw
|
c045b4682a
|
增加匿评分配作业表,以及和作业、作品、用户表关系键确认
|
11 years ago |
alan
|
bdc38014ac
|
修改bug《测试版:课程列表--点击个别课程返回500错误》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
94a4c0037a
|
修复bug《中国高校--地区列表无“港”、“澳”、“台” 建议增加》
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
alan
|
61815af8bd
|
添加港澳台高校信息
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
sw
|
7e8ab97713
|
作业描述最大长度限制为3000个字符
|
11 years ago |
alan
|
e044f5b615
|
修改contest中出现的逻辑错误
Signed-off-by: alan <547533434@qq.com>
|
11 years ago |
z9hang
|
f957666b25
|
部分网页标题不标准问题,补交之前漏掉未添加的文件
|
11 years ago |
sw
|
4957f6d55a
|
修改作业描述字段的类型,页面代码优化
|
11 years ago |
sw
|
341ee214c1
|
修复部分课程作业进入作业列表报错的BUG
|
11 years ago |
sw
|
b6551f8955
|
#1297修复学生能看到发布通知按钮的BUG
2.增加课程是否对学生开发的数据迁移
3.页面代码整理
解决方案:增加当前登录用户是否在课程有发布通知权限的判断
|
11 years ago |
sw
|
79f3c8efb3
|
删除错误迁移文件
|
11 years ago |
sw
|
d9fe607c5b
|
#1282 修复225号作业显示错误的BUG
解决方案:数据库问题
|
11 years ago |
sw
|
6b4e2ae37b
|
1.修改竞赛作品分类下拉列表选项
2.修改竞赛标题为全部显示
修改思路:更改数据库数据
|
11 years ago |
z9hang
|
62aa1d0ed5
|
提交迁移文件。。
|
11 years ago |
sw
|
445d29d036
|
1.修改新建帖子的长度上限设置,设置为2G
2.修改新建贴吧时贴吧的描述字段类型
|
11 years ago |
z9hang
|
56aa2fb8dc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
sw
|
ef6f239182
|
增加课程资源分离出来相关表数据迁移
|
11 years ago |
sw
|
339a06007c
|
增加课程资源分离出来相关表
|
11 years ago |
sw
|
aa0caff077
|
修改部分项目讨论区描述仍为课程讨论区的描述
|
11 years ago |
sw
|
5564ca063b
|
整理迁移文件,修改迁移文件运行错误
|
11 years ago |
sw
|
a3cbcdad51
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
z9hang
|
03b212e363
|
首页定制,是否显示课程,竞赛
|
11 years ago |
sw
|
01ea6238a4
|
修复竞赛通知描述过长时报错的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
|
758541250f
|
插件数据增加迁移文件,确保数据库数据正确
|
11 years ago |
z9hang
|
138d90a887
|
添加数据迁移文件
|
11 years ago |
z9hang
|
f83336aed0
|
修改首页定制中热门项目排序方式的实现
|
11 years ago |
z9hang
|
4542b9e21a
|
积分修改
|
11 years ago |
z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
11 years ago |
nwb
|
840a7b337b
|
添加课程资源内容类型更新脚本
|
11 years ago |
sw
|
c8aaa2776c
|
1.作品类别增加其他选项,当用户选择其他时,显示一编辑框用于用户输入其作品所属类别
2.添加竞赛支持自定义类别
|
11 years ago |
z9hang
|
376ba1d793
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
11 years ago |
z9hang
|
5c0e3e96cc
|
修复不分页面导航栏缺失问题、修复部分域名错误问题、添加修复FirstPage表数据的迁移文件
|
11 years ago |
sw
|
79c76d26c8
|
创建作品分类表,并插入部分数据
|
11 years ago |
yanxd
|
f5efaac93a
|
lunchun
|
11 years ago |
z9hang
|
d9e04bab0a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
z9hang
|
cc4bf3b328
|
添加超级管理员控制首页热门项目排序问题
|
11 years ago |
sw
|
4825c5287e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
z9hang
|
6a45a0287d
|
添加删除图片功能,修复用户修改资料界面form.quene undefine的js错误(导致加载中不消失的原因)
|
11 years ago |
sw
|
b142953a4b
|
1.创建项目增加功能:是否启动DTS测试,默认为不启用。根据用户选择,决定左侧DTS测试工具选项是否在该项目内显示
|
11 years ago |
z9hang
|
cf339edb6c
|
添加首页定制的非空验证,长度验证
|
11 years ago |
nwb
|
0950ac2329
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
11 years ago |
z9hang
|
3aab1b172c
|
修正执行数据迁移时的‘page_type=’ undefine错误
|
11 years ago |
nwb
|
87b623bc51
|
1.文档添加密级设置
2.新建文档、修改文档视图修改
|
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 |
z9hang
|
9634046d11
|
权限管理机制优化
|
11 years ago |
z9hang
|
b87abf1f68
|
权限管理优化
|
11 years ago |
z9hang
|
5e3a763776
|
添加引用项目权限、修改引用判断
|
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
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
yanxd
|
e1d9d6ab45
|
tag查询崩溃
|
11 years ago |
nwb
|
cf00942261
|
更新迁移文件
|
11 years ago |
nwb
|
993ac23a36
|
课程各数据迁移时不再做验证,以兼容老数据
|
11 years ago |
sw
|
4470f0dd73
|
添加作业时增加教师评分所占比例设置
|
11 years ago |
nwb
|
f8e5c2358a
|
学生角色添加回复讨论区权限
|
11 years ago |
nwb
|
f4aa817f42
|
修改合并后首页出错的问题
|
11 years ago |
nwb
|
7425178419
|
Merge branch 'CourseModify' into szzh
Conflicts:
app/views/layouts/base_courses.html.erb
app/views/layouts/base_homework.html.erb
app/views/projects/_course.html.erb
db/schema.rb
lib/redmine/activity/fetcher.rb
|
11 years ago |
nwb
|
2a9d6eb012
|
迁移原课程资源文件类型数据
|
11 years ago |
nwb
|
80145c5c3b
|
修改课程列表动态数显示不正确的BUG
|
11 years ago |
nwb
|
f80e1f811a
|
修改作业数据迁移
|
11 years ago |
sw
|
8f78177d47
|
增加数据迁移文件
|
11 years ago |
nwb
|
0480405afb
|
1.修改原课程各数据迁移文件BUG
2.迁移课程学生数据
|
11 years ago |
sw
|
97a4aaf8ab
|
homework_attach增加列project_id及相关数据迁移
编辑作业页面增加选择关联项目,以及数据更新项目的实现
|
11 years ago |
z9hang
|
ab486aa811
|
补充user_score_details Model及数据迁移文件
|
11 years ago |
nwb
|
099e8a0912
|
Merge branch 'szzh' into CourseModify
Conflicts:
app/controllers/application_controller.rb
app/views/attachments/upload.js.erb
app/views/courses/_homework_form.html.erb
app/views/layouts/base_courses.html.erb
app/views/users/_my_joinedcourse.html.erb
db/schema.rb
lib/redmine.rb
lib/redmine/access_control.rb
|
11 years ago |
nwb
|
2a4486bf0d
|
修改迁移文件
|
11 years ago |
nwb
|
e698f3a6c6
|
修改新建课程成员时的唯一性判断
|
11 years ago |
nwb
|
59a261d96d
|
1.优化课程通知动态和权限判断
2.优化课程通知讨论区动态和权限判断
|
11 years ago |
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
|
添加申请版主功能,目前已经可以写入数据库
|
12 years ago |
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西,包括数据库的相应表,新建了发布应用的页面,上传图片功能未实现,界面格式还需调整
|
12 years ago |
wanglinchun
|
2a278e0a2d
|
all
|
12 years ago |
fanqiang
|
9af808821d
|
修改框架,添加"没有帮助"和"申请成为版主"功能
|
12 years ago |
fanqiang
|
cfa5532598
|
建立了open source project部分的框架,并且建立了相应的帖子
|
12 years ago |
fanqiang
|
d935152ed7
|
initial crawl
|
12 years ago |
Wen
|
337885503e
|
school表done
建立了school和course的一对多关联
|
12 years ago |
Wen
|
bfec67a446
|
删除了courses表中的school列。
重新设计下表= =
|
12 years ago |
Wen
|
ccca1f7f5f
|
修改大学表,删除列City
|
12 years ago |
Wen
|
ebd09e4b1a
|
大学表创建
|
12 years ago |
Wen
|
ac0a05bcc7
|
- -
|
12 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 |