 z9hang
|
697a6034b2
|
新得分显示
|
12 years ago |
 yanxd
|
3fd7104448
|
welcome index obj.includes, routes add school logo
|
12 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
|
12 years ago |
|
yanxd
|
362570e34b
|
contestnotification_edit function
|
12 years ago |
|
yanxd
|
0536af6625
|
Merge branch 'szzh' into develop
|
12 years ago |
 sw
|
d0dd6eb781
|
1.修改作业时实现作业添加参与人员与删除参与人员
2.homework_attach、homework_user、users关系添加
3.优化页面显示
|
12 years ago |
|
sw
|
130f9f87c2
|
1.实现作业添加成员的翻页功能
2.美化作业成员界面显示
|
12 years ago |
|
yanxd
|
4c7bcd50f5
|
contests delete routes error
|
12 years ago |
yanxd
|
c3865ab319
|
notificationcomments
|
12 years ago |
 wanglinchun
|
45e12c4bef
|
xx
|
12 years ago |
|
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
12 years ago |
|
wanglinchun
|
ed84ec633f
|
竞赛通知
|
12 years ago |
|
wanglinchun
|
ae70081288
|
eter
|
12 years ago |
|
sw
|
94542e935a
|
增加点击作业名下载改作业下所有附件的功能
|
12 years ago |
|
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
12 years ago |
|
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
12 years ago |
|
wanglinchun
|
a3fb48a4bb
|
0603
|
12 years ago |
|
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
12 years ago |
|
sw
|
1a0de23b38
|
修改作业在进行修改、删除、添加时的代码
|
12 years ago |
|
wanglinchun
|
81a45fe977
|
dfs
|
12 years ago |
|
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
12 years ago |
|
yanxd
|
b33ee17343
|
Merge remote-tracking branch 'remotes/origin/develop' into szzh
Conflicts:
Gemfile
app/controllers/users_controller.rb
db/schema.rb
|
12 years ago |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
 fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
12 years ago |
|
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
12 years ago |
 nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
12 years ago |
|
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
12 years ago |
|
fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
12 years ago |
|
yanxd
|
98444ef01e
|
remove fuzzy routes|add school missing row
|
12 years ago |
|
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
12 years ago |
|
yanxd
|
4b1d7e049d
|
233
|
12 years ago |
|
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users，软件创客功能与普通账户一致
|
12 years ago |
|
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
nwb
|
dd4ef11b3d
|
添加项目管理员审核已申请用户界面及逻辑
|
12 years ago |
|
sw
|
7748704c3a
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
nwb
|
104ee13ac7
|
1.添加用户申请加入项目contrl、model及相关逻辑
2.项目界面添加申请加入按钮
|
12 years ago |
|
sw
|
8bb8de7d7f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
sw
|
c7b19d8f2e
|
修改作业提交流程
|
12 years ago |
|
yanxd
|
d47facc9e8
|
Merge branch 'szzh' into develop
Conflicts:
app/views/contests/show_attendingcontest.html.erb
db/schema.rb
|
12 years ago |
|
nwb
|
097489e594
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
|
nwb
|
4d21933e09
|
1.优化资源文件上传下载界面
2.教师的课程界面优化
|
12 years ago |
|
sw
|
4de089250f
|
修改删除留言方法为destroy_jour，以及相关路由，访问action的改变
|
12 years ago |
|
sw
|
9a62fe22c6
|
修复作业留言模块先回复留言然后删除回复留言界面不会及时刷新的BUG
|
12 years ago |
|
sw
|
b80c51475f
|
1.增加作业参与人员类homework_users及相关代码
2.homework_attach增加字段：name，description，state
|
12 years ago |
|
sw
|
7ead12dba6
|
1.优化路由代码
2.修改当查询学校课程数数量少于8个时，推荐9-当前学校课程数量门最好的课程给用户，并且排除当前学校课程
|
12 years ago |
|
sw
|
3fee4211a2
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
12 years ago |
|
sw
|
6c9b9841b8
|
课程作业留言增加回复以及回复的评论删除功能
|
12 years ago |
|
nwb
|
5ca9d96acd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
12 years ago |
