 huang
|
2efb7b6e66
|
Merge branch 'develop' into szzh
|
2015-12-18 21:36:09 +08:00 |
|
huang
|
52adcb378d
|
注释任务
|
2015-12-18 21:29:25 +08:00 |
|
huang
|
a2e35917a1
|
Merge branch 'szzh' into develop
|
2015-12-18 21:22:42 +08:00 |
|
huang
|
4092401e68
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 21:22:08 +08:00 |
|
huang
|
9564eca754
|
Merge branch 'develop' into szzh
|
2015-12-18 21:21:54 +08:00 |
|
huang
|
d2ba950044
|
绝对成
|
2015-12-18 21:03:36 +08:00 |
|
huang
|
5941d41b19
|
测试
|
2015-12-18 20:53:32 +08:00 |
|
huang
|
dae6e68623
|
renwu
|
2015-12-18 20:46:17 +08:00 |
 guange
|
5748078e3e
|
只调用一次at列表
|
2015-12-18 20:40:52 +08:00 |
|
guange
|
1aeef0d49c
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 20:27:09 +08:00 |
|
guange
|
488e62472d
|
at改为点击时加载.
|
2015-12-18 20:26:50 +08:00 |
|
huang
|
747493993b
|
上线测试
|
2015-12-18 19:57:08 +08:00 |
 cxt
|
e7db03f271
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 19:49:42 +08:00 |
|
cxt
|
459e1f332b
|
编辑分组作品时如果不修改分组成员则不能提交
|
2015-12-18 19:48:13 +08:00 |
|
guange
|
e9a45012f8
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 19:47:21 +08:00 |
|
guange
|
08cd3808ad
|
ke引用错误
|
2015-12-18 19:47:06 +08:00 |
|
huang
|
e673540323
|
还原提交次数
|
2015-12-18 18:51:29 +08:00 |
|
cxt
|
6a563d4256
|
匿评结束后不可修改作业的截止日期，作业发布后不可修改作业的发布日期
|
2015-12-18 18:47:36 +08:00 |
|
huang
|
4dda355d2e
|
测试版
|
2015-12-18 18:28:20 +08:00 |
|
cxt
|
902570173d
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 18:09:00 +08:00 |
 lizanle
|
a657a5b98d
|
课程留言 重复提交问题
|
2015-12-18 18:09:20 +08:00 |
|
lizanle
|
a1d0bf43ee
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-18 17:55:21 +08:00 |
|
lizanle
|
009dc089f0
|
资源库重命名修改
|
2015-12-18 17:55:15 +08:00 |
 ouyangxuhua
|
22d214cdd3
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 17:51:42 +08:00 |
|
ouyangxuhua
|
714dfdc2d5
|
解决组织资源栏目点击上传资源没反应的问题
|
2015-12-18 17:51:22 +08:00 |
|
guange
|
9dea58c921
|
将contentEditable改为enable_at
|
2015-12-18 17:41:14 +08:00 |
|
cxt
|
8769d6af4f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 17:28:59 +08:00 |
|
cxt
|
108448cf4d
|
课程讨论区的加载更多
|
2015-12-18 17:28:47 +08:00 |
|
huang
|
8d0463169e
|
gemfile文件冲突问题
|
2015-12-18 17:16:25 +08:00 |
|
guange
|
e02b865fa6
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 17:09:01 +08:00 |
|
huang
|
88cdb5a3ed
|
Merge branch 'develop' of http://git.trustie.net/jacknudt/trustieforge into develop
Conflicts:
app/controllers/repositories_controller.rb
解决冲突
|
2015-12-18 17:08:26 +08:00 |
|
huang
|
fc93dd3e99
|
Merge branch 'szzh' into develop
|
2015-12-18 17:07:31 +08:00 |
|
huang
|
ea51b24a4e
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 17:06:00 +08:00 |
|
guange
|
57b1c0c7d8
|
at是否开启加入到配置
|
2015-12-18 17:02:50 +08:00 |
|
guange
|
f4d861c727
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 16:51:17 +08:00 |
|
guange
|
634815f93a
|
at后字体改
|
2015-12-18 16:50:59 +08:00 |
|
guange
|
d0e139650f
|
issue回复的at出错
|
2015-12-18 16:50:44 +08:00 |
|
guange
|
71a0802a49
|
at后字体改色
|
2015-12-18 16:46:35 +08:00 |
|
cxt
|
63f9601c15
|
Merge branch 'cxt_course' into szzh
|
2015-12-18 16:27:31 +08:00 |
|
cxt
|
4d82beb4c7
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 16:27:19 +08:00 |
|
guange
|
c38191eb42
|
问题回复at
|
2015-12-18 16:25:14 +08:00 |
|
cxt
|
7ce8e330c3
|
课程留言动态的显示
|
2015-12-18 16:21:27 +08:00 |
|
huang
|
a080306f75
|
解决课程动态中，点击按钮，提交多次的问题
|
2015-12-18 16:05:39 +08:00 |
|
lizanle
|
793a98ade1
|
forge_activities那个运行批量删除回复动态脚本改动
|
2015-12-18 15:51:41 +08:00 |
|
cxt
|
c6e7c8860d
|
dd
|
2015-12-18 15:45:23 +08:00 |
|
lizanle
|
0ed7d84914
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-18 15:22:35 +08:00 |
|
lizanle
|
084844941f
|
个人单位修改。
聚焦就搜索所有的学校
|
2015-12-18 15:22:29 +08:00 |
|
cxt
|
2eaa05306f
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
Conflicts:
app/views/boards/_course_show.html.erb
|
2015-12-18 15:08:38 +08:00 |
|
cxt
|
ba4c93e4c4
|
Merge branch 'cxt_course' into szzh
|
2015-12-18 15:03:24 +08:00 |
|
cxt
|
a7c006c59f
|
课程讨论区的展开更多不可用
|
2015-12-18 15:02:36 +08:00 |