nwb
|
78612488e5
|
1.修改新建作业及视图
2.修改编辑作业及视图
|
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
|
9c3605320e
|
加入、退出课程逻辑优化
|
11 years ago |
yanxd
|
3fd7104448
|
welcome index obj.includes, routes add school logo
|
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 |
yanxd
|
362570e34b
|
contestnotification_edit function
|
11 years ago |
yanxd
|
0536af6625
|
Merge branch 'szzh' into develop
|
11 years ago |
nwb
|
ae8fcca14f
|
1.课程接触视图修改
2.添加课程成员列表视图
|
11 years ago |
nwb
|
165dbc3f78
|
修改words_controller与课程相关方法及视图
|
11 years ago |
nwb
|
70901832a8
|
1.修改课程讨论区control index、show方法及路由
2.BoardsHelper添加课程相关方法
|
11 years ago |
nwb
|
d6280befca
|
修改新闻model、路由、index方法
|
11 years ago |
sw
|
d0dd6eb781
|
1.修改作业时实现作业添加参与人员与删除参与人员
2.homework_attach、homework_user、users关系添加
3.优化页面显示
|
11 years ago |
sw
|
130f9f87c2
|
1.实现作业添加成员的翻页功能
2.美化作业成员界面显示
|
11 years ago |
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
11 years ago |
yanxd
|
4c7bcd50f5
|
contests delete routes error
|
11 years ago |
yanxd
|
c3865ab319
|
notificationcomments
|
11 years ago |
wanglinchun
|
45e12c4bef
|
xx
|
11 years ago |
nwb
|
c1f9f389b7
|
修改课程讨论区视图,从项目中分离
|
11 years ago |
nwb
|
d22ffa84b4
|
1.课程标签迁移,从项目中分离
2.标签control\view添加对课程类标签的处理
|
11 years ago |
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
11 years ago |
wanglinchun
|
ed84ec633f
|
竞赛通知
|
11 years ago |
wanglinchun
|
ae70081288
|
eter
|
11 years ago |
nwb
|
a49cf3eb6b
|
1.修改课程作业路由
2.课程control添加作业显示方法
|
11 years ago |
nwb
|
0d99644fa7
|
1.用户课程表逻辑修改
2.添加link_to_course相关逻辑
|
11 years ago |
nwb
|
4404222437
|
0604
|
11 years ago |
sw
|
94542e935a
|
增加点击作业名下载改作业下所有附件的功能
|
11 years ago |
sw
|
50171ad0f8
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
wanglinchun
|
9d783a7caa
|
修改竞赛通知等tab-menu的显示状态
|
11 years ago |
wanglinchun
|
6a8d697582
|
Merge branch 'develop' into competition
Conflicts:
config/routes.rb
lib/redmine.rb
|
11 years ago |
wanglinchun
|
a3fb48a4bb
|
0603
|
11 years ago |
sw
|
9bfe9ba1b2
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
11 years ago |
z9hang
|
27be52e58d
|
老师的邮件中增加取消邮件通知链接
修复主页文件上传动态中点击进入附件跳转错误问题
|
11 years ago |
sw
|
1a0de23b38
|
修改作业在进行修改、删除、添加时的代码
|
11 years ago |
wanglinchun
|
81a45fe977
|
dfs
|
11 years ago |
nwb
|
e490f7979d
|
添加课程index界面
|
11 years ago |
wanglinchun
|
bf71a38608
|
竞赛通知相关文件修改
|
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 |
xianbo
|
7d1327ad2a
|
Merge branch 'competition' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
fanqiang
|
9e05ecf5b4
|
修改主页展示部分
|
11 years ago |
wanglinchun
|
43449e66b5
|
增加了竞赛通知按钮
|
11 years ago |
nwb
|
f936c30ec9
|
添加与course.index相关的control、view、help等实现
|
11 years ago |
nwb
|
4e815a38b6
|
更改路由,课程独立出来,不再包含在项目中
|
11 years ago |
nwb
|
61135a352a
|
上传文件表单支持添加文件标签
|
11 years ago |
xianbo
|
0f56d9e885
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
11 years ago |
fanqiang
|
fdf8b5640a
|
添加显示bug的页面
|
11 years ago |
yanxd
|
98444ef01e
|
remove fuzzy routes|add school missing row
|
11 years ago |
z9hang
|
ab85ee5169
|
admin个人主页项目功能修正
admin管理用户的搜索功能从/users/search中分离到/admin/search
admin管理用户界面添加管理界面布局
|
11 years ago |
yanxd
|
4b1d7e049d
|
233
|
11 years ago |
z9hang
|
6583ccb001
|
admin账户个人主页显示修改
admin账户用户管理功能分离到/admin/users,软件创客功能与普通账户一致
|
11 years ago |
sw
|
5d4226ce79
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
11 years ago |