nwb
|
e490f7979d
|
添加课程index界面
|
2014-06-03 09:39:33 +08:00 |
wanglinchun
|
528af32f91
|
修改forge,localhost首页不能显示的问题
|
2014-06-03 09:27:07 +08:00 |
sw
|
cc5eb3d0af
|
1. 修复作业无附件时会将作业删除的问题
2.修复作业无附件时不会显示作业的问题
3.去除多余页面显示
|
2014-06-03 09:03:56 +08:00 |
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
2014-05-30 20:32:37 +08:00 |
yanxd
|
d2b90b98cc
|
1, 调整了settting中的成员显示,去掉了冗余的计算逻辑,打开页面速度快多了
2, 管理员身份查看作业列表 ==> true
|
2014-05-30 15:52:34 +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 |
yanxd
|
6c5e7eca49
|
TODO
|
2014-05-30 10:49:49 +08:00 |
nwb
|
e15bad7462
|
course新增列并更改相关逻辑
|
2014-05-30 10:48:06 +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 |
fanqiang
|
150bb1ba1e
|
修改开源社区主页中的漏洞展示部分
|
2014-05-29 20:48:51 +08:00 |
wanglinchun
|
9f29a6c82a
|
将base的格式引入竞赛通知中,使其局部不同,接下来将通知的功能逐步引入
|
2014-05-29 20:15:22 +08:00 |
sw
|
96504d6806
|
1.修改作业提交流程,
2.增加修改作业、删除作业方法
3.修改作业页面显示
|
2014-05-29 20:02:02 +08:00 |
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
2014-05-29 20:02:00 +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 |
sw
|
3546355f70
|
增加修改昵称功能以及昵称是否重复的判断
|
2014-05-28 17:07:23 +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 |
nwb
|
b52690adc2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-28 14:43:32 +08:00 |
nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
2014-05-28 14:43:20 +08:00 |
yanxd
|
5d8edb218f
|
管理员查看user_projects 课程项目混淆的问题
|
2014-05-28 11:47:50 +08:00 |
z9hang
|
cd333c8f35
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-27 20:03:28 +08:00 |
sw
|
27a30d44be
|
1.修改判断当前用户是不是为课程老师的方法
2.增加作业综评功能
3.其他课程的学生是不能互评的,只有本门课程的学生可以互评
4.修改添加评论方法
5.修复当作业无人评论时,作业最终得分只显示一个分字
|
2014-05-27 20:01:21 +08:00 |
xianbo
|
a70593ad76
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-27 17:26:24 +08:00 |
yanxd
|
200c052bb4
|
watchers
|
2014-05-27 17:14:37 +08:00 |
z9hang
|
bf12692de4
|
登录名==》账号/邮箱
老师在课程动态中看到学生真名
|
2014-05-27 17:04:29 +08:00 |
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-27 16:41:31 +08:00 |
nwb
|
68b9a7efc5
|
修正批准成员申请未选择角色时的BUG
|
2014-05-27 14:21:59 +08:00 |
fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
2014-05-27 09:01:36 +08:00 |
wanglinchun
|
4afc41a171
|
修改了编辑参赛作品不能更新托管项目的问题
|
2014-05-26 19:46:49 +08:00 |
wanglinchun
|
a1083fe900
|
修改了原有参赛作品显示报500;
修改了作品删除功能报错
|
2014-05-26 19:19:11 +08:00 |
z9hang
|
ddf5590c54
|
修复个人主页查看关注的项目时报user_id指代不明的sql错误
|
2014-05-26 17:04:55 +08:00 |
wanglinchun
|
8d77c62359
|
sdfd
|
2014-05-26 16:37:06 +08:00 |
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
2014-05-26 16:25:53 +08:00 |
wanglinchun
|
b416d69639
|
vxc
|
2014-05-26 11:01:17 +08:00 |
yanxd
|
12b1553a33
|
Merge branch 'develop' into szzh
|
2014-05-26 09:05:36 +08:00 |
yanxd
|
7a4e5afba0
|
test
|
2014-05-24 12:12:38 +08:00 |
z9hang
|
0e6d9a804a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-24 09:03:38 +08:00 |
z9hang
|
ee3a5f5719
|
代码修改
|
2014-05-23 17:40:59 +08:00 |
t430
|
fd0a504d84
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-05-23 17:12:10 +08:00 |
yanxd
|
5364687160
|
bootstrap & tag bug
|
2014-05-23 17:07:58 +08:00 |
z9hang
|
ad5ac329f2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-23 11:50:48 +08:00 |
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users,软件创客功能与普通账户一致
|
2014-05-23 11:50:36 +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
|
6b5fda1c78
|
read txt attachment
|
2014-05-23 09:18:17 +08:00 |
sw
|
0ec7d6b4e7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 20:01:34 +08:00 |
sw
|
71bbc50542
|
增加作业留言的分页显示
|
2014-05-22 20:01:26 +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 |
nwb
|
eb5138e103
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-22 18:59:18 +08:00 |
nwb
|
9c75b701f4
|
修改BUG
|
2014-05-22 18:59:09 +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 |
nwb
|
4f9625b265
|
修改BUG
|
2014-05-22 13:40:41 +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 |
yanxd
|
3517dbb88b
|
Merge branch 'szzh' into develop
Conflicts:
db/schema.rb
|
2014-05-22 09:58:19 +08:00 |
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-22 09:51:05 +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
|
1d6816419d
|
优化用户申请加入项目界面刷新
|
2014-05-21 19:30:49 +08:00 |
z9hang
|
7d9b2c751b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 18:52:27 +08:00 |
yanxd
|
c5a3a5bac3
|
user_courses.html
|
2014-05-21 18:21:57 +08:00 |
z9hang
|
21e58ce3df
|
课程列表中课程成员数量显示n+(不显示精确数)
只有课程成员能点击教师数量学生数量的链接和查看已提交作业的列表
|
2014-05-21 17:33:02 +08:00 |
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
2014-05-21 16:45:11 +08:00 |
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-21 15:31:05 +08:00 |
nwb
|
5a5db45af2
|
添加文本文件的预览功能
|
2014-05-21 14:44:53 +08:00 |
sw
|
c7b19d8f2e
|
修改作业提交流程
|
2014-05-21 14:10:11 +08:00 |
wanglinchun
|
518de57123
|
将参赛作品编辑更新后的提示语修改为汉语
|
2014-05-21 11:24:11 +08:00 |
wanglinchun
|
947c0f8f64
|
竞赛页面中添加参赛作品成功创建的提示语
|
2014-05-21 11:16:46 +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
|
290d07ffdd
|
修改新建帖子bug(open_source_project)
|
2014-05-21 10:04:06 +08:00 |
xianbo
|
e3fe69c445
|
Merge branch 'test' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/open_source_projects/_show_topics.html.erb
|
2014-05-21 08:25:20 +08:00 |
z9hang
|
45339e53d8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 18:07:25 +08:00 |
fanqiang
|
aed4b250a0
|
修改数据库后修复bug
|
2014-05-20 16:10:05 +08:00 |
wanglinchun
|
77b7da81fd
|
参赛作品页面编辑功能中添加修改托管项目列表完成
|
2014-05-20 15:58:34 +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 |
z9hang
|
5b8b2045f1
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 11:36:12 +08:00 |
z9hang
|
b3489d3e68
|
修改删除文件后跳转错误问题
|
2014-05-20 11:36:01 +08:00 |
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-20 11:33:36 +08:00 |
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
2014-05-20 11:33:17 +08:00 |
sw
|
4de089250f
|
修改删除留言方法为destroy_jour,以及相关路由,访问action的改变
|
2014-05-20 09:59:33 +08:00 |
sw
|
9a62fe22c6
|
修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
|
2014-05-20 08:48:42 +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 |
yanxd
|
a76620a741
|
welcome footer
判断成员列表的查看
|
2014-05-19 16:12:18 +08:00 |
z9hang
|
edf2a84072
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 16:20:59 +08:00 |
z9hang
|
2524600aeb
|
修正贴吧留言删除附件后跳转错误问题
|
2014-05-17 16:20:48 +08:00 |
sw
|
3fee4211a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-17 15:39:28 +08:00 |
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
2014-05-17 15:39:18 +08:00 |
nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-17 14:39:00 +08:00 |
nwb
|
7df6be8ff4
|
调整资源文件界面
|
2014-05-17 14:07:57 +08:00 |
sw
|
8a6fa2166e
|
课程作业显示列表增加该作业平均评分
|
2014-05-17 13:49:27 +08:00 |
sw
|
4c6b514d03
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-17 11:15:40 +08:00 |
sw
|
f79679f05a
|
1.修改作业列表显示效果
2.增加作业互评功能
3.增加作业留言、留言删除功能以及相关操作后页面数据刷新
|
2014-05-17 11:15:27 +08:00 |
yanxd
|
63af60d7b6
|
edit 图标丢失
bid修改文件保存
|
2014-05-17 10:44:01 +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 |
z9hang
|
0385013905
|
修复主页跳转
去除老师删除项目型作业,优化代码
|
2014-05-15 19:16:36 +08:00 |
yanxd
|
be87e02e4c
|
Revert "从主页登陆时跳转到个人主页"
This reverts commit a794d612af .
|
2014-05-15 17:41:53 +08:00 |
yanxd
|
53a9d29292
|
Revert "acount"
This reverts commit 03dbcb1168 .
|
2014-05-15 17:41:45 +08:00 |
nwb
|
b736dc91ed
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 17:36:52 +08:00 |
nwb
|
4f7087f9ae
|
课程修正为只有的教师才能查看学生学号
|
2014-05-15 17:36:39 +08:00 |
z9hang
|
e0592cd6f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-15 17:33:58 +08:00 |
z9hang
|
03dbcb1168
|
acount
|
2014-05-15 17:33:01 +08:00 |
z9hang
|
a794d612af
|
从主页登陆时跳转到个人主页
|
2014-05-15 15:53:28 +08:00 |
yanxd
|
0c302c7aea
|
1s ===> 0.005s
|
2014-05-15 13:53:20 +08:00 |
yanxd
|
13a5aa988a
|
issues#623
|
2014-05-15 11:45:49 +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 |
z9hang
|
6086b25db7
|
贴吧帖子倒序去掉楼层
|
2014-05-15 09:19:59 +08:00 |
z9hang
|
7137f2663c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-14 18:27:06 +08:00 |
nwb
|
b733f5c2b9
|
修正后台注册用户问题
|
2014-05-14 17:11:22 +08:00 |
wanglinchun
|
4ea8611942
|
教师评奖功能初步完成
|
2014-05-14 16:19:12 +08:00 |
z9hang
|
5649cc545e
|
修正项目列表界面搜索空值报错问题
|
2014-05-14 15:22:08 +08:00 |
nwb
|
4136cd27c8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-14 15:08:30 +08:00 |
nwb
|
8badbb1e78
|
1.添加附件资源类型编辑视图与逻辑
2.添加附件资源类型编辑js、control相关逻辑
|
2014-05-14 15:03:04 +08:00 |
ganyiang
|
eda5121195
|
1.新增osp项目所有帖子的显示页面(待改进)
2.修改osp社区主页的[全球热帖]显示数量,默认25条->10条
|
2014-05-14 12:03:50 +08:00 |
z9hang
|
8dab599fd2
|
讨论区回帖顺序改为与留言一致(新回复在前)
|
2014-05-14 11:58:05 +08:00 |
z9hang
|
da37a12158
|
优化代码
|
2014-05-14 09:35:44 +08:00 |
nwb
|
9c24102e65
|
清理部分不需要的文件
|
2014-05-14 08:50:28 +08:00 |
z9hang
|
57a4f45cad
|
修复编辑作业提交返回错误信息时填入正确信息后异常bug
|
2014-05-13 20:29:16 +08:00 |
nwb
|
b237f578f4
|
提交缺陷发送邮件,问题编号修改
|
2014-05-13 17:57:06 +08:00 |
nwb
|
25dba88a08
|
1.优化界面
2.资源下载界面添加按文件类型分类浏览
|
2014-05-13 16:34:53 +08:00 |
nwb
|
0772e04510
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-13 11:56:55 +08:00 |
nwb
|
75f584a6e2
|
1.完成分类资源下载视图显示
2.优化代码,删除冗余代码
|
2014-05-13 11:54:21 +08:00 |
wanglinchun
|
fc2f35f247
|
将关联功能整合到新建参赛作品中,可以直接关联到竞赛中
|
2014-05-13 11:44:29 +08:00 |
sw
|
64900b1fd7
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-13 10:30:37 +08:00 |
sw
|
5d2bb4ccbd
|
1.选择学校进入学校课程列表,点击更多由显示所有课程可能改为显示当前学校课程列表,之后排序也一样
2.当查询学校课程列表为空时,推荐改为本系统中本年度开设的最好的课程,同时加入课程改为关注课程。此时点击更多查看的为所有课程
3.查询出课程列表将学校和教师放在课程上面
|
2014-05-13 10:30:15 +08:00 |
wanglinchun
|
cf18b94326
|
调整了竞赛中的参赛作品列表按得分排序;
增加参赛作品页面和竞赛中参赛作品得分
|
2014-05-13 08:38:48 +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 |
wanglinchun
|
dcc4167e06
|
将竞赛中参赛作品列表的排序方式改为按打分高低
|
2014-05-12 18:31:04 +08:00 |
yanxd
|
f35dd2a30d
|
提交作业字段不合验证,返回页面bug
|
2014-05-12 15:06:34 +08:00 |
yanxd
|
c702867250
|
Merge remote-tracking branch 'origin/develop' into develop
|
2014-05-11 12:11:50 +08:00 |
yanxd
|
e6e001246f
|
# 必填自己的工作单位,其实就是学校
|
2014-05-11 12:11:36 +08:00 |
sw
|
b97c2e230f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-10 15:34:50 +08:00 |
sw
|
74a9aa14d6
|
增加获取学校列表按学校开设课程数排序的方法
增加当当前学校开设课程数目为0时按照上方法推荐其进入其他学校查看课程
|
2014-05-10 15:33:18 +08:00 |
yanxd
|
9976697a58
|
Merge remote-tracking branch 'origin/develop' into szzh
|
2014-05-10 14:27:48 +08:00 |
wanglinchun
|
1e0e5a5ab1
|
Merge branch 'competition' into develop
Conflicts:
config/routes.rb
|
2014-05-10 11:28:37 +08:00 |
wanglinchun
|
19eb071a77
|
dfd
|
2014-05-10 10:37:25 +08:00 |
wanglinchun
|
38c7216097
|
添加了新建参赛作品后弹出新建成功的提示框
|
2014-05-10 10:15:51 +08:00 |
wanglinchun
|
2b44b1b893
|
将竞赛中参赛作品列表按照时间顺序逆序排列(针对参赛应用)
|
2014-05-10 09:27:50 +08:00 |
yanxd
|
19ddb38e1b
|
异步验证注册字段合法
|
2014-05-10 09:22:45 +08:00 |
wanglinchun
|
7d33bb9b2d
|
将原有的新建参赛作品时弹出新页面变为了本页弹出下拉框
|
2014-05-09 22:13:54 +08:00 |
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
2014-05-09 17:13:23 +08:00 |
yanxd
|
4d8701220b
|
-。-
acoount.html对齐了一下
学校列表school/index.html默认显示全部学校
没有填写工作单位的用户强行跳转到修改资料页面
|
2014-05-09 17:08:42 +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 |
wanglinchun
|
538f8516b0
|
目前已经通过判断将属于竞赛的项目或是应用显示到我要参赛的作品列表中
|
2014-05-08 16:49:52 +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 |
wanglinchun
|
f2dbbc48fc
|
发布作品和关联作品都可以用了,参赛应用也可以取出来了,接下来通过判断来去参赛项目和参赛应用
|
2014-05-08 15:06:36 +08:00 |
wanglinchun
|
fb3c513da2
|
给“我要参赛”应用了base——newcontest的整体样式
|
2014-05-08 09:30:52 +08:00 |
wanglinchun
|
fe151f9e29
|
竞赛页面中增加“我要参赛”菜单
|
2014-05-08 08:33:03 +08:00 |
ganyiang
|
786481e144
|
新建问题-主题-autocomplete-选中跳转
|
2014-05-07 20:30:42 +08:00 |
yanxd
|
d257f4e853
|
随便关闭课程禁止//临时
|
2014-05-06 09:16:48 +08:00 |
wanglinchun
|
c6576c71bf
|
增加了每个app打分的总人数
|
2014-05-05 10:01:08 +08:00 |
fanqiang
|
e89d74e2a9
|
开源项目中新增tag,搜索查找待新增tag的obj
|
2014-05-05 09:15:55 +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 |
yanxd
|
2b5cdf161c
|
不能删除帖子问题
|
2014-05-04 18:49:56 +08:00 |
kg
|
776a9d1e35
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-01 09:16:43 +08:00 |
Wen
|
e6288627ad
|
中国高校页面,下拉框修改
|
2014-04-30 20:26:15 +08:00 |
wanglinchun
|
e48edac988
|
增加参赛应用页面的打分细节--初级版
|
2014-04-30 08:07:08 +08:00 |
wanglinchun
|
3da6d5cd37
|
应用页面列表排序(按时间排序已好,另一种排序暂未定)
|
2014-04-29 18:21:07 +08:00 |
wanglinchun
|
dbe4c26322
|
应用列表分页功能
|
2014-04-29 14:40:39 +08:00 |
wanglinchun
|
0403666cea
|
增加应用列表页面的分页功能
|
2014-04-29 14:34:45 +08:00 |
kg
|
0f51480bab
|
amend course search
|
2014-04-29 10:36:09 +08:00 |
Wen
|
50745d5d21
|
course首页布局上的小调整
|
2014-04-29 09:49:51 +08:00 |
Wen
|
10fdcbb050
|
一个简单的后台上传学校logo的页面.
|
2014-04-28 16:13:37 +08:00 |
fanqiang
|
6ba53f534a
|
添加回复帖子功能
|
2014-04-28 11:04:10 +08:00 |
Wen
|
03d58b962a
|
封装了一下取得logo的方法
|
2014-04-28 10:48:09 +08:00 |
kg
|
e9bd8a8f3e
|
revise project index,course,search
|
2014-04-28 09:53:22 +08:00 |
fanqiang
|
87c70909be
|
可以在开源社区添加帖子,并且添加了帖子的URL,即帖子来源
|
2014-04-28 09:13:57 +08:00 |
wanglinchun
|
b542f8072d
|
调整竞赛列表页面中的排序问题
|
2014-04-26 10:58:03 +08:00 |
fanqiang
|
07b75924d8
|
修改tag搜索,使得tag搜索能够搜索开源项目
在帖子展示页面添加时间,并添加标签
|
2014-04-26 10:42:19 +08:00 |
yanxd
|
8f5958abc1
|
mao
|
2014-04-25 16:08:00 +08:00 |
Wen
|
60101b169a
|
= =
|
2014-04-25 10:10:46 +08:00 |
Wen
|
02295e5ca9
|
给严总调试用
|
2014-04-25 09:40:05 +08:00 |
Wen
|
cc738edf2f
|
学校列表添加了搜索功能
|
2014-04-25 09:40:04 +08:00 |
yanxd
|
f4595dfcd2
|
修改部分拍段project、course方式
projectlist 报错
|
2014-04-25 08:29:20 +08:00 |
kg
|
14511c079a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-24 14:38:32 +08:00 |
kg
|
0ff3734aae
|
delete nothing
|
2014-04-24 14:37:19 +08:00 |
kg
|
77ea0092b7
|
add course homepage activity
|
2014-04-24 14:33:15 +08:00 |
yanxd
|
cee205a568
|
issues#377 074e8adf 引入的issue页面权限问题,除了控制器还修改过views判断语句 keyworks: @edit_allowed
issues#379 tag字符串短
issues#380 tag 提交之后 不隐藏输入框
issues#381 搜索框有误
|
2014-04-24 10:16:49 +08:00 |
yanxd
|
2052d36abe
|
issue:socialForge#381
|
2014-04-24 10:16:47 +08:00 |
kg
|
daa19de51d
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-24 09:13:51 +08:00 |
kg
|
709629bcdf
|
add course activity
|
2014-04-24 09:13:06 +08:00 |
Wen
|
6a2626c90e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-23 21:41:02 +08:00 |
Wen
|
cf762e6aa3
|
bug fix~
|
2014-04-23 21:35:03 +08:00 |
Wen
|
473a44d11a
|
学校-课程模式!
|
2014-04-23 21:20:03 +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
|
c272d7a8c7
|
调整应用的修改功能,使其可以更新重新上传的文件,但是会删除上次上传的文件
|
2014-04-23 16:16:17 +08:00 |
Wen
|
59d705b33c
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-23 09:22:34 +08:00 |
Wen
|
7be7fd3d9b
|
学校选择形式改为弹窗
|
2014-04-23 09:22:13 +08:00 |
yanxd
|
60bc3bb1b2
|
seem_rateable to lib, using Engine setting routes
|
2014-04-23 08:51:46 +08:00 |
wanglinchun
|
05c0d2a5ac
|
替换竞赛模块首页中竞赛和应用的图标并调整相应的格式
|
2014-04-22 19:27:31 +08:00 |
Wen
|
3dbe7c5896
|
课程的学校ID自动设置为开课教师的学校ID
去掉课程添加界面上的学校选择
|
2014-04-22 15:25:50 +08:00 |
Wen
|
00e62ec8f7
|
用户评分理论上完成版.
|
2014-04-22 14:53:25 +08:00 |
wanglinchun
|
bc068eb12b
|
添加参赛应用的删除和修改功能以及添加相应的删除和修改权限
|
2014-04-22 10:59:50 +08:00 |
fanqiang
|
91d5959016
|
添加了对管理员申请的接受与拒绝
|
2014-04-22 10:16:50 +08:00 |
fanqiang
|
28b10ed3fd
|
修改了搜索功能,并能对搜索进行过滤
|
2014-04-22 08:21:35 +08:00 |
yanxd
|
e5a5a337b2
|
format code
|
2014-04-21 20:07:43 +08:00 |
yanxd
|
0226052dd0
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-21 20:01:00 +08:00 |
yanxd
|
2b679b1ef9
|
看图不登录
|
2014-04-21 20:00:50 +08:00 |
wanglinchun
|
94a7bacdd2
|
首页:当无应用时,提示暂无应用
|
2014-04-21 19:40:03 +08:00 |
alan
|
87fdecdabd
|
创新竞赛添加删除功能
|
2014-04-21 18:13:57 +08:00 |
yanxd
|
b4209b7cc5
|
jrating
|
2014-04-21 15:41:51 +08:00 |
kg
|
158c950b78
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-18 17:57:58 +08:00 |
kg
|
bdefa322cc
|
modify foot
|
2014-04-18 17:57:11 +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 |
Wen
|
4e567afd0a
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-18 09:15:18 +08:00 |
wanglinchun
|
abef68d13a
|
修改了添加项目时不能自动刷新的问题
|
2014-04-18 09:06:52 +08:00 |
xx
|
f30513217e
|
zip factory
|
2014-04-18 05:18:15 +08:00 |
yanxd
|
5ee1c8e2f2
|
refactory zip
|
2014-04-17 19:21:50 +08:00 |
Wen
|
5699a947ec
|
建立了学校与用户的关联
课程与用户的学校字段均为学校id而不再是学校名称
页面暂时改了想到的地方= =
|
2014-04-17 17:36:41 +08:00 |
alan
|
f6a1e90ad1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-17 14:48:35 +08:00 |
wanglinchun
|
a52e057d94
|
修改添加应用不能刷新的问题
|
2014-04-16 21:44:52 +08:00 |
yanxd
|
cabceb0064
|
test zip down
|
2014-04-16 14:44:26 +08:00 |
yanxd
|
84d3e40c41
|
zip down controller created
|
2014-04-16 11:27:08 +08:00 |
yanxd
|
6f5fcd0dee
|
测试作业下载
|
2014-04-16 10:44:06 +08:00 |
wanglinchun
|
6421f02ac8
|
调整了参赛应用列表布局显示样式
|
2014-04-16 08:46:04 +08:00 |
yanxd
|
28bebb1ee7
|
add Gem
zip
root path firefox bug
|
2014-04-15 21:15:10 +08:00 |
Wen
|
c34f2da385
|
课程注册与用户注册页面的学校选择全部搞定!
|
2014-04-15 17:37:38 +08:00 |
Wen
|
37bb5341e4
|
省份与学校的级联完成!
|
2014-04-15 16:57:19 +08:00 |
yanxd
|
4da8b4e5f6
|
debug
|
2014-04-15 16:06:50 +08:00 |
yanxd
|
3081bff9f4
|
test emtry directory
|
2014-04-15 14:42:00 +08:00 |
yanxd
|
bde4e0f4f7
|
fix courselist
|
2014-04-15 14:33:19 +08:00 |
wanglinchun
|
484d334c3c
|
添加竞赛模块中参赛项目的分页功能
|
2014-04-15 10:34:28 +08:00 |
yanxd
|
31ce41a2d7
|
testcontroller
|
2014-04-14 21:59:32 +08:00 |
yanxd
|
41f315aac0
|
压缩文件
|
2014-04-14 17:37:03 +08:00 |
yanxd
|
8b52d63d14
|
关联文件同时,关联tag
|
2014-04-14 17:37:01 +08:00 |
wanglinchun
|
589a21204c
|
应用下载功能实现
|
2014-04-14 15:54:10 +08:00 |
yanxd
|
4f5eff09c8
|
发帖内容验证不通过不会丢失信息了,加上了所有验证
|
2014-04-14 10:15:18 +08:00 |
alan
|
933fc6cb33
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-12 19:03:24 +08:00 |
alan
|
7781203474
|
附件按tag查询时,只查选定项目中的附件
|
2014-04-12 19:01:48 +08:00 |
yanxd
|
634dd15be3
|
project html
|
2014-04-12 09:40:26 +08:00 |
wanglinchun
|
64895a75ed
|
显示上传截图+应用显示
|
2014-04-11 17:16:22 +08:00 |
yanxd
|
96fcdbacf2
|
课程里搜东西 没有内容项目里也跳出来的问题
|
2014-04-11 16:43:05 +08:00 |
wanglinchun
|
a4df4cf893
|
修改竞赛和参与竞赛的新建应用之间的关联关系
|
2014-04-11 16:40:09 +08:00 |
wanglinchun
|
b97cdd6b0d
|
修改参赛应用中应用和竞赛的关联前,目前部分代码由于数据表及关联没考虑清楚,导致无法关联,下一步修改代码,重新建表,完成关联功能及应用的正常显示
|
2014-04-11 09:00:00 +08:00 |
yanxd
|
d554bf1ea9
|
给下载添加登录过滤器
|
2014-04-10 16:23:40 +08:00 |
wanglinchun
|
be61b9d1ac
|
调整了具体应用页面评价应用的功能
|
2014-04-10 08:33:30 +08:00 |
yanxd
|
1b6cdeac05
|
列表上提交作业,大概好了吧
|
2014-04-09 11:06:13 +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 |
yanxd
|
d83ea7ecd8
|
fake Count count student project, lol.
|
2014-04-04 21:30:40 +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 |
xianbo
|
2a72f7aac8
|
evils fix
|
2014-04-04 15:25:21 +08:00 |
yanxd
|
7e130ee89e
|
去掉login_flag
|
2014-04-04 12:33:12 +08:00 |
wanglinchun
|
c86af5f483
|
与show_application相关的所有内容改为show_softapplication,以防和系统中的application冲突
|
2014-04-04 11:17:50 +08:00 |
wanglinchun
|
2a278e0a2d
|
all
|
2014-04-03 22:38:18 +08:00 |
wanglinchun
|
1e7e0a1bb5
|
修改加入竞赛和退出竞赛不能刷新的问题;新建项目后不能刷新的问题;竞赛列表和竞赛页面搜索问题
|
2014-04-03 22:15:19 +08:00 |
fanqiang
|
9af808821d
|
修改框架,添加"没有帮助"和"申请成为版主"功能
|
2014-04-03 20:47:09 +08:00 |
wanglinchun
|
120e84cfc7
|
新竞赛代码移植
|
2014-04-03 17:26:56 +08:00 |
alan
|
272be122e5
|
按时间查询
|
2014-04-03 16:46:22 +08:00 |
fanqiang
|
e8de48dd24
|
修改osp的show界面,建立框架
|
2014-04-03 14:41:04 +08:00 |
yanxd
|
075b1d2143
|
去除中文在controller里
|
2014-04-03 08:50:24 +08:00 |
Wen
|
e5470db875
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-03 08:49:35 +08:00 |
Wen
|
6986616783
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-02 20:32:50 +08:00 |
yanxd
|
a1a58ee26c
|
加注释
|
2014-04-02 19:58:06 +08:00 |
Wen
|
a4557d4d19
|
已结束课程显示正常
|
2014-04-02 17:34:06 +08:00 |
Wen
|
24d7234fec
|
作业顺序按照截止日期排序
|
2014-04-02 16:04:14 +08:00 |
Wen
|
4448fdfaca
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-04-02 14:44:10 +08:00 |
alan
|
b06d462b53
|
附件按时间排序 龙军
|
2014-04-01 22:21:05 +08:00 |
alan
|
5c2a037a8f
|
user dup
|
2014-04-01 21:04:10 +08:00 |
yanxd
|
66e655a19e
|
nothing
|
2014-04-01 20:05:33 +08:00 |
xianbo
|
b43a899a18
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/layouts/_base_header.html.erb
|
2014-04-01 16:44:06 +08:00 |
xianbo
|
5d77381bb9
|
fix the user.trustie.net
|
2014-04-01 16:40:55 +08:00 |
xianbo
|
06b2c25f3d
|
fix
|
2014-03-31 19:26:07 +08:00 |
yanxd
|
301a21b455
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-31 19:23:53 +08:00 |
yanxd
|
4f5216e632
|
merge
|
2014-03-31 17:11:41 +08:00 |
yanxd
|
84c5032eb2
|
整理下,加个推荐tag
|
2014-03-31 15:36:51 +08:00 |
xianbo
|
5c63ea2378
|
add contest and fix url
|
2014-03-31 10:56:29 +08:00 |
yanxd
|
850ff6194f
|
issue#509,#510
|
2014-03-30 17:03:15 +08:00 |
yanxd
|
8c251da25d
|
Bug:新建作业时菜单栏第一个显示蓝色,应该是第二个显示蓝色
|
2014-03-30 15:46:56 +08:00 |
fanqiang
|
d935152ed7
|
initial crawl
|
2014-03-29 10:57:36 +08:00 |
yanxd
|
35d1c33a29
|
...
|
2014-03-27 10:53:45 +08:00 |
yanxd
|
d64615e604
|
issue created alert
|
2014-03-25 21:24:17 +08:00 |
yanxd
|
575fc48ff0
|
首页搜索分类
|
2014-03-25 16:53:11 +08:00 |
yanxd
|
404568be89
|
留言url显示,以及留言分页的url处理
|
2014-03-22 09:27:29 +08:00 |
Wen
|
ce7af30788
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-03-21 18:03:38 +08:00 |
Wen
|
31b7ab8ae5
|
创建课程处添加了学校
数据库中存储学校的ID
但是学校与省份的级联还没有做好=A=
|
2014-03-21 18:02:55 +08:00 |
yanxd
|
9c54c9c1b6
|
重构项目和课程排序部分,修复分页数量错误
|
2014-03-21 16:50:04 +08:00 |
yanxd
|
6877ff7e8d
|
解决设置跳转404.bug
|
2014-03-20 14:17:48 +08:00 |
yanxd
|
d9bc17c1ea
|
留言权限, basecourse关闭课程重构
|
2014-03-19 17:32:32 +08:00 |
yanxd
|
f9e9404471
|
过滤器过滤加入课程的行为,不再进行n多判断
|
2014-03-19 15:50:02 +08:00 |
yanxd
|
e0c87996bf
|
改了个课程截至日期,并且在courses_controller中设置了过期不允许加入的设定,目测没什么问题,明天再看看
|
2014-03-17 22:43:38 +08:00 |
yanxd
|
2878c57d43
|
新建作业 除了学生
|
2014-03-10 21:37:00 +08:00 |
yanxd
|
46b508be2b
|
首页 论坛发帖权限
|
2014-03-08 11:08:48 +08:00 |
yanxd
|
ce1e6c49f1
|
改留言
|
2014-03-07 16:49:45 +08:00 |
yanxd
|
8963cc3a3c
|
邮件问题一
|
2014-03-07 11:28:52 +08:00 |
yanxd
|
0b385cdbbb
|
毛的资源库关联文件
|
2014-03-06 16:47:28 +08:00 |
yanxd
|
e9373991d2
|
maoxian
|
2014-03-05 11:17:16 +08:00 |
yanxd
|
21e55492fa
|
小改怡情 大改伤身 强改灰飞烟灭
|
2014-03-01 10:14:01 +08:00 |
yanxd
|
bc7471bcb7
|
course real server host.
|
2014-02-24 15:00:03 +08:00 |
yanxd
|
7deeab62bc
|
course.trustie.net
|
2014-02-24 10:40:45 +08:00 |
yanxd
|
cf2689917b
|
三天两头反复改 不如自挂东南枝
|
2014-02-22 09:47:59 +08:00 |
yanxd
|
02a03f7c54
|
导航栏防止意外http参数不全的错误
|
2014-02-17 15:37:04 +08:00 |
yanxd
|
fd426936bb
|
修复时间格式错误引发的列表错误
|
2014-02-15 16:34:09 +08:00 |
yanxd
|
91353d2e5a
|
fix
|
2014-01-25 11:04:32 +08:00 |
wanglinchun
|
b45332bab0
|
课程默认活跃度排序
|
2014-01-24 14:29:24 +08:00 |
yanxd
|
0ed2e19268
|
项目列表
|
2014-01-24 10:55:25 +08:00 |
yanxd
|
d357541bb8
|
yaowan
|
2014-01-20 08:59:17 +08:00 |
wanglinchun
|
ae7949e8cc
|
保持上传头像比例
|
2014-01-20 08:18:57 +08:00 |
yanxd
|
6e15e90253
|
文件下载全部统计次数
|
2014-01-18 10:57:09 +08:00 |
yanxd
|
0d9453080c
|
bug
|
2014-01-18 10:52:05 +08:00 |
wanglinchun
|
c941c640dd
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-17 16:42:36 +08:00 |
wanglinchun
|
42a1a9e0b9
|
重复提交问题
|
2014-01-17 16:42:31 +08:00 |
yanxd
|
63782feeac
|
查询去掉作业,防抄袭
|
2014-01-17 16:13:05 +08:00 |
yanxd
|
8172516aff
|
解决不能搜0的功能
|
2014-01-17 15:37:57 +08:00 |
yanxd
|
189b60a152
|
avatar 400 ===> 200
|
2014-01-17 12:15:12 +08:00 |
yanxd
|
6cd160ec9b
|
头像400*400
|
2014-01-17 11:15:56 +08:00 |
yanxd
|
48172599cc
|
数据库误删除的问题
|
2014-01-17 10:19:18 +08:00 |
yanxd
|
7eb5317696
|
数据库误删除的问题
|
2014-01-17 10:18:20 +08:00 |
yanxd
|
b2bdf0c640
|
sql 转义字符跑错的问题
|
2014-01-17 08:51:27 +08:00 |
yanxd
|
099fffab51
|
Merge branch 'bigchange' into develop
|
2014-01-17 08:23:15 +08:00 |
yanxd
|
0380cdaf21
|
修改隐藏项目里看得到的内容,下载不能
|
2014-01-17 08:20:05 +08:00 |
yanxd
|
951666a1ed
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-01-16 21:15:24 +08:00 |
yanxd
|
9d1940427f
|
悲剧 下面竞赛里没文件, 作业不能让人搜
|
2014-01-16 21:05:04 +08:00 |
wanglinchun
|
5cacdd906d
|
resize img
|
2014-01-16 17:08:44 +08:00 |
yanxd
|
bacddf00d9
|
logo
|
2014-01-16 15:46:09 +08:00 |
baiyu
|
13fdbde1cf
|
个人分数
|
2014-01-16 10:34:39 +08:00 |
yanxd
|
00022ce9fe
|
icon search controller
|
2014-01-16 09:47:50 +08:00 |
nieguanghui
|
8d788fac45
|
modified
|
2014-01-15 20:38:58 +08:00 |
yanxd
|
ee570ea0ac
|
1
|
2014-01-15 20:06:49 +08:00 |
yanxd
|
a5c9d9c31e
|
um...
|
2014-01-15 17:28:53 +08:00 |
yanxd
|
45f8b15083
|
paginate
|
2014-01-15 14:28:36 +08:00 |
yanxd
|
61380a5e1a
|
文件来源
|
2014-01-15 10:40:37 +08:00 |
yanxd
|
2bb44456d6
|
search
|
2014-01-14 20:48:43 +08:00 |
yanxd
|
91a6c13ced
|
search
|
2014-01-14 17:21:27 +08:00 |
yanxd
|
997b90c3b2
|
add label on box
|
2014-01-14 15:41:56 +08:00 |
yanxd
|
d34253bdfc
|
search framework
|
2014-01-14 15:01:11 +08:00 |
yanxd
|
41fefd0b37
|
去除隐藏项目课程内的内容, 下载文件名缩略显示鼠标移上去浮动显示所有 完整文件名
|
2014-01-14 10:24:13 +08:00 |
yanxd
|
308df9eda5
|
z
|
2014-01-13 21:24:01 +08:00 |
yanxd
|
95e77464ad
|
downloads desc
|
2014-01-13 21:02:45 +08:00 |
yanxd
|
fd25c5ed30
|
...
|
2014-01-13 20:26:40 +08:00 |
yanxd
|
5a797ba474
|
s
|
2014-01-13 16:34:24 +08:00 |
yanxd
|
f91d94fd4c
|
fetch stores/index instance_object
|
2014-01-13 16:24:13 +08:00 |
yanxd
|
289b0581df
|
stores css
|
2014-01-11 09:08:15 +08:00 |
yanxd
|
9dd6bdc0ae
|
store framework => route, and refactory debug params in html/footer.
|
2014-01-10 09:19:50 +08:00 |
baiyu
|
db1874fa07
|
评分
|
2014-01-09 10:58:05 +08:00 |
yanxd
|
b9967074dc
|
新闻界面修改,new页面bug修复
|
2014-01-08 20:18:32 +08:00 |
yanxd
|
d114c6abed
|
add remark to words_controller
|
2014-01-03 10:33:06 +08:00 |
yanxd
|
e8a313be6c
|
fixed bug in create leavemessage from bids
|
2014-01-02 20:18:39 +08:00 |
yanxd
|
90a37a5f4e
|
竞赛众包的留言修改
|
2014-01-02 17:29:46 +08:00 |
yanxd
|
a7c6461f03
|
move dstinguish origin message into private method
|
2013-12-31 16:09:50 +08:00 |
yanxd
|
9cd931cb7f
|
ajax
|
2013-12-30 20:53:48 +08:00 |
yanxd
|
ebc803a88a
|
项目留言.
|
2013-12-30 17:13:44 +08:00 |
nieguanghui
|
36289eba41
|
modified projects
|
2013-12-30 16:03:28 +08:00 |
yanxd
|
4c4e725b5c
|
project leave message.
|
2013-12-30 08:47:45 +08:00 |
yanxd
|
1d962b98d3
|
model project leave message
|
2013-12-29 19:35:52 +08:00 |
yanxd
|
8bc5b2ebf5
|
改了论坛回复不会触发修改update字段的问题
|
2013-12-27 15:04:05 +08:00 |
yanxd
|
fea1cdff53
|
首页时间排序,可能会引起其他调用event_datetime的问题。待观察
|
2013-12-27 13:54:57 +08:00 |
nieguanghui
|
e4ae5e56fc
|
delete leave message .
|
2013-12-26 20:22:19 +08:00 |
yanxd
|
8a1316cf8f
|
删除留言操作
|
2013-12-26 19:28:18 +08:00 |
yanxd
|
a01123c5bf
|
d
|
2013-12-26 08:43:16 +08:00 |
yanxd
|
605d7ec565
|
ajax message fix
|
2013-12-26 08:39:43 +08:00 |
yanxd
|
64d85a9ab2
|
一部分ajax留言实现
|
2013-12-25 22:21:16 +08:00 |
yanxd
|
6b3c3516cd
|
去除给留言的回复显示在留言中
|
2013-12-25 16:04:14 +08:00 |
yanxd
|
f05d2131bd
|
组织留言数据方法
|
2013-12-25 15:40:34 +08:00 |
yanxd
|
a53e18dcc5
|
zz
|
2013-12-25 10:09:21 +08:00 |
yanxd
|
ff317e48e9
|
words jourformessage design ing...
|
2013-12-25 09:17:15 +08:00 |
nieguanghui
|
f3ce918699
|
留言修改
|
2013-12-24 16:42:56 +08:00 |
yanxd
|
cda9543849
|
帖子回复数量超过一页,首页动态点击过去无法跳转到相应页面定位,锚点失效
|
2013-12-23 09:28:28 +08:00 |
yanxd
|
99686ec269
|
留言不能是空字符
|
2013-12-21 10:15:41 +08:00 |
yanxd
|
24b14d76e7
|
fix aplication paginate my bug.
|
2013-12-20 21:39:33 +08:00 |
yanxd
|
ca16f01fd7
|
fix global paginate helper in application helper.
|
2013-12-20 11:10:40 +08:00 |
yanxd
|
845937592f
|
4、个人主页的的 动态中要包括留言的信息
|
2013-12-20 11:03:57 +08:00 |
yanxd
|
3f82203735
|
it can be summited project with same name.
|
2013-12-20 09:52:10 +08:00 |
yanxd
|
60be338848
|
作业提交的部分问题
禁止js的情况
修复一些路由错误
ie提交的问题.
|
2013-12-19 15:59:10 +08:00 |
nieguanghui
|
c6f657ed8c
|
重构排序代码
|
2013-12-17 16:59:07 +08:00 |
yanxd
|
4f9686fc57
|
活动不显示留言。
|
2013-12-16 18:38:23 +08:00 |
yanxd
|
5e9bb9a99f
|
删除提示框作业,作业提交的问题。附件提交之后还会存在。
|
2013-12-16 14:39:02 +08:00 |
yanxd
|
f79cc4e597
|
记录帖子查看次数
|
2013-12-15 15:10:29 +08:00 |
yanxd
|
cefddb635a
|
e
|
2013-12-11 22:19:41 +08:00 |
yanxd
|
265e0f246b
|
问题六
|
2013-12-11 10:00:38 +08:00 |
yanxd
|
0bc2b8f2b3
|
项目论坛丢失了的编辑功能
贴吧的置顶锁定功能,目前只针对管理员开放
贴吧列表搜索功能重构
增加1/2帖子显示数目
取出楼主,防止输入帖子id让回复作为主贴显示
首页取新帖子
帖子下载内容随意删除功能
|
2013-12-11 08:52:55 +08:00 |
xianbo
|
0f93065ac4
|
imitate github show help doucument
|
2013-12-10 20:18:21 +08:00 |
yanxd
|
4eeb7c3ea8
|
look at daily log.
|
2013-12-09 18:31:08 +08:00 |
fanqiang
|
85351ee7e3
|
修改留言
|
2013-12-09 08:36:31 +08:00 |
yanxd
|
c86b85cb3d
|
.bug
|
2013-12-07 10:43:31 +08:00 |
yanxd
|
c9c5a18b41
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-12-07 10:16:59 +08:00 |
yanxd
|
c272783f1c
|
工具栏边距调整,讨论区的修改删除功能,项目竞赛边框顶出页面的问题。
|
2013-12-07 10:15:55 +08:00 |
nieguanghui
|
5b10981754
|
解决项目按时间排序bug
|
2013-12-07 10:10:54 +08:00 |
nieguanghui
|
02b5f2bafa
|
解决项目跑到课程里面的bug
|
2013-12-07 09:47:54 +08:00 |
fanqiang
|
e990a17fdb
|
修改留言功能
1.个人主页留言样式丢失问题
2.对用户留言回复,会同时在该用户主页进行留言
|
2013-12-05 15:50:24 +08:00 |
yanxd
|
28978b88b2
|
首页用户动态加入讨论区内容,点击之后定位到帖子。
|
2013-12-04 15:31:18 +08:00 |
yanxd
|
0609c5c7ea
|
1.增加帖子回复时间查询语句
2.帖子回复的数量在数据库中有字段
3.新建帖子失败错误提示
4.下载里程碑top_menu删掉,
5.学生分页,分页方法封装
|
2013-12-02 17:27:15 +08:00 |
yanxd
|
825b1e7fd7
|
点击tag之后的索引功能.
|
2013-11-30 10:46:32 +08:00 |
yanxd
|
ed13e09875
|
fix any bug.
|
2013-11-30 08:06:52 +08:00 |
yanxd
|
9aa7294f5a
|
forum/memo fix
|
2013-11-29 18:14:49 +08:00 |
yanxd
|
c74c7c44d1
|
默认进入第一讨论区..
|
2013-11-28 18:31:09 +08:00 |
yanxd
|
5d77f2031e
|
主页去除影响性能的代码
|
2013-11-28 16:14:23 +08:00 |
xianbo
|
47a7bcaa31
|
add every user_agent infomation to production.log
|
2013-11-28 09:39:48 +08:00 |
yanxd
|
16c218ccae
|
隐藏搜索栏 and something...
|
2013-11-27 14:52:36 +08:00 |
yanxd
|
5d02d0adc1
|
封装memo
|
2013-11-27 10:16:35 +08:00 |
yanxd
|
ae8e81fd46
|
zh.yml
|
2013-11-26 20:14:06 +08:00 |
yanxd
|
f0b6c33217
|
修改一些删除权限问题
|
2013-11-26 16:55:46 +08:00 |
yanxd
|
16c0bc3ac3
|
memo edit/destory.
|
2013-11-26 16:32:08 +08:00 |
yanxd
|
24a12115b0
|
Merge branch 'forum' of 10.0.47.245:/home/trustie2 into forum
|
2013-11-25 15:06:18 +08:00 |
yanxd
|
8218fde509
|
memo controller.
|
2013-11-25 15:05:42 +08:00 |
fanqiang
|
cb494f460a
|
Merge branch 'forum' of 10.0.47.245:/home/trustie2 into forum
|
2013-11-24 20:46:17 +08:00 |
fanqiang
|
4f00b12016
|
添加了论坛加tag功能
|
2013-11-24 20:45:04 +08:00 |
yanxd
|
bc76ed2f4b
|
Merge remote-tracking branch 'origin/forum' into forum
|
2013-11-24 20:09:39 +08:00 |
yanxd
|
54c6ed72c1
|
memos
|
2013-11-24 20:09:24 +08:00 |
fanqiang
|
d77fed5d34
|
不好说啊,赶紧结束吧~~~~~~~~~~~~~
|
2013-11-24 20:02:53 +08:00 |
yanxd
|
c6f4dbbafa
|
10%
|
2013-11-23 21:13:59 +08:00 |
fanqiang
|
6e1913d00d
|
修改新建topic界面
|
2013-11-23 20:56:22 +08:00 |
fanqiang
|
17cb97828d
|
修改forum的show界面
|
2013-11-23 20:31:48 +08:00 |
yanxd
|
69d3ab5bef
|
add memo controller
|
2013-11-23 10:47:28 +08:00 |
fanqiang
|
c50c77a7ca
|
frame
|
2013-11-23 08:20:03 +08:00 |
yanxd
|
48650a2a91
|
init forum. again.
|
2013-11-22 21:55:21 +08:00 |
yanxd
|
c03f17e3b4
|
Revert "小改怡情,大改伤身,强改灰飞烟灭"
This reverts commit 4a4d1159f8 .
|
2013-11-22 20:03:56 +08:00 |
fanqiang
|
4a4d1159f8
|
小改怡情,大改伤身,强改灰飞烟灭
|
2013-11-22 11:19:08 +08:00 |
fanqiang
|
16f70437d1
|
forum init.
|
2013-11-22 10:24:15 +08:00 |
huangjingquan
|
b8db0f59d2
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-21 17:12:00 +08:00 |
xianbo
|
9f1c03ee10
|
fix edit about forum
|
2013-11-21 10:48:11 +08:00 |
fanqiang
|
6a0d362241
|
修改了以附件形式提交作业时,当作业为空时也能提交的BUG
修改了匿名用户提交作业的BUG
|
2013-11-21 09:44:54 +08:00 |
huangjingquan
|
45fad95d48
|
冲突处理
|
2013-11-21 09:41:30 +08:00 |
yanxd
|
0381179536
|
自动添加讨论区当项目课程创建的时候,学生是否能回复需要在全线报表里配置.
|
2013-11-20 17:02:47 +08:00 |
yanxd
|
9491781b45
|
.
|
2013-11-20 15:54:52 +08:00 |
yanxd
|
8ec2d8342b
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-11-20 10:46:59 +08:00 |
yanxd
|
349020182a
|
.
|
2013-11-20 10:44:54 +08:00 |
baiyu
|
1a42cdd013
|
增加了课程与竞赛的人名超链接
|
2013-11-20 08:57:37 +08:00 |
baiyu
|
9293ef53b9
|
修正了竞赛配置的问题
|
2013-11-19 16:05:52 +08:00 |
baiyu
|
6c9c849e7c
|
1、增加了竞赛的配置功能
2、增加了课程的成员学号显示
|
2013-11-19 15:15:54 +08:00 |
yanxd
|
356a48caa8
|
move constant to module, fixed some translate.
|
2013-11-18 08:48:38 +08:00 |
huangjingquan
|
16611d8eff
|
修改了管理员权限
|
2013-11-16 11:09:10 +08:00 |
yanxd
|
2932f5a940
|
第一次db:migrate时创建admin的用户扩展表,防止第一次部署出错;为项目版本库diff增加过滤器。
|
2013-11-16 10:37:47 +08:00 |
huangjingquan
|
bfcb68efab
|
课程添加了讨论区
限制学生下作业
讨论区权限设置
|
2013-11-14 19:29:42 +08:00 |
baiyu
|
2f8ef03d32
|
1、增加了参与竞赛的用户列表
2、区分了个人主页里“粉丝”列表里的项目与课程的计数与显示
3、竞赛发布人的名字改为了全称
|
2013-11-14 17:01:06 +08:00 |
baiyu
|
005e0802d4
|
增加了竞赛的“加入”
|
2013-11-14 15:55:56 +08:00 |
xianbo
|
5366b50c56
|
modify admin show
BY nieguanfei && huangjinquan
|
2013-11-13 20:17:11 +08:00 |
yanxd
|
88b9f943fc
|
fix issue#353
|
2013-11-13 09:56:38 +08:00 |
yanxd
|
0ddd259fea
|
refactor: access controller move to filter.
|
2013-11-12 15:13:48 +08:00 |
yanxd
|
8f59e035b0
|
Merge branch 'hidden_repo' into develop
|
2013-11-12 10:28:41 +08:00 |
yanxd
|
98ccc97b27
|
add hidden repository function
|
2013-11-12 10:27:36 +08:00 |
xianbo
|
02ff8b8955
|
take off course fomre form the projrct ehich is watched
|
2013-11-12 09:04:39 +08:00 |
yanxd
|
5fb29c150b
|
refactory projectController#new
|
2013-11-11 09:27:51 +08:00 |
yanxd
|
a101be344c
|
add any remark
|
2013-11-11 09:06:53 +08:00 |
nieguanghui
|
6352ae7aa6
|
fix bug
|
2013-11-09 09:26:02 +08:00 |
nieguanghui
|
adf8a7bc92
|
修改课程活跃度排序方式,解决课程列表文件链接错误
|
2013-11-09 08:26:23 +08:00 |
xianbo
|
1cfba644f5
|
fix show of someone who watch and fxi the show of homework exdit
|
2013-11-08 17:19:57 +08:00 |
xianbo
|
607eb2c2ff
|
modify shoew of project
|
2013-11-07 17:04:37 +08:00 |
nieguanghui
|
50b91e3942
|
修改按钮样式,增加附件过滤
|
2013-11-07 15:58:15 +08:00 |
yanxd
|
239a1484ae
|
remove useless code block
|
2013-11-07 14:38:37 +08:00 |
fanqiang
|
9996386fe4
|
增加课程留言与项目反馈功能,修改了点击课程作业时tab页显示问题
|
2013-11-07 11:02:32 +08:00 |
huangjingquan
|
17317da314
|
修改了项目和课程里面配置成员bug
|
2013-11-06 09:13:02 +08:00 |
yanxd
|
2d4b9f8c52
|
nothing
|
2013-11-05 21:00:16 +08:00 |
yanxd
|
9526f6d67a
|
remove string unkown
|
2013-11-05 20:57:11 +08:00 |
nieguanghui
|
2b10258ae1
|
修改课程列表显示样式
|
2013-11-05 20:46:38 +08:00 |
yanxd
|
397eb11dca
|
refactor memberlist
|
2013-11-04 22:00:06 +08:00 |
nieguanghui
|
cab092cd04
|
修改课程默认排序方式
|
2013-11-01 11:17:24 +08:00 |
nieguanghui
|
583c022048
|
修复作业列表搜索bug
|
2013-11-01 10:48:02 +08:00 |
huangjingquan
|
5febe8a58d
|
个人主页课程列表加入了“退出课程”和加入课程按钮
|
2013-11-01 09:06:06 +08:00 |
baiyu
|
b2080a4470
|
加入了开课时间,结课时间选项
增加了课时文本框
相应的增加了显示
|
2013-11-01 08:45:24 +08:00 |
nieguanghui
|
db25900336
|
修复新建项目的时候相关信息写入丢失bug
|
2013-10-31 22:07:31 +08:00 |
nieguanghui
|
75c0480071
|
增加个人活动列表,作业过滤功能,删除课程作业搜索框,修复课程页面以学生角色搜索也会出现新建课程的bug
|
2013-10-31 21:44:10 +08:00 |
xianbo
|
67d228142a
|
add the root in bid modify about homework
|
2013-10-31 16:33:15 +08:00 |
huangjingquan
|
477e299e24
|
修改了用户主页课程列表显示
去掉了作业和关注需求,将关注需求统计显示
|
2013-10-31 15:18:42 +08:00 |
yanxd
|
0b04b28024
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-31 10:58:20 +08:00 |
yanxd
|
2286fbeff5
|
members split (teacher,student) in course
|
2013-10-31 10:57:46 +08:00 |
xianbo
|
5dfac1d8e3
|
add modify about homework and modify the show of toll bar
|
2013-10-30 22:17:51 +08:00 |
baiyu
|
9b9745ea0a
|
对于应标需求,提交作业,提交竞赛作品成功后闪出的flash做了区别
|
2013-10-30 21:46:40 +08:00 |
yanxd
|
67216ca463
|
fix back_url bug
|
2013-10-30 20:56:24 +08:00 |
nieguanghui
|
224a194759
|
修复成员 bug,修复作业显示bug‘
|
2013-10-30 10:45:37 +08:00 |
xianbo
|
1f09bfbab1
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-28 20:09:43 +08:00 |
xianbo
|
e9856b3524
|
modify the style of the projects witch show
|
2013-10-28 20:09:15 +08:00 |
nieguanghui
|
1f8c10e48a
|
修复bug
|
2013-10-28 08:51:15 +08:00 |
xianbo
|
a50aff3fb4
|
1.add special reward
2.give a root controller in bid controller && give the administrator the root can change the reward who is deadine.
|
2013-10-24 20:36:57 +08:00 |
xianbo
|
2fa6276829
|
fix natural
|
2013-10-24 10:13:37 +08:00 |
xianbo
|
21ffbe637e
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
Conflicts:
app/views/projects/_project.html.erb
app/views/projects/member.html.erb
app/views/users/index.html.erb
config/locales/zh.yml
db/schema.rb
files/2013/10/131007102834__my_course.html.erb
|
2013-10-24 08:33:07 +08:00 |
xianbo
|
2589d429b0
|
add the project what one watch
|
2013-10-24 08:24:56 +08:00 |
nieguanghui
|
5ce9bcdb2c
|
解决竞赛,需求,作业列表搜索bug
|
2013-10-21 21:16:41 +08:00 |
xianbo
|
5a1bb0f2d4
|
fix bug in arrange to net
|
2013-10-21 11:21:07 +08:00 |
nieguanghui
|
b04fe3d1bb
|
增加项目评分 个人评分 ,个人在项目中的评分机制
|
2013-10-21 09:42:09 +08:00 |
yanxd
|
5d0b5812b3
|
share completed with fq, xianbo
|
2013-10-21 08:57:55 +08:00 |
baiyu
|
ecdeaf123e
|
修改了部分国际化
|
2013-10-19 15:39:53 +08:00 |
baiyu
|
0206d3f2c3
|
需求里面添加了用户和项目与需求的联系
|
2013-10-19 09:35:14 +08:00 |
yanxd
|
ab5d8853b5
|
fixed issue#314
|
2013-10-17 16:14:35 +08:00 |
yanxd
|
081a8e9825
|
fixed issue#319
|
2013-10-17 10:31:41 +08:00 |
yanxd
|
69869a05c9
|
reverse projects list, add explain to role.
|
2013-10-16 10:58:21 +08:00 |
nieguanghui
|
17a4f14f2a
|
修复课程和项目搜索bug
|
2013-10-15 16:29:35 +08:00 |
huangjingquan
|
bcb66f2b32
|
在个人主页项目里面添加新建按钮
|
2013-10-13 15:26:41 +08:00 |
huangjingquan
|
673850bd03
|
fix
|
2013-10-12 17:42:19 +08:00 |
huangjingquan
|
19ebd48a95
|
修改了作业列表无法显示
|
2013-10-12 17:21:50 +08:00 |
huangjingquan
|
00cef03049
|
修改了个人主页里关注需求全部需求改成只关注的需求
|
2013-10-12 16:23:25 +08:00 |
huangjingquan
|
8082bb456f
|
为竞赛添加新的页面
|
2013-10-12 10:45:48 +08:00 |
yanxd
|
a5cdbc8e92
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2013-10-12 10:37:37 +08:00 |
yanxd
|
f1a31c7f6b
|
提升头像图片显示分辨力
|
2013-10-12 10:36:50 +08:00 |
xianbo
|
d3f46adc34
|
fix
|
2013-10-12 10:08:45 +08:00 |
xianbo
|
fd14457446
|
add delete homework in course
|
2013-10-12 10:05:31 +08:00 |
xianbo
|
d7f7ff5fa9
|
delete homework
|
2013-10-12 10:05:30 +08:00 |
huangjingquan
|
c49209cbfb
|
将课程和作业分开
作业单独一个tabs
|
2013-10-11 20:25:24 +08:00 |
baiyu
|
13a2cfe644
|
修改了fork页面,增加了教师超链接
|
2013-10-10 23:02:15 +08:00 |
fanqiang
|
962842d841
|
修改了提交作业数量显示问题,修改了创建需求的种类选择问题
|
2013-10-10 21:56:27 +08:00 |
xianbo
|
956aa3d0c1
|
remove forum block in course setting
|
2013-10-10 21:41:42 +08:00 |
huangjingquan
|
e25425d9a7
|
用户看别人课程主页时显示问题
|
2013-10-10 21:33:52 +08:00 |
nieguanghui
|
8703709bd0
|
解决了课程创建时设置私有依旧显示在课程列表的bug
|
2013-10-10 21:11:42 +08:00 |
huangjingquan
|
a0c6a183fe
|
修改了个人主页的关注需求里面只显示需求不显示作业
|
2013-10-10 16:04:59 +08:00 |
xianbo
|
543279eb84
|
add course filter
|
2013-10-10 15:05:27 +08:00 |
huangjingquan
|
64cddc8687
|
修改了课程设置里面bug
角色改成英文
|
2013-10-10 10:36:56 +08:00 |
xianbo
|
b0d413a216
|
modify the admin select
|
2013-10-10 10:22:32 +08:00 |
xianbo
|
3b6f0e3d34
|
modify delete project and user and define a course is a public
|
2013-10-09 22:26:03 +08:00 |
huangjingquan
|
bf081b95bd
|
学生自己的主页课程里面添加加入课程链接
竞赛里面 修复列表排序bug
新建竞赛的时候 修复了几个bug
|
2013-10-09 17:27:42 +08:00 |
huangjingquan
|
9e77d3e001
|
修改了作业课程里面一些Bug
|
2013-10-09 16:14:11 +08:00 |
huangjingquan
|
2c45fb8760
|
竞赛
|
2013-10-08 22:12:17 +08:00 |
fanqiang
|
8e51ea7327
|
修改了企业注册与修改企业资料过程,以及一些企业主页中的显示细节
|
2013-10-08 16:31:28 +08:00 |
huangjingquan
|
cab5fb8b52
|
新的
|
2013-10-07 22:23:42 +08:00 |
nieguanghui
|
606c998247
|
修改课程列表显示内容,修复作业列表显示bug
|
2013-10-07 18:55:19 +08:00 |
baiyu
|
56e5e55589
|
修改了fork里的格式及若干国际化
修改了给项目留言回复的权限
隐藏了作业列表的“发布作业”
|
2013-10-02 21:47:18 +08:00 |
baiyu
|
64f36f2c9d
|
修改了一些BUG
|
2013-09-30 17:27:58 +08:00 |
baiyu
|
2a9cb28c4e
|
1、修改了国际化
2、增加了课程“年度”“学期”
3、主讲教师显示bug
|
2013-09-30 11:02:04 +08:00 |
huangjingquan
|
43a0a875f4
|
修改课程创建问题
|
2013-09-30 10:38:30 +08:00 |
huangjingquan
|
9c0b68460a
|
修改课程与企业样式
|
2013-09-30 09:42:13 +08:00 |
huangjingquan
|
b6ca2c3d74
|
修改了讨论区bug
|
2013-09-29 20:04:03 +08:00 |
fanqiang
|
838894a19c
|
修改了需求评分功能,以及作业的提交
|
2013-09-29 19:58:57 +08:00 |
huangjingquan
|
b19ed67d79
|
新的课程
修改了一些bug
|
2013-09-29 19:46:59 +08:00 |
fanqiang
|
9fbccfbb6d
|
改了一些问题
创建课程问题
添加了需求的FORK功能
|
2013-09-28 23:08:24 +08:00 |
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
|
2013-09-28 10:36:44 +08:00 |
william
|
2079c87362
|
增加tag删除。
|
2013-09-27 14:58:51 +08:00 |
fanqiang
|
781fa32dbb
|
添加了需求的fork功能
|
2013-09-26 09:06:29 +08:00 |
baiyu
|
436569c88d
|
1、修改了location和identity不能显示的问题
2、修改了学号框样式
|
2013-09-25 17:20:40 +08:00 |
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
|
2013-09-24 09:52:08 +08:00 |
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
|
2013-09-24 09:14:21 +08:00 |
xianbo
|
8ff8d0f4d4
|
modify some little bug && merge handle
|
2013-09-23 21:47:07 +08:00 |
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
|
2013-09-23 20:18:03 +08:00 |
william
|
dcbaf1c02b
|
增加需求结束方法。
|
2013-09-23 20:12:32 +08:00 |
baiyu
|
4fb040bc61
|
modify register bug
|
2013-09-23 16:42:19 +08:00 |
huangjingquan
|
5dbef9e2c5
|
修改了日历和版本库bug
|
2013-09-23 15:12:06 +08:00 |
huangjingquan
|
278cb57ab9
|
修改了项目里面一些bug
|
2013-09-23 13:35:29 +08:00 |
baiyu
|
6ce27271e3
|
修改了身份
增加了职称、学号
|
2013-09-23 09:41:36 +08:00 |
huangjingquan
|
3536883248
|
课程合并
|
2013-09-23 08:44:48 +08:00 |
baiyu
|
1c4f7f99e8
|
一些修订
|
2013-09-22 16:11:39 +08:00 |
baiyu
|
c2302dc0c7
|
增加了附件删除功能
修改用户主页中课程与项目之间的关系
用户课程页面中的作业进行了按课程分组
|
2013-09-18 22:56:01 +08:00 |
baiyu
|
a7b500f5e7
|
修正了“注册”和“我的账号”的显示格式
|
2013-09-16 21:56:12 +08:00 |
nieguanghui
|
45178e178f
|
fix the projects's present bug
|
2013-09-16 21:47:46 +08:00 |
fanqiang
|
9d2ea5639f
|
添加自动生成课程标识功能
|
2013-09-16 08:58:53 +08:00 |
huangjingquan
|
466922d13b
|
修改了上次会议提出的几点
|
2013-09-16 08:49:39 +08:00 |
fanqiang
|
671b81035c
|
修改课程部分的权限设置,并且修改了作业的侧边栏显示
|
2013-09-15 16:49:19 +08:00 |
fanqiang
|
50894d8950
|
将新闻添加进活动
|
2013-09-15 09:33:51 +08:00 |
huangjingquan
|
11370329dd
|
修改了部分功能
|
2013-09-14 17:25:57 +08:00 |
baiyu
|
2768c935be
|
1、增加了“我的状态”
|
2013-09-14 17:22:44 +08:00 |
huangjingquan
|
e4cbc7533e
|
tabs显示
|
2013-09-14 09:51:26 +08:00 |
baiyu
|
313e66537e
|
增加了“地区”
|
2013-09-13 22:47:14 +08:00 |
huangjingquan
|
3a6f055159
|
solve some little problem
|
2013-09-13 22:25:40 +08:00 |
fanqiang
|
805ad6600b
|
添加了提交作业
|
2013-09-13 21:52:24 +08:00 |
huangjingquan
|
767231c202
|
fg
|
2013-09-13 16:36:36 +08:00 |
huangjingquan
|
ffa412d290
|
x
|
2013-09-13 10:11:36 +08:00 |
baiyu
|
3ae85e93ad
|
1、修复了丢失的国际化
2、增加了性别
|
2013-09-12 20:19:49 +08:00 |
huangjingquan
|
7aa5eef2e4
|
fds
|
2013-09-12 17:25:40 +08:00 |
fanqiang
|
602e3dc3fa
|
修改个人主页
|
2013-09-12 17:19:51 +08:00 |
huangjingquan
|
261c3fc337
|
new version
|
2013-09-12 10:41:15 +08:00 |
baiyu
|
a2cc191a4e
|
1、增加“我的账号”里的了工作单位
2、增加了“注册”里的“身份”
|
2013-09-12 08:38:47 +08:00 |
nieguanghui
|
68145ef5f7
|
优化排序显示,修改搜索页面显示
|
2013-09-10 21:02:29 +08:00 |
xianbo
|
1e7d127998
|
new course table
|
2013-09-06 16:39:38 +08:00 |
nieguanghui
|
7490806bf3
|
默认排序方式更改
|
2013-09-06 09:25:02 +08:00 |
nieguanghui
|
d34df19a7a
|
fix watch little bug
|
2013-09-04 17:36:08 +08:00 |
Administrator
|
f0791fe132
|
modify created project info as a fist activity
|
2013-09-02 21:32:15 +08:00 |
huangjingquan
|
a318266c60
|
修改用户列表tabs显示bug
|
2013-09-02 20:37:41 +08:00 |
huangjingquan
|
77a47797d2
|
user列表
|
2013-09-02 15:01:20 +08:00 |
huangjingquan
|
c4df893eab
|
修改了tabs页面,字体大小
|
2013-09-02 12:49:17 +08:00 |
zhangyang
|
4d82cad51d
|
move 2013.8.29
|
2013-08-30 09:34:21 +08:00 |
fanqiang
|
0e2121b956
|
添加项目反馈中的回复功能
|
2013-08-28 21:10:42 +08:00 |
william
|
bb96536a1e
|
1.完全重写了tag搜索页面的显示方式,修复了由于分页引起的bug;
2.给需求添加了赞和踩;
|
2013-08-28 20:36:27 +08:00 |
nieguanghui
|
03415891f5
|
增加需求描述
|
2013-08-28 20:16:40 +08:00 |
kaizheng
|
574362dcf6
|
修改了menu按钮错误
logo图片
|
2013-08-28 16:25:13 +08:00 |
fanqiang
|
b4b4956ab7
|
添加留言删除前身份确认,修改活动列表中问题部分的显示,添加了项目信息
|
2013-08-28 15:29:18 +08:00 |
william
|
7fbe7f4de6
|
修改标签的搜索显示
|
2013-08-28 10:57:06 +08:00 |
nieguanghui
|
fa27d3bf32
|
增加项目和用户的排序功能
|
2013-08-28 09:34:54 +08:00 |
fanqiang
|
d043a1fb9d
|
登录提示bug
|
2013-08-27 22:15:12 +08:00 |
kaizheng
|
0d447cae2c
|
活动显示分类国际化,需求反馈图标引用、删除国际化,留言图标引用、删除国际化
|
2013-08-27 16:17:52 +08:00 |
william
|
0c22d409fc
|
添加写project_status和user_status两表的方法,
在关注中写这2个表,
重构了tag的过滤方法,
拿掉了user_extension.rb.
|
2013-08-27 11:27:25 +08:00 |
fanqiang
|
c7beefa556
|
修改用户活动页面,添加了过滤功能。修改留言中引用和删除功能的显示问题
|
2013-08-27 11:09:34 +08:00 |
huangjingquan
|
92dfea34ad
|
增加项目关注人列表
|
2013-08-27 09:09:34 +08:00 |
zhangyang
|
4f2b26a9c5
|
修正问题bug
|
2013-08-25 21:53:26 +08:00 |
baiyu
|
72b37a915a
|
添加留言提醒
|
2013-08-25 20:19:44 +08:00 |
xianbo
|
89150e8930
|
modify some little bug
|
2013-08-24 16:32:05 +08:00 |
huangjingquan
|
ed261d6207
|
tabs“设置”按钮显示,需求字体颜色
|
2013-08-24 15:41:58 +08:00 |
baiyu
|
3e711de070
|
修改国际化
|
2013-08-22 22:07:31 +08:00 |
baiyu
|
074e8adfdd
|
修改需求页面的一些细节,修改了更新问题的权限,现在更新问题的角色包括超级管理员,管理员,问题创建者,问题指派人员
|
2013-08-22 20:26:56 +08:00 |
Administrator
|
36e0113f73
|
modify
|
2013-08-21 22:14:02 +08:00 |
zhangyang
|
38ed91746f
|
修正了讨论区部分问题;version部分问题
|
2013-08-21 16:43:47 +08:00 |
william
|
2f338b352a
|
给管理员添加了tag删除功能
|
2013-08-21 08:57:15 +08:00 |
baiyu
|
a14460cef9
|
修改新建需求时的校验问题
|
2013-08-20 17:34:33 +08:00 |
baiyu
|
1290a008fc
|
修改新建需求界面
|
2013-08-20 16:32:45 +08:00 |
nieguanghui
|
71d6dc6d21
|
增加用户活动评论数显示
|
2013-08-20 15:12:49 +08:00 |
william
|
7caa5673e7
|
修改js bug。
|
2013-08-19 20:54:58 +08:00 |
william
|
d62ad9e863
|
给tag search结果添加了分页。
|
2013-08-19 17:28:59 +08:00 |
Administrator
|
02239e8cd2
|
modify
|
2013-08-19 17:07:07 +08:00 |
Administrator
|
9dc4fcaa8e
|
add logger info
|
2013-08-19 10:24:02 +08:00 |
Administrator
|
fee81455db
|
修改国际化
|
2013-08-19 08:48:21 +08:00 |
william
|
09b98cbcc6
|
tag search bugs modified。
|
2013-08-19 08:44:01 +08:00 |