 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
|
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
|
39b87aaaac
|
为student_work表添加索引
为homework_comments添加索引
大幅提高查询速度
|
2015-11-30 13:09:13 +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
|
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 |
|
lizanle
|
487c6bad09
|
schema.rb
|
2015-11-27 18:08:38 +08:00 |
|
huang
|
f91918145d
|
0
|
2015-11-27 18:00:26 +08:00 |
|
huang
|
634e11d0ec
|
0
|
2015-11-27 17:15:51 +08:00 |
|
huang
|
b130b52a23
|
修改迁移
|
2015-11-27 16:55:45 +08:00 |
|
huang
|
501a8f905b
|
Merge branch 'develop' into szzh
Conflicts:
db/schema.rb
public/stylesheets/courses.css
|
2015-11-27 14:56:30 +08:00 |
|
huang
|
36b1649fbd
|
Merge branch 'szzh' into gitlab_guange
Conflicts:
db/schema.rb
|
2015-11-27 14:49:49 +08:00 |
|
huang
|
2ec78d07fa
|
Merge branch 'szzh' into hjq_new_course
|
2015-11-27 14:47:16 +08:00 |
 ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
2015-11-27 12:34:02 +08:00 |
|
huang
|
042b197767
|
课程英雄榜界面调整
动作触发的时候更新总分
更换迁移顺序
|
2015-11-27 10:49:41 +08:00 |
 houxiang
|
c6b5abba4e
|
hide the the count of project'repo
|
2015-11-27 10:10:59 +08:00 |
|
huang
|
8c83bbfff3
|
课程英雄榜数据
|
2015-11-27 00:48:08 +08:00 |
|
huang
|
aca7684414
|
课程英雄榜
各模块动作 触发加分
|
2015-11-26 18:22:03 +08:00 |
|
cxt
|
cc0ff6bbc0
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-26 17:22:46 +08:00 |
|
cxt
|
c9f844b9ba
|
Merge branch 'sw_new_course' into develop
|
2015-11-26 17:22:26 +08:00 |
|
lizanle
|
4efb660214
|
全站搜索
|
2015-11-26 09:57:53 +08:00 |
|
huang
|
c8b1cae947
|
建立贡献榜表及相关关联
部分页面
按总分排序（英雄榜）
部分页面（未完成）
|
2015-11-25 15:16:33 +08:00 |
 Tim
|
d1f16a0851
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-25 10:15:12 +08:00 |
|
Tim
|
ec42cd2d7f
|
系统自动生成文件
|
2015-11-25 10:12:20 +08:00 |
|
ouyangxuhua
|
ccfbc1e0bd
|
1.组织翻页增加type参数；
2.删除组织表中冗余的项目动态和课程动态。
|
2015-11-24 12:50:43 +08:00 |
|
cxt
|
9b033c3adf
|
数据日志
|
2015-11-24 10:08:51 +08:00 |
|
huang
|
55ff5f4931
|
Merge branch 'develop' into gitlab_guange
Conflicts:
app/views/projects/settings/_join_org.html.erb
db/schema.rb
处理冲突
|
2015-11-24 09:55:26 +08:00 |
|
huang
|
a174cade83
|
commit by hx , 2015/11/13
|
2015-11-23 20:35:37 +08:00 |
|
cxt
|
f262a7cc13
|
cffd
|
2015-11-20 22:05:31 +08:00 |
|
huang
|
fd03e62957
|
添加字段迁移
|
2015-11-20 22:04:07 +08:00 |
|
huang
|
1df8c94b98
|
解决字符过长不能保存成功的问题
|
2015-11-20 21:49:36 +08:00 |
|
huang
|
dd148fb7c5
|
Merge branch 'szzh' into sw_new_course
Conflicts:
db/schema.rb
|
2015-11-20 20:25:17 +08:00 |
|
ouyangxuhua
|
5ac65d86b1
|
将org_document_comment中的title改成text类型
|
2015-11-20 19:58:25 +08:00 |
|
Tim
|
e3d78bf4f0
|
组织样式更改
|
2015-11-20 14:30:54 +08:00 |
|
cxt
|
99945d5bb5
|
学生答题界面的修改
|
2015-11-20 12:54:41 +08:00 |
|
huang
|
3deebf2006
|
show
|
2015-11-20 11:08:47 +08:00 |
|
ouyangxuhua
|
4d4b163f17
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-11-20 09:27:15 +08:00 |
|
ouyangxuhua
|
d71d9730bd
|
修改迁移文件的bug
|
2015-11-20 09:26:58 +08:00 |
|
huang
|
7dc16775dc
|
添加字段迁移
|
2015-11-19 20:44:01 +08:00 |
|
lizanle
|
dffabce806
|
Merge branch 'dev_zanle' into szzh
Conflicts:
db/schema.rb
|
2015-11-19 15:03:56 +08:00 |
|
lizanle
|
56e96a035b
|
schema.rb
|
2015-11-19 15:01:03 +08:00 |
|
houxiang
|
4a9da97f9b
|
modify by hx add commit_count_detail_show
|
2015-11-18 16:23:02 +08:00 |
|
cxt
|
249b15751d
|
新建多选题
|
2015-11-18 14:05:29 +08:00 |
|
ouyangxuhua
|
f6251b758b
|
1.迁移课程动态数据至组织动态
2.“项目动态迁移至组织动态”迁移文件增加事物
|
2015-11-18 12:55:18 +08:00 |
|
huang
|
282c7f5bd2
|
修改添加题目相关
|
2015-11-18 10:46:56 +08:00 |
|
ouyangxuhua
|
71bf80c7a5
|
1.创建组织课程关联表，建立相应模型及控制器；
2.在课程设置中，添加加入组中功能；
3.解决添加项目后，组织列表的上一页和下一页链接问题。
|
2015-11-17 17:34:50 +08:00 |
|
lizanle
|
291868ba43
|
Merge branch 'szzh' into dev_zanle
Conflicts:
db/schema.rb
|
2015-11-17 16:48:03 +08:00 |