 nwb
|
0772e04510
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-13 11:56:55 +08:00 |
|
nwb
|
79b498914a
|
修改错误
|
2014-05-13 11:56:36 +08:00 |
|
nwb
|
75f584a6e2
|
1.完成分类资源下载视图显示
2.优化代码，删除冗余代码
|
2014-05-13 11:54:21 +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 |
|
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 |
|
sw
|
f487352d6d
|
当当前学校开设课程数位0时推荐给用户的由开设课程最多的几个学校改为本系统中最好的几门课程
|
2014-05-12 16:01:13 +08:00 |
|
sw
|
75902ff118
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-12 10:37:23 +08:00 |
 z9hang
|
a80da022cb
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-12 09:33:19 +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 |
|
nwb
|
9f1d0d3437
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-09 17:28:05 +08:00 |
|
nwb
|
50cc682e02
|
添加数据库脚本文件
|
2014-05-09 17:27:04 +08:00 |
|
nwb
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
2014-05-09 17:13:23 +08:00 |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
2014-05-09 15:45:21 +08:00 |
|
z9hang
|
2077b1e8b8
|
课程，竞赛页面问题反馈前添加吧名
|
2014-05-09 14:49:03 +08:00 |
|
z9hang
|
425e2bb11e
|
course网站中未选学校，有登陆用户，且登陆用户已填学校时添加链接
|
2014-05-09 14:18:38 +08:00 |
|
z9hang
|
7a341972e7
|
course网站中大学名加上该大学在本站的链接
|
2014-05-09 11:47:41 +08:00 |
|
z9hang
|
a57d5fd823
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2014-05-09 10:25:26 +08:00 |
|
sw
|
14dcb18b96
|
将作业旁边的 “好问题”，“烂问题” 选项去掉
|
2014-05-09 10:20:34 +08:00 |
|
z9hang
|
bdea0ee36a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-09 08:37:49 +08:00 |
yanxd
|
c2284deaf7
|
application.css 分页css问题
|
2014-05-08 18:40:10 +08:00 |
|
yanxd
|
2f47cc1cd8
|
Merge branch 'test', remote-tracking branch 'origin/szzh' into develop
|
2014-05-08 18:15:58 +08:00 |
|
nwb
|
42e6fc6a68
|
1.添加资源类型control、model及表结构
2.资源(attachments)添加资源分类属性
|
2014-05-08 18:03:48 +08:00 |
|
nwb
|
b94bd99311
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-08 18:00:58 +08:00 |
|
z9hang
|
268dc1acce
|
主页讨论吧动态前显示吧名
|
2014-05-08 17:37:38 +08:00 |
ganyiang
|
2048ce3c10
|
修复高校列表在firefox下显示不正常问题
|
2014-05-08 16:51:45 +08:00 |
|
z9hang
|
3caedbdb85
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-08 15:52:28 +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 |
 kg
|
57e5cda513
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-08 14:26:27 +08:00 |
|
kg
|
db2ab5b945
|
modify issue filter and base_footer
|
2014-05-08 14:18:42 +08:00 |
|
ganyiang
|
5e780e6872
|
修复新建问题中autocomplete在Firefox下的不正常
|
2014-05-08 12:18:05 +08:00 |
|
ganyiang
|
786481e144
|
新建问题-主题-autocomplete-选中跳转
|
2014-05-07 20:30:42 +08:00 |
|
nwb
|
faab40456a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-07 19:45:11 +08:00 |
|
z9hang
|
e441657e23
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-07 15:23:12 +08:00 |
|
yanxd
|
8770599352
|
css typo
|
2014-05-07 10:58:49 +08:00 |
|
z9hang
|
a5f7a19f48
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-07 10:04:48 +08:00 |
 fanqiang
|
9b151567f1
|
修改没有帮助显示问题
|
2014-05-07 08:16:25 +08:00 |
|
yanxd
|
eb19b0cb1f
|
welcome css改标点错误
|
2014-05-06 17:14:36 +08:00 |
|
yanxd
|
05baffe4f3
|
issue导航，首页贴吧动态html,加入了最后回复
|
2014-05-06 17:04:24 +08:00 |
|
z9hang
|
f8c61ac69b
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-06 10:36:59 +08:00 |
|
yanxd
|
f8746d6812
|
access control：关闭课程in view
|
2014-05-06 09:26:48 +08:00 |
|
yanxd
|
d257f4e853
|
随便关闭课程禁止//临时
|
2014-05-06 09:16:48 +08:00 |
|
z9hang
|
0af034eac6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-05-05 15:46:44 +08:00 |
|
fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
2014-05-05 15:33:24 +08:00 |
xianbo
|
0a6fc56dea
|
Merge branch 'master' of 10.0.47.245:/home/trustie2
|
2014-05-05 10:24:14 +08:00 |
|
xianbo
|
7255627924
|
Merge branch 'master' of 10.0.47.245:/home/trustie2
|
2014-05-05 10:23:31 +08:00 |
 huangjingquan
|
dc4e928741
|
修改tag显示异常
|
2014-05-05 10:17:50 +08:00 |