 Tim
|
06b89c5108
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
|
2015-12-25 15:28:15 +08:00 |
|
Tim
|
1a24505eac
|
footer新增图片，样式修改
|
2015-12-25 15:27:45 +08:00 |
 ouyangxuhua
|
7d7d9b77b5
|
编辑项目帖子样式改成方块样式
|
2015-12-24 11:58:00 +08:00 |
|
ouyangxuhua
|
c81f2f738a
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
app/controllers/org_document_comments_controller.rb
app/views/org_document_comments/_attachment.html.erb
|
2015-12-24 11:13:20 +08:00 |
|
ouyangxuhua
|
59f42bb54f
|
1.将添加附加功能加入到组织列表中的新建组织文章；
2.解决编辑文章附件不能上传的问题。
|
2015-12-24 11:09:57 +08:00 |
|
Tim
|
b0b4527ea1
|
Merge branch 'dev_hjq' of https://git.trustie.net/jacknudt/trustieforge into dev_hjq
Conflicts:
public/stylesheets/org.css
|
2015-12-24 10:40:00 +08:00 |
|
Tim
|
eb7d0761cb
|
组织菜单栏修改成和个人首页相同
|
2015-12-24 10:37:13 +08:00 |
|
ouyangxuhua
|
9e0b88c186
|
项目讨论区样式改成方块样式
|
2015-12-24 09:46:18 +08:00 |
|
ouyangxuhua
|
73d377d06d
|
组织资源栏目显示转发的帖子
|
2015-12-23 16:49:05 +08:00 |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
2015-12-23 15:35:26 +08:00 |
|
ouyangxuhua
|
9dc2cb8541
|
添加组织文章附件功能
|
2015-12-23 10:40:50 +08:00 |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
2015-12-22 15:48:41 +08:00 |
 huang
|
188bb0c1a7
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 21:36:26 +08:00 |
|
huang
|
2efb7b6e66
|
Merge branch 'develop' into szzh
|
2015-12-18 21:36:09 +08:00 |
 cxt
|
84f6ec0978
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-18 21:34:50 +08:00 |
|
cxt
|
65022f03cb
|
作业动态中的评分设置和匿评自动开启、关闭时间的自动刷新
|
2015-12-18 21:34:31 +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 |
|
cxt
|
c073e56b79
|
学生匿评必须添加评语
|
2015-12-18 20:46:20 +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 |