nwb
|
ae8fcca14f
|
1.课程接触视图修改
2.添加课程成员列表视图
|
2014-06-12 14:57:25 +08:00 |
nwb
|
165dbc3f78
|
修改words_controller与课程相关方法及视图
|
2014-06-12 11:34:47 +08:00 |
nwb
|
863dec03d2
|
添加课程讨论区show视图
|
2014-06-12 10:03:01 +08:00 |
nwb
|
97d920c195
|
修改新增课程通知视图
|
2014-06-12 09:20:39 +08:00 |
z9hang
|
a8670ba6fc
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 08:47:40 +08:00 |
nwb
|
d6280befca
|
修改新闻model、路由、index方法
|
2014-06-11 17:51:14 +08:00 |
z9hang
|
e606fd89d2
|
被关注+2分、取消关注-2分
讨论区帖子加顶踩功能
顶踩帖子加减分接口
|
2014-06-11 17:41:47 +08:00 |
nwb
|
3165d97417
|
1.迁移课程新闻数据
2.添加课程新闻index视图
|
2014-06-11 16:46:13 +08:00 |
sw
|
872b7efb84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-11 15:54:40 +08:00 |
nwb
|
59051972e1
|
1.修改课程资源删除
2.修改课程资源上传后的界面刷新
|
2014-06-11 15:52:47 +08:00 |
sw
|
d0dd6eb781
|
1.修改作业时实现作业添加参与人员与删除参与人员
2.homework_attach、homework_user、users关系添加
3.优化页面显示
|
2014-06-11 15:28:13 +08:00 |
nwb
|
cb2c5960fc
|
修改资源文件activity事件BUG
|
2014-06-11 11:13:59 +08:00 |
nwb
|
b6c9415a4b
|
1.给各角色添加浏览课程资源文件权限
2.修改课程动态显示逻辑
|
2014-06-11 11:04:38 +08:00 |
z9hang
|
7eb3c9f874
|
缺陷留言+1分、
更改缺陷状态+1分、
对留言回复+1分、
对帖子的回复+1分、
添加分数修正方法,分数为负时修正为0
|
2014-06-10 17:47:10 +08:00 |
nwb
|
a793b8923d
|
1.Non member角色添加add_couese权限
2.course_helper优化排序等相关函数
3.课程index界面修改
|
2014-06-10 17:03:02 +08:00 |
nwb
|
f741b0581c
|
修改课程资源文件视图BUG
|
2014-06-10 15:44:37 +08:00 |
nwb
|
a20feafa4e
|
1.添加课程动态model
2.优化课程动态逻辑及权限处理
|
2014-06-10 11:49:28 +08:00 |
yanxd
|
541b22b84d
|
score statistics init
|
2014-06-10 10:42:41 +08:00 |
z9hang
|
cae0893ea6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-09 17:38:01 +08:00 |
z9hang
|
ee030e6fb5
|
讨论区发帖协同得分+2
|
2014-06-09 17:37:48 +08:00 |
nwb
|
8768193e72
|
添加课程资源文件全部列表视图
|
2014-06-09 17:33:43 +08:00 |
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
2014-06-09 14:23:31 +08:00 |
yanxd
|
5bc20cf6af
|
push code, add score.
|
2014-06-09 13:52:21 +08:00 |
yanxd
|
6bd71ce9f1
|
人物分数统计,行为得分,项目相关。提交代码pending
user_scores表结构有问题,重新构建表结构
bundle exec rake db:migrate:down VERSION=20140410021724
bundle exec rake db:migrate:up VERSION=20140410021724
|
2014-06-09 10:40:59 +08:00 |
nwb
|
54505340eb
|
1.修正新建课程错误
2.优化课程角色权限判断
|
2014-06-09 10:26:45 +08:00 |
yanxd
|
c3865ab319
|
notificationcomments
|
2014-06-07 10:45:57 +08:00 |
wanglinchun
|
45e12c4bef
|
xx
|
2014-06-07 10:02:00 +08:00 |
wanglinchun
|
7f5fa8b9b8
|
dfd
|
2014-06-06 21:40:58 +08:00 |
yanxd
|
61d0532f14
|
user
|
2014-06-06 17:41:16 +08:00 |
yanxd
|
dfde06248c
|
打分初步
|
2014-06-06 17:33:42 +08:00 |
yanxd
|
db61ecc255
|
合并user_score属性
|
2014-06-06 16:17:27 +08:00 |
nwb
|
59742b9ddb
|
1.给各角色添加项目相关的权限
2.添加课程权限解析系统
|
2014-06-06 13:56:48 +08:00 |
yanxd
|
174c5556a0
|
减少sql查询, logger ===> Rails.logger
|
2014-06-06 09:26:09 +08:00 |
yanxd
|
7b98d01d8a
|
Merge branch 'develop' into szzh
|
2014-06-06 08:51:52 +08:00 |
nwb
|
388d14f075
|
迁移课程原讨论区数据
|
2014-06-06 08:50:46 +08:00 |
z9hang
|
c5fc1a8709
|
作业留言问题修复
|
2014-06-06 08:42:04 +08:00 |
yanxd
|
1c7923e5bd
|
sql
|
2014-06-05 16:53:41 +08:00 |
nwb
|
ebe771db88
|
创建课程修改
|
2014-06-05 16:41:05 +08:00 |
wanglinchun
|
00b1a40345
|
修改了竞赛通知及评论相关文件代码
|
2014-06-05 15:45:17 +08:00 |
nwb
|
d22ffa84b4
|
1.课程标签迁移,从项目中分离
2.标签control\view添加对课程类标签的处理
|
2014-06-05 15:20:09 +08:00 |
nwb
|
cd3c69af94
|
课程资源文件迁移,从项目中分离
|
2014-06-05 14:07:44 +08:00 |
wanglinchun
|
f17c01010f
|
werew
|
2014-06-05 11:58:59 +08:00 |
nwb
|
6ff26d06ab
|
修改课程基础页面逻辑(base_courses.html.erb)
|
2014-06-05 11:55:46 +08:00 |
wanglinchun
|
982bf17ebc
|
dfd
|
2014-06-05 11:19:59 +08:00 |
wanglinchun
|
8b78929190
|
修改竞赛通知中评论的相关文件
|
2014-06-05 11:02:32 +08:00 |
nwb
|
de201ae8f6
|
添加课程管理员表,并从项目管理员表中迁移原有数据
|
2014-06-05 11:01:46 +08:00 |
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
2014-06-05 10:28:36 +08:00 |
yanxd
|
2e11d76652
|
lin
|
2014-06-04 21:26:57 +08:00 |
wanglinchun
|
ae70081288
|
eter
|
2014-06-04 20:29:15 +08:00 |
nwb
|
a49cf3eb6b
|
1.修改课程作业路由
2.课程control添加作业显示方法
|
2014-06-04 17:06:28 +08:00 |
nwb
|
69e366d841
|
迁移课程作业数据
|
2014-06-04 16:58:26 +08:00 |
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
2014-06-04 16:45:20 +08:00 |
nwb
|
fb36a0d5ba
|
1.课程control添加create方法
2.课程model添加部分新列及相关逻辑
|
2014-06-04 15:47:09 +08:00 |
yanxd
|
8fb82bbdc4
|
register Mod
|
2014-06-04 14:20:26 +08:00 |
nwb
|
4404222437
|
0604
|
2014-06-04 14:13:26 +08:00 |
nwb
|
c43bf84e42
|
课程所包含的子功能模块(enabled_modules)相关逻辑修改
|
2014-06-04 11:32:32 +08:00 |
yanxd
|
51bfb6cae8
|
user model save bug
|
2014-06-04 10:08:54 +08:00 |
nwb
|
d87b52bedd
|
课程成员迁移
|
2014-06-04 09:19:01 +08:00 |
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
2014-06-03 18:30:53 +08:00 |
wanglinchun
|
a3fb48a4bb
|
0603
|
2014-06-03 18:24:55 +08:00 |
yanxd
|
510b1c4233
|
merge gem
|
2014-06-03 16:45:35 +08:00 |
yanxd
|
37232cd5b2
|
把所有user_extensions的逻辑移到了user中,业务代码还没有修改,下一步是user_score和projectxxx,先测测效果
|
2014-06-03 16:41:12 +08:00 |
nwb
|
cd10dd5433
|
课程权限判断变更,从项目权限分离
|
2014-06-03 16:21:00 +08:00 |
wanglinchun
|
81a45fe977
|
dfs
|
2014-06-03 15:27:04 +08:00 |
nwb
|
7d3d406c00
|
新增部分课程所需的解析函数
|
2014-06-03 11:16:06 +08:00 |
wanglinchun
|
528af32f91
|
修改forge,localhost首页不能显示的问题
|
2014-06-03 09:27:07 +08:00 |
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
2014-05-30 20:32:37 +08:00 |
z9hang
|
4747375499
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-30 13:41:04 +08:00 |
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
2014-05-30 10:57:13 +08:00 |
z9hang
|
45d17db8b6
|
实现给教师发课程留言邮件时根据教师设置判断是否发送邮件
|
2014-05-30 09:49:53 +08:00 |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-30 08:28:07 +08:00 |
fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
2014-05-29 21:42:56 +08:00 |
z9hang
|
866ae3a38d
|
发送邮件部分代码优化
|
2014-05-29 18:04:21 +08:00 |
nwb
|
ea3b80fdc6
|
添加CourseStatus表和model
|
2014-05-29 16:47:32 +08:00 |
nwb
|
f936c30ec9
|
添加与course.index相关的control、view、help等实现
|
2014-05-29 16:35:34 +08:00 |
z9hang
|
2e36949604
|
添加课程列表查看权限(需用管理员账户将Non member的查看课程列表权限勾选并保存方能查看)
|
2014-05-28 18:04:16 +08:00 |
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
|
2014-05-28 15:40:57 +08:00 |
sw
|
218fb3f831
|
Merge remote-tracking branch 'origin/szzh' into szzh
Conflicts:
config/locales/zh.yml
|
2014-05-28 15:24:37 +08:00 |
z9hang
|
daecf1a53b
|
老师收到课程留言区的直接留言及对老师的回复的邮件提醒
|
2014-05-28 14:17:43 +08:00 |
z9hang
|
31804b3d45
|
发邮件
|
2014-05-28 11:10:31 +08:00 |
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的,只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时,作业最终得分只显示一个分字
|
2014-05-27 20:01:21 +08:00 |
fanqiang
|
4c3e2376f0
|
修改帖子页面
|
2014-05-27 16:25:43 +08:00 |
yanxd
|
a9b88b8e66
|
issues#show words typo
|
2014-05-27 08:51:03 +08:00 |
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500;
修改了作品删除功能报错
|
2014-05-26 19:19:11 +08:00 |
t430
|
edfd7372bb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 11:42:41 +08:00 |
yanxd
|
3ae7729539
|
Merge branch 'szzh' into develop
|
2014-05-23 11:00:46 +08:00 |
yanxd
|
213939b474
|
realname
|
2014-05-23 10:59:52 +08:00 |
xianbo
|
e52886cf46
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/softapplications/show.html.erb
db/schema.rb
|
2014-05-23 09:49:36 +08:00 |
xianbo
|
cda9942723
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-23 09:44:33 +08:00 |
yanxd
|
598429695f
|
Merge branch 'develop' into szzh
|
2014-05-22 19:59:50 +08:00 |
yanxd
|
62f9ed052b
|
issues#655
|
2014-05-22 19:58:13 +08:00 |
fanqiang
|
d3ead651fe
|
动态显示安全问题
|
2014-05-22 17:04:45 +08:00 |
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 16:38:04 +08:00 |
sw
|
65c3bb5eb1
|
1.作业列表评分结果显示保留2位有效数字
2.互评界面显示最终评分数值
3.增加互评按钮,修改查看学号、按学号排序等功能的条件
4.修改互评界面作业下载信息显示,取消描述
|
2014-05-22 16:37:39 +08:00 |
yanxd
|
f44b930037
|
233
|
2014-05-22 15:33:38 +08:00 |
nwb
|
f51873d98b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-22 11:58:55 +08:00 |
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
2014-05-22 11:58:43 +08:00 |
fanqiang
|
daa531268a
|
添加安全漏洞的关联表
帖子添加一个来源信息
|
2014-05-22 11:05:15 +08:00 |
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
2014-05-22 09:58:19 +08:00 |
nwb
|
80e84069a1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 19:31:05 +08:00 |
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
2014-05-21 16:45:11 +08:00 |
yanxd
|
19aba25625
|
course revert search project
|
2014-05-21 15:31:10 +08:00 |
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
2014-05-21 14:44:53 +08:00 |
xianbo
|
4b063a2c69
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-21 11:09:22 +08:00 |
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
2014-05-20 16:10:05 +08:00 |
yanxd
|
c4bd9aaabd
|
Merge branch 'szzh' into develop
|
2014-05-20 15:56:51 +08:00 |
nwb
|
4156983494
|
缺陷添加缩略图显示
|
2014-05-20 15:05:54 +08:00 |
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
2014-05-20 14:33:50 +08:00 |
fanqiang
|
87a6dd4938
|
修改开源项目社区中 每个项目的结构, 不再是一对一的匹配帖子,而是添加了一个中间表
|
2014-05-20 10:06:59 +08:00 |
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段:name,description,state
|
2014-05-19 17:44:36 +08:00 |
wanglinchun
|
9fb9d2dbdf
|
初步增加了新建参赛作品中参赛作品所属的托管项目列表
|
2014-05-19 17:39:51 +08:00 |
fanqiang
|
543a199c5f
|
添加一张连接表relative_memo_to_open_source_projects
|
2014-05-19 15:40:53 +08:00 |
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
2014-05-17 15:39:18 +08:00 |
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
2014-05-17 13:49:27 +08:00 |
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
2014-05-17 11:15:27 +08:00 |
t430
|
00b866f06a
|
Merge branch 'develop'
|
2014-05-16 17:28:30 +08:00 |
wanglinchun
|
31ec9bc353
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-05-16 17:06:38 +08:00 |
sw
|
b27b3e0a5a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-16 11:04:49 +08:00 |
sw
|
029eb1a195
|
作业回复
|
2014-05-16 11:04:08 +08:00 |
nwb
|
f218b87338
|
修正项目动态中缺陷编号错误的问题
|
2014-05-15 16:59:15 +08:00 |
nwb
|
f1b086ef90
|
资源类型添加对ppt文档的支持
|
2014-05-15 14:32:23 +08:00 |
yanxd
|
2e0e8e6a8e
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-15 11:26:45 +08:00 |
z9hang
|
c48b850cf7
|
添加删除项目型作业功能
|
2014-05-15 10:50:46 +08:00 |
xianbo
|
66a5db5ad3
|
Merge branch 'szzh' into develop
Conflicts:
config/routes.rb
db/schema.rb
|
2014-05-15 09:46:38 +08:00 |
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
2014-05-14 16:19:12 +08:00 |
nwb
|
6f0e621f3c
|
添加项目成员界面,显示用户的account
|
2014-05-14 16:06:29 +08:00 |
nwb
|
9c24102e65
|
清理部分不需要的文件
|
2014-05-14 08:50:28 +08:00 |
nwb
|
b237f578f4
|
提交缺陷发送邮件,问题编号修改
|
2014-05-13 17:57:06 +08:00 |
wanglinchun
|
bbd293272d
|
添加参赛作品所属项目的网址;
参赛应用页面添加所属项目网址;
|
2014-05-13 16:49:23 +08:00 |
nwb
|
284e6ba20a
|
1.添加部分默认数据
2.修改项目资源视图
|
2014-05-13 15:49:14 +08:00 |
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中,可以直接关联到竞赛中
|
2014-05-13 11:44:29 +08:00 |
nwb
|
431b6603f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-12 18:46:53 +08:00 |
nwb
|
e5bbd68c8c
|
1.添加资源分类浏览视图
2.处理分类选择变化事件
3.资源处理优化
|
2014-05-12 18:46:39 +08:00 |
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
2014-05-12 16:01:13 +08:00 |
yanxd
|
19e851d65a
|
路由注册验证ajax,课程边栏的单位
|
2014-05-12 08:10:08 +08:00 |
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-10 14:27:48 +08:00 |
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
2014-05-09 17:13:23 +08:00 |
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能,添加新参数
3.修改文件上传界面
|
2014-05-09 15:45:21 +08:00 |
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
2014-05-08 18:15:58 +08:00 |
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
2014-05-08 18:03:48 +08:00 |
nwb
|
b94bd99311
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-08 18:00:58 +08:00 |
yanxd
|
cc2f359e8c
|
1. Three expressions syntax
2. 留言显示重复
3. 发送邮件内容
4. show_contest.html typo
5. welcome.css typo
|
2014-05-08 15:27:16 +08:00 |
kg
|
57e5cda513
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-08 14:26:27 +08:00 |
kg
|
db2ab5b945
|
modify issue filter and base_footer
|
2014-05-08 14:18:42 +08:00 |
fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
2014-05-05 15:33:24 +08:00 |
wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
2014-05-05 10:05:10 +08:00 |
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
|
2014-05-05 09:11:59 +08:00 |
fanqiang
|
dbef2f958a
|
osp_id validate
|
2014-05-05 08:10:22 +08:00 |
yan
|
a191b634c5
|
forum memocount error, footer margin
|
2014-04-28 20:37:12 +08:00 |
fanqiang
|
87c70909be
|
可以在开源社区添加帖子,并且添加了帖子的URL,即帖子来源
|
2014-04-28 09:13:57 +08:00 |
wanglinchun
|
189b935d5b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
db/schema.rb
|
2014-04-25 11:22:33 +08:00 |
wanglinchun
|
1ca0113204
|
Merge branch 'competition' into develop
Conflicts:
db/schema.rb
|
2014-04-25 10:26:50 +08:00 |
wanglinchun
|
6afef880dc
|
修改contest表中budget字段的属性,将integer改为string
|
2014-04-24 19:45:10 +08:00 |
yanxd
|
653fe6c1ea
|
所有发邮件都新开线程
|
2014-04-24 18:25:57 +08:00 |
wanglinchun
|
9af6c03547
|
Merge branch 'competition' into develop
Conflicts:
Gemfile.lock
app/views/layouts/_base_footer.html.erb
|
2014-04-23 17:18:53 +08:00 |
wanglinchun
|
3608cecca5
|
增加应用软件包的后缀格式
|
2014-04-23 16:30:23 +08:00 |
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
2014-04-22 14:53:25 +08:00 |
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
2014-04-22 10:59:50 +08:00 |
yanxd
|
0791c35df1
|
赞踩关联关系
|
2014-04-22 08:56:49 +08:00 |
fanqiang
|
28b10ed3fd
|
修改了搜索功能,并能对搜索进行过滤
|
2014-04-22 08:21:35 +08:00 |
yanxd
|
daf7e8d200
|
user added rater
|
2014-04-21 16:03:55 +08:00 |
yanxd
|
e802424e2a
|
merge jrating
|
2014-04-21 15:43:00 +08:00 |
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +08:00 |
baiyu
|
f0b497e455
|
user score merge
|
2014-04-21 11:15:41 +08:00 |
baiyu
|
36cd91401f
|
user score
|
2014-04-21 11:13:45 +08:00 |
fanqiang
|
a611ed4848
|
修改了按标签搜索,并改了一些样式
|
2014-04-19 11:03:54 +08:00 |
wanglinchun
|
76ccfe8ac4
|
fix
|
2014-04-18 16:35:48 +08:00 |
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
|
2014-04-18 16:03:52 +08:00 |
wanglinchun
|
8f6d9fc6a5
|
0418
|
2014-04-18 10:46:29 +08:00 |
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
2014-04-17 17:36:41 +08:00 |
wanglinchun
|
589a21204c
|
应用下载功能实现
|
2014-04-14 15:54:10 +08:00 |
yanxd
|
4f5eff09c8
|
发帖内容验证不通过不会丢失信息了,加上了所有验证
|
2014-04-14 10:15:18 +08:00 |
wanglinchun
|
98b6493b91
|
给应用添加开发人员字段及显示
|
2014-04-14 09:50:36 +08:00 |
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
2014-04-11 17:16:22 +08:00 |
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
2014-04-11 16:40:09 +08:00 |
nieguanghui
|
6baa87a8ea
|
修复项目列表分数显示不一致的问题,修改用户列表显示不一致的问题,修改作业中项目显示分数和项目内部分数不一致的问题
|
2014-04-11 10:53:51 +08:00 |
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前,目前部分代码由于数据表及关联没考虑清楚,导致无法关联,下一步修改代码,重新建表,完成关联功能及应用的正常显示
|
2014-04-11 09:00:00 +08:00 |
wanglinchun
|
be61b9d1ac
|
调整了具体应用页面评价应用的功能
|
2014-04-10 08:33:30 +08:00 |
yanxd
|
7a31b3f4ea
|
去掉项目描述长度验证
|
2014-04-09 16:31:27 +08:00 |
yanxd
|
383d62a353
|
修改错误处理文字显示
|
2014-04-09 11:15:34 +08:00 |
nieguanghui
|
bad170fdb2
|
应用上传附件功能
|
2014-04-09 09:25:24 +08:00 |
yanxd
|
045b55236f
|
作业提交临时解决方案
|
2014-04-08 14:53:11 +08:00 |
fanqiang
|
6fdb037b6b
|
开源项目基本框架完成
|
2014-04-08 09:02:12 +08:00 |
fanqiang
|
d381423c0e
|
添加了版主功能
|
2014-04-06 22:12:16 +08:00 |
fanqiang
|
89b668be82
|
添加申请版主功能,目前已经可以写入数据库
|
2014-04-06 16:34:23 +08:00 |
wanglinchun
|
a9e9171441
|
通过脚手架新建了一套应用的东西,包括数据库的相应表,新建了发布应用的页面,上传图片功能未实现,界面格式还需调整
|
2014-04-04 17:54:20 +08:00 |
xianbo
|
b1fc33a697
|
add by nyan
|
2014-04-04 16:59:50 +08:00 |
wanglinchun
|
2a278e0a2d
|
all
|
2014-04-03 22:38:18 +08:00 |
fanqiang
|
9af808821d
|
修改框架,添加"没有帮助"和"申请成为版主"功能
|
2014-04-03 20:47:09 +08:00 |
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
fanqiang
|
e8de48dd24
|
修改osp的show界面,建立框架
|
2014-04-03 14:41:04 +08:00 |
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-02 14:44:10 +08:00 |
xianbo
|
233901577f
|
fix
|
2014-04-01 19:55:35 +08:00 |
fanqiang
|
cfa5532598
|
建立了open source project部分的框架,并且建立了相应的帖子
|
2014-04-01 08:51:43 +08:00 |
xianbo
|
06b2c25f3d
|
fix
|
2014-03-31 19:26:07 +08:00 |
fanqiang
|
d935152ed7
|
initial crawl
|
2014-03-29 10:57:36 +08:00 |
yanxd
|
c38a8e4f6a
|
socialForge#324
|
2014-03-28 18:12:48 +08:00 |
yanxd
|
378e8cbefd
|
socailForge#329
|
2014-03-28 18:12:44 +08:00 |
yanxd
|
a8d1608603
|
nil
|
2014-03-25 14:40:47 +08:00 |
yanxd
|
ce4f49b635
|
counter cache for issue
|
2014-03-25 09:27:43 +08:00 |