 lizanle
|
1103a114a0
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-01 10:36:16 +08:00 |
|
lizanle
|
b2bca65025
|
分片默认为5
|
2015-12-01 10:33:57 +08:00 |
 guange
|
52a0da83c4
|
匿名用户留言问题.
|
2015-11-30 21:52:05 +08:00 |
|
lizanle
|
3b56e40730
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-30 18:07:43 +08:00 |
|
lizanle
|
d6d0acf8bf
|
tip
|
2015-11-30 18:07:29 +08:00 |
 huang
|
9d970036f6
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-30 17:21:38 +08:00 |
|
huang
|
45c54a98e9
|
Merge branch 'develop' into szzh
|
2015-11-30 17:21:21 +08:00 |
 cxt
|
fee438cc0b
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-30 16:27:39 +08:00 |
|
cxt
|
ebeaac5798
|
作业匿评的结束状态未更新
|
2015-11-30 16:27:26 +08:00 |
|
huang
|
aa19f5f8d5
|
Merge branch 'gitlab_guange' into develop
Conflicts:
app/views/layouts/base_courses.html.erb
处理冲突
|
2015-11-30 15:43:05 +08:00 |
|
huang
|
582a7c47a4
|
修改英雄版为0显示的问题
|
2015-11-30 15:42:00 +08:00 |
|
lizanle
|
7eb5d2a8fa
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-11-30 14:59:59 +08:00 |
|
lizanle
|
8bd9c0c7af
|
tip
|
2015-11-30 14:59:51 +08:00 |
|
huang
|
5f317d13b5
|
Merge branch 'szzh' into develop
|
2015-11-30 14:36:11 +08:00 |
|
huang
|
364c9a3a9e
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
Conflicts:
db/schema.rb
合并
|
2015-11-30 14:35:37 +08:00 |
|
huang
|
031715ce28
|
Merge branch 'develop' into szzh
|
2015-11-30 14:34:13 +08:00 |
|
lizanle
|
29a8d1b9f5
|
tip
|
2015-11-30 13:22:01 +08:00 |
|
cxt
|
cf8e2fab08
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into cxt_course
|
2015-11-30 13:13:22 +08:00 |
|
cxt
|
7f4e47eadc
|
删除匿评评分数据
|
2015-11-30 13:12:35 +08:00 |
|
huang
|
39b87aaaac
|
为student_work表添加索引
为homework_comments添加索引
大幅提高查询速度
|
2015-11-30 13:09:13 +08:00 |
|
lizanle
|
96b704e191
|
所有者的更新时间随着被拥有者的改变而改天
譬如course 里边这么写：has_many :boards
boards里边这么写就ok:belongs_to :course,:touch=>true
|
2015-11-30 12:55:19 +08:00 |
|
lizanle
|
62399b6d72
|
资源课程搜索结果添加 标签
|
2015-11-30 11:21:21 +08:00 |
|
lizanle
|
d266237590
|
kaminari分页添加上一页下一页
|
2015-11-30 11:08:08 +08:00 |
|
lizanle
|
3c946c034a
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
kaminari分页添加上一页下一页
|
2015-11-30 11:07:53 +08:00 |
|
lizanle
|
885215fb8f
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-30 10:45:50 +08:00 |
|
lizanle
|
1c3bff0007
|
资源库的删除bug
和右键菜单的bug
和变背景色的bug
|
2015-11-30 10:39:50 +08:00 |
|
huang
|
d67fc18988
|
英雄榜、贡献榜显示真实姓名
为零的时候不显示
|
2015-11-30 10:20:47 +08:00 |
|
lizanle
|
34ac56e0a0
|
attachment index_document
|
2015-11-27 19:07:10 +08:00 |
|
lizanle
|
e728dd55eb
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 19:02:07 +08:00 |
|
lizanle
|
96290ad975
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:19 +08:00 |
|
lizanle
|
582cd6f5d4
|
Merge branch 'szzh' into dev_zanle
Conflicts:
app/models/attachment.rb
db/schema.rb
|
2015-11-27 18:47:02 +08:00 |
|
huang
|
2749066908
|
单个项目同步输出
|
2015-11-27 18:43:22 +08:00 |
|
huang
|
ae9f1c704a
|
500问题
|
2015-11-27 18:36:38 +08:00 |
|
lizanle
|
487c6bad09
|
schema.rb
|
2015-11-27 18:08:38 +08:00 |
|
huang
|
cb51545a31
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-27 18:03:01 +08:00 |
|
huang
|
29d950c187
|
Merge branch 'gitlab_guange' into develop
|
2015-11-27 18:01:59 +08:00 |
|
huang
|
aefab8abf3
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 18:01:28 +08:00 |
|
huang
|
c5ebfeb29c
|
Merge branch 'develop' into gitlab_guange
|
2015-11-27 18:00:57 +08:00 |
|
huang
|
f91918145d
|
0
|
2015-11-27 18:00:26 +08:00 |
Gan Yi.ang
|
e9caf0980a
|
同步用户sync_gitlab_user，加异常处理
|
2015-11-27 17:57:43 +08:00 |
|
cxt
|
b616612032
|
测验取消按钮的还原功能暂时隐藏
|
2015-11-27 17:57:17 +08:00 |
|
cxt
|
6981de6753
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-27 17:20:54 +08:00 |
|
huang
|
45b94bd22d
|
Merge branch 'szzh' into develop
|
2015-11-27 17:19:32 +08:00 |
|
cxt
|
a76095fc5f
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-27 17:19:16 +08:00 |
|
cxt
|
d992809623
|
迁移
|
2015-11-27 17:19:05 +08:00 |
|
huang
|
a6d3ff2b14
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-27 17:18:31 +08:00 |
|
huang
|
5a5fe99019
|
Merge branch 'sw_new_course' into szzh
|
2015-11-27 17:17:52 +08:00 |
|
huang
|
41b99af7dd
|
Merge branch 'develop' into sw_new_course
|
2015-11-27 17:17:21 +08:00 |
|
huang
|
634e11d0ec
|
0
|
2015-11-27 17:15:51 +08:00 |
|
lizanle
|
cb910b8d4a
|
系统消息添加logo
|
2015-11-27 17:02:37 +08:00 |