 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
|
7ccbc5e88a
|
课时限制为只能输入正整数
|
2014-05-09 17:13:23 +08:00 |
|
nwb
|
753746f833
|
1.项目添加资源分类
2.修改文件上传功能，添加新参数
3.修改文件上传界面
|
2014-05-09 15:45:21 +08:00 |
|
sw
|
14dcb18b96
|
将作业旁边的 “好问题”，“烂问题” 选项去掉
|
2014-05-09 10:20:34 +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 |
ganyiang
|
2048ce3c10
|
修复高校列表在firefox下显示不正常问题
|
2014-05-08 16:51:45 +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
|
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 |
 fanqiang
|
9b151567f1
|
修改没有帮助显示问题
|
2014-05-07 08:16:25 +08:00 |
|
yanxd
|
05baffe4f3
|
issue导航，首页贴吧动态html,加入了最后回复
|
2014-05-06 17:04:24 +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 |
|
fanqiang
|
547a268af8
|
修改合并之后的一些小问题
|
2014-05-05 15:33:24 +08:00 |
 huangjingquan
|
dc4e928741
|
修改tag显示异常
|
2014-05-05 10:17:50 +08:00 |
 wanglinchun
|
4188c046c7
|
Merge branch 'develop'
|
2014-05-05 10:05:10 +08:00 |
Wen
|
501b491363
|
=.=
|
2014-05-05 10:03:13 +08:00 |
|
wanglinchun
|
c6576c71bf
|
增加了每个app打分的总人数
|
2014-05-05 10:01:08 +08:00 |
|
fanqiang
|
d50b2a9cfe
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-05 09:16:19 +08:00 |
|
fanqiang
|
e89d74e2a9
|
开源项目中新增tag，搜索查找待新增tag的obj
|
2014-05-05 09:15:55 +08:00 |
|
fanqiang
|
2c8580a4e8
|
Merge branch 'crawl' into develop
Conflicts:
app/controllers/tags_controller.rb
app/views/tags/_tag.html.erb
app/views/tags/_tag_search_results.html.erb
app/views/tags/index.html.erb
config/locales/zh.yml
config/routes.rb
db/schema.rb
|
2014-05-05 09:11:59 +08:00 |
|
wanglinchun
|
0634f36c10
|
"打分后不要显示英文，而且还要提示：您可以重新打分"问题解决
|
2014-05-05 09:00:10 +08:00 |
|
fanqiang
|
dbef2f958a
|
osp_id validate
|
2014-05-05 08:10:22 +08:00 |
|
wanglinchun
|
ac644beb72
|
添加竞赛首页中参与竞赛的app个数
|
2014-05-04 21:16:00 +08:00 |
|
yanxd
|
2b5cdf161c
|
不能删除帖子问题
|
2014-05-04 18:49:56 +08:00 |
|
yanxd
|
5a6abab224
|
Merge branch 'master' of 10.0.47.245:/home/trustie2
|
2014-05-04 18:40:58 +08:00 |
|
yanxd
|
5d27bb5a28
|
不能删除帖子到问题
|
2014-05-04 18:40:49 +08:00 |
|
wanglinchun
|
374b183c0f
|
修改应用列表显示问题
|
2014-05-04 08:50:40 +08:00 |
|
kg
|
881c91fafd
|
Merge branch 'develop'
|
2014-05-01 09:22:24 +08:00 |
|
kg
|
776a9d1e35
|
Merge branch 'develop' of 10.0.47.245:/home/trustie2 into develop
|
2014-05-01 09:16:43 +08:00 |
|
Wen
|
e6288627ad
|
中国高校页面，下拉框修改
|
2014-04-30 20:26:15 +08:00 |
|
Wen
|
c893227609
|
个人资料页面学校选择框更改
|
2014-04-30 17:47:20 +08:00 |
|
wanglinchun
|
688438241e
|
调整应用列表页面中的bug
|
2014-04-30 16:46:24 +08:00 |
|
wanglinchun
|
35c424814e
|
竞赛模块首页应用添加更多链接到应用列表页面
|
2014-04-30 15:28:22 +08:00 |
|
Wen
|
90b53a7efb
|
打分的调整
|
2014-04-30 13:51:19 +08:00 |
|
wanglinchun
|
37304c1232
|
添加应用页面中的打分详情
|
2014-04-30 11:34:04 +08:00 |
|
wanglinchun
|
74256d5150
|
调整应用页面中的距离格式
|
2014-04-30 09:48:48 +08:00 |
|
Wen
|
040e4b2740
|
用户打分.
|
2014-04-30 09:13:05 +08:00 |
|
yanxd
|
0cfd5929d8
|
Revert "tag todo"
eee
This reverts commit 08b27f38a7.
|
2014-04-30 00:35:50 +08:00 |
|
wanglinchun
|
e48edac988
|
增加参赛应用页面的打分细节--初级版
|
2014-04-30 08:07:08 +08:00 |
|
wanglinchun
|
3da6d5cd37
|
应用页面列表排序（按时间排序已好，另一种排序暂未定）
|
2014-04-29 18:21:07 +08:00 |
|
wanglinchun
|
0eb81a24af
|
跳转
|
2014-04-29 15:18:46 +08:00 |
|
wanglinchun
|
dbe4c26322
|
应用列表分页功能
|
2014-04-29 14:40:39 +08:00 |