 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 |
|
nwb
|
cdaa27b52b
|
文件上传去掉tag显示
|
2014-06-17 09:22:10 +08:00 |
|
nwb
|
99e5644c4e
|
去掉上传文件的标签编辑
|
2014-06-16 17:45:14 +08:00 |
|
nwb
|
9c3605320e
|
加入、退出课程逻辑优化
|
2014-06-16 17:14:05 +08:00 |
|
nwb
|
b4e78d2b0c
|
课程添加成员逻辑更改
|
2014-06-16 15:00:35 +08:00 |
|
nwb
|
2a4486bf0d
|
修改迁移文件
|
2014-06-16 14:42:48 +08:00 |
|
nwb
|
e698f3a6c6
|
修改新建课程成员时的唯一性判断
|
2014-06-16 11:34:56 +08:00 |
|
nwb
|
59a261d96d
|
1.优化课程通知动态和权限判断
2.优化课程通知讨论区动态和权限判断
|
2014-06-16 10:38:38 +08:00 |
|
nwb
|
755e758596
|
优化课程资源文件动态和权限判断
|
2014-06-16 09:48:55 +08:00 |
 yanxd
|
47e6c3eedd
|
home cache
|
2014-06-16 09:19:21 +08:00 |
|
yanxd
|
63cd19c15c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-16 09:18:48 +08:00 |
 z9hang
|
b727d023b6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-13 16:58:49 +08:00 |
|
yanxd
|
955fece267
|
merge develop
|
2014-06-13 16:52:12 +08:00 |
|
yanxd
|
b356145d71
|
course logo
|
2014-06-13 16:46:57 +08:00 |
|
yanxd
|
3fd7104448
|
welcome index obj.includes, routes add school logo
|
2014-06-13 16:37:38 +08:00 |
|
nwb
|
b2756650cf
|
修正课程留言动态引起的首页错误
|
2014-06-13 16:18:03 +08:00 |
|
yanxd
|
07e4d40d44
|
cache obj
|
2014-06-13 16:13:32 +08:00 |
|
z9hang
|
eae3918074
|
添加用户得数统计功能
帖子内的踩顶横排
|
2014-06-13 16:09:43 +08:00 |
|
yanxd
|
93d13c8867
|
system bin, 坑
|
2014-06-13 15:42:59 +08:00 |
|
yanxd
|
7456e37e8a
|
home
|
2014-06-13 12:04:15 +08:00 |
|
yanxd
|
eff2da732b
|
home
|
2014-06-13 12:02:29 +08:00 |
|
nwb
|
8a274981ce
|
修改课程动态
|
2014-06-13 11:49:28 +08:00 |
|
yanxd
|
ceef85719e
|
contest fix
|
2014-06-13 11:49:11 +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 |
|
nwb
|
054cfbcafc
|
修改课程搜索功能
|
2014-06-13 08:39:17 +08:00 |
|
z9hang
|
621346268f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-13 08:37:11 +08:00 |
|
yanxd
|
b58c5685ac
|
Merge branch 'szzh' into develop
|
2014-06-13 08:36:24 +08:00 |
|
yanxd
|
f8bfa83ae4
|
move cache
|
2014-06-13 08:35:37 +08:00 |
|
z9hang
|
e8d561b4ba
|
修正贴吧顶踩加分无效问题
|
2014-06-12 17:39:44 +08:00 |
 wanglinchun
|
8618b73a8c
|
本次安卓校园竞赛获奖结果更新，首页正常显示
|
2014-06-12 16:58:01 +08:00 |
|
nwb
|
b178be984d
|
添加课程搜索处理
|
2014-06-12 16:55:56 +08:00 |
|
z9hang
|
f7fc4d06a2
|
添加贴吧帖子顶踩功能
|
2014-06-12 16:46:54 +08:00 |
 sw
|
b7458abd9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 16:43:34 +08:00 |
|
sw
|
277aa81a60
|
修复占位列表界面显示的作业描述样式不正确的问题
|
2014-06-12 16:43:02 +08:00 |
|
z9hang
|
4fb96bacdc
|
修正更新用户等级方法，保证每个用户只有一条记录
|
2014-06-12 16:41:48 +08:00 |
|
yanxd
|
0536af6625
|
Merge branch 'szzh' into develop
|
2014-06-12 16:39:35 +08:00 |
|
z9hang
|
a42c79cea2
|
添加用户升级功能（用户达到一定条件时自动升级，未在前端体现）
|
2014-06-12 16:35:59 +08:00 |
|
nwb
|
c8900c279c
|
课程标签增加、删除
|
2014-06-12 16:22:35 +08:00 |
|
yanxd
|
858a7936b5
|
revert userscore catch exception, added cache to footer.
|
2014-06-12 16:19:46 +08:00 |
|
nwb
|
3933817570
|
1.修改课程配置界面
2.新增课程成员修改
3.删除课程成员修改
4.课程成员类型更改支持
|
2014-06-12 16:01:38 +08:00 |
|
sw
|
8075645591
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:48:58 +08:00 |
|
yanxd
|
cccb19e733
|
cnzz
|
2014-06-12 15:46:16 +08:00 |
|
sw
|
9bd8132359
|
修复作业无法留言、无法综评的BUG
|
2014-06-12 15:42:58 +08:00 |
|
wanglinchun
|
52e7be1b1d
|
修改首页中评奖结果的显示字体
|
2014-06-12 15:37:45 +08:00 |
|
sw
|
f4961cbc50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:27:17 +08:00 |
|
sw
|
a100193373
|
1.作业参与人员可以对作业进行修改，但不能进行删除
2.作业成员(发布人员和参与人员)不能对作业进行评分
3.修改进行作业删除、添加、修改、添加成员等方法的权限判断
|
2014-06-12 15:25:59 +08:00 |
|
yanxd
|
efdbf3e808
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-06-12 15:20:22 +08:00 |
|
yanxd
|
09edfc7c0c
|
cache test
|
2014-06-12 15:20:14 +08:00 |