 cxt
|
4e9e7543ba
|
chrome浏览器点击保存测验头部信息无反应
|
2015-12-03 19:21:35 +08:00 |
|
cxt
|
838140ada8
|
在线测验的自动发布和截止
|
2015-12-03 19:08:15 +08:00 |
|
cxt
|
fd51b02e16
|
添加修订附件
|
2015-12-03 18:33:08 +08:00 |
|
cxt
|
77e96af78f
|
还原分组作业
|
2015-12-03 10:41:27 +08:00 |
|
cxt
|
68a29d8131
|
学生提交作品后可点击重试重新上传作品
|
2015-12-01 15:18:14 +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
|
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
|
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 |
|
lizanle
|
29a8d1b9f5
|
tip
|
2015-11-30 13:22:01 +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
|
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
|
ae9f1c704a
|
500问题
|
2015-11-27 18:36: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
|
aefab8abf3
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 18:01:28 +08:00 |
|
cxt
|
b616612032
|
测验取消按钮的还原功能暂时隐藏
|
2015-11-27 17:57:17 +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
|
41b99af7dd
|
Merge branch 'develop' into sw_new_course
|
2015-11-27 17:17:21 +08:00 |
|
lizanle
|
cb910b8d4a
|
系统消息添加logo
|
2015-11-27 17:02:37 +08:00 |
 ouyangxuhua
|
edea776b03
|
Merge branch 'szzh' into dev_hjq
|
2015-11-27 16:28:16 +08:00 |
|
ouyangxuhua
|
89d01679a7
|
组织中，重复的项目和组织不显示
|
2015-11-27 16:27:23 +08:00 |
|
huang
|
ee7fb11acc
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-11-27 16:01:03 +08:00 |
|
huang
|
e3e0f4ab37
|
鼠标移动+号显示留言
|
2015-11-27 16:00:43 +08:00 |
|
ouyangxuhua
|
3abc3f7af0
|
组织文章编辑，返回对应界面
|
2015-11-27 15:25:49 +08:00 |
Gan Yi.ang
|
79656aa205
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 15:22:18 +08:00 |
|
Gan Yi.ang
|
c3a27151ca
|
修复_revision
|
2015-11-27 15:21:58 +08:00 |
|
cxt
|
85aade79ce
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
public/stylesheets/courses.css
|
2015-11-27 15:21:32 +08:00 |
|
cxt
|
f7ac2b0ef5
|
老师查看学生的答卷结果
|
2015-11-27 15:19:13 +08:00 |
|
lizanle
|
e710f443c2
|
全站搜索
|
2015-11-27 15:17:17 +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
|
25b66b5dbb
|
取消弹窗
|
2015-11-27 14:43:08 +08:00 |
|
huang
|
1cc6e305ed
|
完成新功能模块开发：
1、如果没有成绩则不显示
2、工具框展开没有则不显示
|
2015-11-27 13:52:40 +08:00 |
|
ouyangxuhua
|
365349878d
|
组织加入项目或者课程，刷新项目列表和课程列表；同时，弹窗给出关联成功的提示
|
2015-11-27 13:17:23 +08:00 |
|
ouyangxuhua
|
e0f4050779
|
1.修改组织中关联项目和课程的内容和样式
|
2015-11-27 12:34:02 +08:00 |
|
Gan Yi.ang
|
ee85cc35ed
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-11-27 11:27:03 +08:00 |
|
Gan Yi.ang
|
1115d54d9a
|
非trustie用户changesets_latest_coimmit
|
2015-11-27 11:25:16 +08:00 |
|
ouyangxuhua
|
4aa827eb4a
|
组织页面中，点击项目收起项目列表，再点击展开列表；点击课程同样如此。
|
2015-11-27 11:02:48 +08:00 |
 Tim
|
2d14b66336
|
作品列表样式调整
|
2015-11-27 10:56:46 +08:00 |