 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
|
1a666900c0
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 17:30:45 +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
|
271af6ead5
|
Merge branch 'szzh' into develop
|
2014-07-03 17:23:29 +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
|
a03cdf272e
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 16:17:01 +08:00 |
|
nwb
|
9f7951a22c
|
修改BUG
|
2014-07-03 16:16:21 +08:00 |
|
nwb
|
41ff47b839
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 16:08:36 +08:00 |
|
nwb
|
52ddee2b2f
|
界面优化
|
2014-07-03 16:07:30 +08:00 |
|
nwb
|
bc50390a2e
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 15:51:49 +08:00 |
|
nwb
|
5c0b1f3a47
|
修改界面
|
2014-07-03 15:51:18 +08:00 |
|
sw
|
740f6a19ec
|
项目名称唯一
|
2014-07-03 15:50:36 +08:00 |
|
nwb
|
8564f7a904
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 15:46:51 +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
|
39b4bd37d4
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 15:31:43 +08:00 |
|
nwb
|
b928eb6ed8
|
修改课程首页“更多”链接错误
|
2014-07-03 15:30:52 +08:00 |
|
nwb
|
ae8093c400
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 15:26:26 +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
|
41999e64b7
|
Merge remote-tracking branch 'remotes/origin/szzh' into develop
|
2014-07-03 10:14:12 +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 |
|
sw
|
967c377191
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-03 10:09:25 +08:00 |
|
yanxd
|
10a844c67f
|
合并导致的，任务列表分页错误
|
2014-07-03 10:06:57 +08:00 |
|
yanxd
|
f664ec10b4
|
Merge branch 'szzh' into develop
Conflicts:
app/views/bids/_bid_homework_show.html.erb
|
2014-07-03 09:07:09 +08:00 |
|
yanxd
|
663634b9da
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2014-07-03 09:03:17 +08:00 |
 z9hang
|
050a780b50
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 17:07:10 +08:00 |
|
z9hang
|
6f5d6c382b
|
给用户留言的回复若为查看计入新留言数
|
2014-07-02 17:06:34 +08:00 |
|
nwb
|
70dc5e2b49
|
去除主版本库标识允许为空的设置
|
2014-07-02 15:10:33 +08:00 |
|
nwb
|
898ecb443a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 14:59:02 +08:00 |
|
nwb
|
e8705bccb1
|
修改文件上传界面样式
|
2014-07-02 14:58:52 +08:00 |
|
z9hang
|
fe3861c1d7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 11:33:00 +08:00 |
|
z9hang
|
54a2fb8a9c
|
主页项目得分与项目页面的项目得分保持一致
|
2014-07-02 11:32:49 +08:00 |
|
nwb
|
fb0597ab4a
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-02 09:11:56 +08:00 |
|
nwb
|
2b855badf9
|
修正课程资源库关联已有资源功能
|
2014-07-02 09:11:45 +08:00 |
yanxd
|
e1d9d6ab45
|
tag查询崩溃
|
2014-07-01 18:20:30 +08:00 |
xianbo
|
830e2d4fb4
|
隐藏 站长统计
|
2014-07-01 18:18:25 +08:00 |
|
sw
|
063460f119
|
tt
|
2014-07-01 17:49:12 +08:00 |
|
z9hang
|
cc2862ae0f
|
修正缺陷不能踩自己提示错误
|
2014-07-01 17:21:16 +08:00 |
|
z9hang
|
8b0f155be7
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 17:13:08 +08:00 |
|
z9hang
|
d34ab220cc
|
登录名区分大小写
|
2014-07-01 17:12:48 +08:00 |
|
nwb
|
138211efba
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2014-07-01 16:56:33 +08:00 |
|
nwb
|
e94ed86ead
|
部分BUG修正
|
2014-07-01 16:56:23 +08:00 |