 nwb
|
fd25f42e61
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 15:41:38 +08:00 |
|
nwb
|
2395ee4b1d
|
留言发送邮件优化
|
2014-07-04 15:41:26 +08:00 |
 sw
|
eac725a0f4
|
修改作业、用户、课程界面中相关学校的链接
|
2014-07-04 15:21:56 +08:00 |
|
sw
|
698870ddee
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 14:48:06 +08:00 |
|
sw
|
71b17cd98e
|
1
|
2014-07-04 14:47:38 +08:00 |
 yanxd
|
8ccc39ae71
|
首页更多报错
|
2014-07-04 14:43:57 +08:00 |
|
nwb
|
b6ebbab830
|
项目版本库名称限定优化
|
2014-07-04 14:19:34 +08:00 |
|
sw
|
62bcccedea
|
新建作业时给必填项添加*号
|
2014-07-04 14:04:31 +08:00 |
|
sw
|
bc9f1e5a01
|
1.修改软件创客中每个用户内容显示不一致的BUG
2.去掉用户项目列表最后一个项目后的逗号
|
2014-07-04 13:59:08 +08:00 |
|
nwb
|
b42605accd
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 13:38:50 +08:00 |
|
nwb
|
864ef17941
|
清理课程状态表，修正同一课程出现多次的BUG
|
2014-07-04 13:38:34 +08:00 |
|
sw
|
b492ead0c0
|
修改学校链接
|
2014-07-04 11:51:26 +08:00 |
|
sw
|
a1920ca54c
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 11:31:09 +08:00 |
|
yanxd
|
36c90f1dfd
|
取不到学校，再拿id直接空指针
|
2014-07-04 11:30:41 +08:00 |
|
sw
|
0e0b8fb8d8
|
历史数据中当课程名称字段为空时从项目列表里获取名称
|
2014-07-04 11:30:22 +08:00 |
|
sw
|
1e6693cdcf
|
1.取消软件创客界面2个个人得分显示
2.修复软件创客界面用户参与课程显示不正确的BUG
3.添加获取用户参与的未过期的项目列表
|
2014-07-04 11:26:37 +08:00 |
|
yanxd
|
d54f37e630
|
个人动态，判断留言人逻辑有误
|
2014-07-04 11:15:58 +08:00 |
|
nwb
|
ff8994fc9d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 11:11:38 +08:00 |
|
nwb
|
08a6dec39d
|
课程讨论区回复时主题只读
|
2014-07-04 11:11:27 +08:00 |
|
sw
|
2506e8e50d
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 10:30:14 +08:00 |
|
sw
|
108866b8ba
|
1
|
2014-07-04 10:29:31 +08:00 |
|
sw
|
016ef25019
|
1.注释无效代码
2.修改软件总包列表分页统一使用@bid_count
|
2014-07-04 10:22:35 +08:00 |
 z9hang
|
d525220aca
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 10:10:41 +08:00 |
|
z9hang
|
2dd249a105
|
修正发帖不填主题报错问题，修正发帖内容为空可成功发布bug、修改主页贴吧动态里回帖数字颜色、修改昵称字符为不超过25个
|
2014-07-04 10:10:20 +08:00 |
|
nwb
|
dc0180988f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 09:10:36 +08:00 |
|
nwb
|
d001b4416a
|
1.优化课程首页
2.优化课程首页搜索逻辑
|
2014-07-04 09:10:17 +08:00 |
|
yanxd
|
81327e48aa
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-04 09:02:54 +08:00 |
|
yanxd
|
8420163c29
|
doc/(git workflow
update rmagick Installation
|
2014-07-04 09:02:33 +08:00 |
|
sw
|
7acf73c4ca
|
修复未登陆用户进入学校主页列表出错的问题
|
2014-07-04 08:42:00 +08:00 |
|
sw
|
fd1f3b45c9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 18:21:18 +08:00 |
|
sw
|
f86e889c23
|
修复学校列表链接
|
2014-07-03 18:20:16 +08:00 |
|
nwb
|
42a602a9bc
|
修改首页
|
2014-07-03 18:20:03 +08:00 |
|
sw
|
2bdb0e20e9
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
app/views/welcome/course.html.erb
|
2014-07-03 18:14:44 +08:00 |
|
sw
|
3e185c3a4b
|
修改学校链接
|
2014-07-03 18:11:10 +08:00 |
|
nwb
|
98ba57b819
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 17:28:20 +08:00 |
|
nwb
|
4d25ec1623
|
1.添加课程垃圾数据清理迁移文件
2.课程首页逻辑更改
|
2014-07-03 17:28:13 +08:00 |
|
sw
|
b42d742c06
|
1.增加我的学校链接
2.修改当我的学校未开设课程时报出的BUG
|
2014-07-03 17:25:51 +08:00 |
|
yanxd
|
0e2b7ba362
|
tag search fix
|
2014-07-03 17:22:48 +08:00 |
|
sw
|
fe4e1cc175
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 16:41:48 +08:00 |
|
nwb
|
9f7951a22c
|
修改BUG
|
2014-07-03 16:16:21 +08:00 |
|
nwb
|
52ddee2b2f
|
界面优化
|
2014-07-03 16:07:30 +08:00 |
|
nwb
|
5c0b1f3a47
|
修改界面
|
2014-07-03 15:51:18 +08:00 |
|
sw
|
740f6a19ec
|
项目名称唯一
|
2014-07-03 15:50:36 +08:00 |
|
nwb
|
8d22ccd23a
|
修改BUG
|
2014-07-03 15:45:50 +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
|
b928eb6ed8
|
修改课程首页“更多”链接错误
|
2014-07-03 15:30:52 +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
|
2d9e0d507e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 10:12:46 +08:00 |
|
nwb
|
31e338f1e5
|
修正http://127.0.0.1:3000/?course.trustie.net链接跳转问题
|
2014-07-03 10:12:30 +08:00 |