 huang
|
6fad26cabf
|
去死奥placebold
|
2015-12-04 17:32:56 +08:00 |
|
huang
|
120a7274d3
|
fork样式显示
|
2015-12-04 17:22:22 +08:00 |
|
huang
|
c72cf55564
|
Merge branch 'develop' into szzh
|
2015-12-04 16:43:48 +08:00 |
|
huang
|
61d76e6744
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
|
2015-12-04 16:42:55 +08:00 |
 lizanle
|
4c00312f45
|
Merge branch 'szzh' into dev_zanle
|
2015-12-04 16:42:02 +08:00 |
|
huang
|
9716e99533
|
课程成员提交“修改角色”
|
2015-12-04 16:33:56 +08:00 |
|
huang
|
7daaa59010
|
Merge branch 'gitlab_guange' of http://repository.trustie.net/xianbo/trustie2 into gitlab_guange
|
2015-12-04 16:22:02 +08:00 |
|
huang
|
b6edabed9c
|
修改角色
|
2015-12-04 16:21:48 +08:00 |
 cxt
|
8fe53468e1
|
作品追加附件
|
2015-12-04 16:21:11 +08:00 |
 Tim
|
dfa9b4cf74
|
学生列表调整
|
2015-12-04 16:13:55 +08:00 |
|
huang
|
4a41039fa6
|
课程英雄榜改成课程活跃度
|
2015-12-04 15:58:56 +08:00 |
|
huang
|
4d0956dff1
|
Merge branch 'develop' into gitlab_guange
|
2015-12-04 15:54:56 +08:00 |
|
huang
|
9f73807e05
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
处理冲突
|
2015-12-04 15:54:18 +08:00 |
|
huang
|
c1747ab217
|
fork重名，提交
|
2015-12-04 15:49:05 +08:00 |
|
lizanle
|
dbfc4969e0
|
测验消息bug
|
2015-12-04 15:36:19 +08:00 |
|
lizanle
|
e3c594a7ca
|
Merge branch 'develop' into dev_zanle
|
2015-12-04 10:59:14 +08:00 |
|
lizanle
|
6553559929
|
发送消息
|
2015-12-04 10:56:16 +08:00 |
|
huang
|
8f024bdf4d
|
Merge branch 'develop' of http://repository.trustie.net/xianbo/trustie2 into develop
Conflicts:
db/schema.rb
|
2015-12-04 09:12:24 +08:00 |
|
huang
|
7fe3a02d81
|
Merge branch 'gitlab_guange' into develop
|
2015-12-04 09:11:22 +08:00 |
|
huang
|
89b8f7783d
|
添加forked_form的id
|
2015-12-04 08:57:29 +08:00 |
|
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 |
|
lizanle
|
adb246f9ad
|
注释标记 错误
<!-- -->
|
2015-12-02 15:30:07 +08:00 |
|
lizanle
|
9fe5cfbf76
|
资源发送课程发送项目自动搜索
|
2015-12-02 14:38:41 +08:00 |
|
lizanle
|
2f0895c2c2
|
发送资源成功给出提示
发送资源默认为发送课程
|
2015-12-02 13:40:53 +08:00 |
|
lizanle
|
7af82aac98
|
base_forums要加ajax-indicator ajax-model
|
2015-12-02 09:28:01 +08:00 |
|
lizanle
|
46ad5f45c1
|
搜索结果下一页样式不对
|
2015-12-02 09:23:12 +08:00 |
|
lizanle
|
35b543cd22
|
论坛发帖 采用ajax提交。这样子网络不好的情况就不会丢失数据了。
|
2015-12-01 17:23:14 +08:00 |
|
lizanle
|
d4823e7c8b
|
贴吧更新时间
|
2015-12-01 15:48:25 +08:00 |
|
lizanle
|
304cc078a7
|
去掉警示的感叹号
|
2015-12-01 15:30:47 +08:00 |
|
cxt
|
68a29d8131
|
学生提交作品后可点击重试重新上传作品
|
2015-12-01 15:18:14 +08:00 |
|
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 |
|
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 |