 sw
|
9cb026ed39
|
增加竞赛删除评论的功能
|
2014-08-04 15:01:39 +08:00 |
|
sw
|
31e8ad98ae
|
1.修复竞赛作品每次修改之后，都会吧图片清空的BUG
2.修改删除竞赛作品图片功能
|
2014-07-30 15:48:13 +08:00 |
|
sw
|
3119d9a9aa
|
增加竞赛作品的搜索功能
|
2014-07-29 17:35:22 +08:00 |
 z9hang
|
0b6168c7fd
|
添加竞赛首页发布通知通告相关代码
项目个人得分去除小数点
|
2014-07-23 09:24:26 +08:00 |
 nwb
|
222959d1da
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-21 16:19:54 +08:00 |
|
nwb
|
27fda1f938
|
竞赛首页修改
|
2014-07-21 16:19:45 +08:00 |
 yanxd
|
472b61fefe
|
删除了不能通过的测试，修改user_activities。所有原路由测试可以通过。
|
2014-07-21 15:49:23 +08:00 |
|
z9hang
|
53ff6ea335
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-15 16:16:13 +08:00 |
|
z9hang
|
6a45a0287d
|
添加删除图片功能，修复用户修改资料界面form.quene undefine的js错误（导致加载中不消失的原因）
|
2014-07-15 16:13:50 +08:00 |
|
yanxd
|
37d0560b70
|
test test
|
2014-07-15 10:27:24 +08:00 |
|
z9hang
|
fcdfeae326
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-11 11:45:46 +08:00 |
|
z9hang
|
3dfcc90574
|
课程、竞赛首页定制
超级管理员账户中首页定制界面优化
|
2014-07-11 11:41:54 +08:00 |
|
nwb
|
6688ba61dd
|
1.用户申请加入项目向管理员发送邮件
2.资源文件添加文件密级设置
|
2014-07-11 09:07:09 +08:00 |
|
z9hang
|
b4dd8409eb
|
添加项目托管平台首页定制功能
|
2014-07-10 17:38:04 +08:00 |
|
z9hang
|
470f40db82
|
去除绝对网址
|
2014-07-05 11:00:01 +08:00 |
|
sw
|
3e185c3a4b
|
修改学校链接
|
2014-07-03 18:11:10 +08:00 |
|
sw
|
b42d742c06
|
1.增加我的学校链接
2.修改当我的学校未开设课程时报出的BUG
|
2014-07-03 17:25:51 +08:00 |
|
sw
|
5abee0a06c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
|
2014-07-03 15:41:15 +08:00 |
|
nwb
|
2a6cbe28f0
|
修正课程首页错误
|
2014-07-03 15:24:06 +08:00 |
|
sw
|
3c7e680b1b
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-07-03 10:33:35 +08:00 |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
2014-07-03 10:12:30 +08:00 |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 10:09:25 +08:00 |
|
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
2014-07-02 09:11:45 +08:00 |
|
sw
|
063460f119
|
tt
|
2014-07-01 17:49:12 +08:00 |
|
sw
|
08bfb8e80a
|
修复教师评分后星星显示不正常的BUG
|
2014-06-26 17:49:23 +08:00 |
|
nwb
|
a115edea9d
|
修改课程标签页选中状态
|
2014-06-26 14:47:29 +08:00 |
|
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
|
2014-06-26 08:53:16 +08:00 |
|
z9hang
|
f9612ca63f
|
实时刷新（ajax轮询）
|
2014-06-21 15:34:10 +08:00 |
|
nwb
|
936c40b490
|
提交作业逻辑和视图修改
|
2014-06-17 15:06:31 +08:00 |
|
nwb
|
78612488e5
|
1.修改新建作业及视图
2.修改编辑作业及视图
|
2014-06-17 11:32:41 +08:00 |
|
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
|
2014-06-17 10:12:44 +08:00 |
|
z9hang
|
697a6034b2
|
新得分显示
|
2014-06-16 17:50:28 +08:00 |
|
nwb
|
9c3605320e
|
加入、退出课程逻辑优化
|
2014-06-16 17:14:05 +08:00 |
|
yanxd
|
3fd7104448
|
welcome index obj.includes, routes add school logo
|
2014-06-13 16:37:38 +08:00 |
|
yanxd
|
70abac4c1e
|
Merge branch 'competition' into develop
Conflicts:
app/controllers/application_controller.rb
config/locales/en.yml
config/locales/zh.yml
db/schema.rb
|
2014-06-13 10:59:43 +08:00 |
|
yanxd
|
362570e34b
|
contestnotification_edit function
|
2014-06-13 09:38:51 +08:00 |
|
yanxd
|
0536af6625
|
Merge branch 'szzh' into develop
|
2014-06-12 16:39:35 +08:00 |
|
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
|
70901832a8
|
1.修改课程讨论区control index、show方法及路由
2.BoardsHelper添加课程相关方法
|
2014-06-12 09:44:22 +08:00 |
|
nwb
|
d6280befca
|
修改新闻model、路由、index方法
|
2014-06-11 17:51:14 +08:00 |
|
sw
|
d0dd6eb781
|
1.修改作业时实现作业添加参与人员与删除参与人员
2.homework_attach、homework_user、users关系添加
3.优化页面显示
|
2014-06-11 15:28:13 +08:00 |
|
sw
|
130f9f87c2
|
1.实现作业添加成员的翻页功能
2.美化作业成员界面显示
|
2014-06-10 17:33:31 +08:00 |
|
nwb
|
2f3d9b1795
|
1.修改资源文件类index方法
2.添加课程资源文件index视图
|
2014-06-09 14:23:31 +08:00 |
|
yanxd
|
4c7bcd50f5
|
contests delete routes error
|
2014-06-09 10:51:07 +08:00 |
yanxd
|
c3865ab319
|
notificationcomments
|
2014-06-07 10:45:57 +08:00 |
 wanglinchun
|
45e12c4bef
|
xx
|
2014-06-07 10:02:00 +08:00 |
|
nwb
|
c1f9f389b7
|
修改课程讨论区视图，从项目中分离
|
2014-06-05 15:42:49 +08:00 |
|
nwb
|
d22ffa84b4
|
1.课程标签迁移，从项目中分离
2.标签control\view添加对课程类标签的处理
|
2014-06-05 15:20:09 +08:00 |
|
wanglinchun
|
d06488c10d
|
为竞赛通知添加评论
|
2014-06-05 10:28:36 +08:00 |