 huang
|
7d35931460
|
迁移测试
|
2015-12-24 15:27:49 +08:00 |
 ouyangxuhua
|
7d7d9b77b5
|
编辑项目帖子样式改成方块样式
|
2015-12-24 11:58:00 +08:00 |
 cxt
|
20efe4de41
|
去掉测验结果页面中填空题的标准答案
|
2015-12-24 11:30:52 +08:00 |
|
cxt
|
61b5cf41d0
|
取消课程首页的开设单位超链接
|
2015-12-24 11:23:23 +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 |
|
cxt
|
24542105f4
|
Merge branch 'cxt_course' of https://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2015-12-24 09:57:47 +08:00 |
|
cxt
|
f26f71c07a
|
课程通知改成动态的模式
|
2015-12-24 09:57:32 +08:00 |
|
ouyangxuhua
|
9e0b88c186
|
项目讨论区样式改成方块样式
|
2015-12-24 09:46:18 +08:00 |
|
huang
|
055fac5e27
|
修改项目得分
|
2015-12-23 17:29:40 +08:00 |
|
Tim
|
c405950469
|
课程关联项目列表显示调整
|
2015-12-23 17:26:13 +08:00 |
|
huang
|
19f84b111b
|
邮件按天发送去掉token值
|
2015-12-23 17:16:35 +08:00 |
|
ouyangxuhua
|
73d377d06d
|
组织资源栏目显示转发的帖子
|
2015-12-23 16:49:05 +08:00 |
|
huang
|
00711f1100
|
issue编辑、添加邮件中去掉token
|
2015-12-23 16:12:23 +08:00 |
|
ouyangxuhua
|
b9ae579622
|
将课程帖子转发至组织帖子栏目
|
2015-12-23 15:35:26 +08:00 |
 lizanle
|
e8bf93e4ad
|
文件上传button的路径去掉project参数。
|
2015-12-23 11:13:14 +08:00 |
|
lizanle
|
7688546e7a
|
论坛编辑的时候上传文件后没有显示
|
2015-12-23 11:12:34 +08:00 |
|
ouyangxuhua
|
9dc2cb8541
|
添加组织文章附件功能
|
2015-12-23 10:40:50 +08:00 |
|
lizanle
|
bececd1547
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-12-23 10:03:12 +08:00 |
|
lizanle
|
2eca28a10d
|
LastName 姓
FirstName 名
|
2015-12-23 10:02:54 +08:00 |
 guange
|
fd746c25f3
|
文件下载改为base64传输
|
2015-12-22 16:11:09 +08:00 |
|
ouyangxuhua
|
2220e0b7cc
|
增加帖子-组织栏目关联表
|
2015-12-22 15:48:41 +08:00 |
|
guange
|
22d8fc9abd
|
作业附件乱码优化
|
2015-12-22 15:45:17 +08:00 |
|
cxt
|
1623d846f4
|
动态的展开更多改成点击展开更多
|
2015-12-22 15:14:03 +08:00 |
|
huang
|
0e68266f49
|
版本库显示调整
|
2015-12-22 10:59:09 +08:00 |
|
cxt
|
1a042fd822
|
组织首页的加载更多动态重复加载
|
2015-12-22 10:54:27 +08:00 |
|
cxt
|
6f12ba883d
|
学生作品列表的tag显示不对
|
2015-12-22 09:49:18 +08:00 |
|
huang
|
4111cb53dc
|
解决fork部分项目404问题
|
2015-12-21 17:13:13 +08:00 |
|
cxt
|
96b2c363f5
|
Merge branch 'develop' into cxt_course
|
2015-12-21 17:03:44 +08:00 |
|
cxt
|
c8760445ab
|
Merge branch 'develop' of https://git.trustie.net/jacknudt/trustieforge into develop
|
2015-12-21 17:00:28 +08:00 |
|
cxt
|
a5cc1390f2
|
学生匿评打分时必须填写评语
|
2015-12-21 17:00:01 +08:00 |
|
huang
|
0d311fa405
|
Merge branch 'develop' into hjq_new_course
|
2015-12-21 16:52:28 +08:00 |
|
huang
|
849bc87950
|
Merge branch 'hjq_new_course' into develop
|
2015-12-21 16:47:26 +08:00 |
 houxiang
|
240a859f2d
|
Merge branch 'hjq_new_course' of https://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2015-12-21 16:45:58 +08:00 |
|
houxiang
|
21461fb583
|
修正了以前的方法调用 by 侯翔
|
2015-12-21 16:45:16 +08:00 |
|
huang
|
91d42ac7d4
|
Merge branch 'hjq_new_course' into develop
|
2015-12-21 16:30:58 +08:00 |
|
huang
|
471e5f5370
|
Merge branch 'hjq_new_course' of http://git.trustie.net/jacknudt/trustieforge into hjq_new_course
|
2015-12-21 16:29:58 +08:00 |
|
huang
|
771666f568
|
Merge branch 'develop' into hjq_new_course
|
2015-12-21 16:29:46 +08:00 |
|
houxiang
|
3e57237969
|
修改了整个提交记录总数，运用了黄总的修改的gitlab API by 侯翔
|
2015-12-21 16:21:39 +08:00 |
|
houxiang
|
e8511a6210
|
modify the gemfile conflict by hx
|
2015-12-21 16:00:35 +08:00 |
|
guange
|
1724ae430e
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-21 15:15:48 +08:00 |
|
guange
|
b235e8de70
|
改为默认模板
|
2015-12-21 15:15:39 +08:00 |
|
guange
|
8cdd7c58cf
|
at名单加宽一点
|
2015-12-21 15:14:51 +08:00 |
|
guange
|
bb94a41435
|
红点中包含at的消息
|
2015-12-21 15:11:41 +08:00 |
|
huang
|
26c5c88757
|
Merge branch 'szzh' into develop
|
2015-12-21 14:49:51 +08:00 |
|
huang
|
c29ab5dc6d
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-21 14:49:17 +08:00 |
|
huang
|
f94154560b
|
Merge branch 'develop' into szzh
|
2015-12-21 14:49:08 +08:00 |
|
huang
|
3e6000a7a3
|
Merge branch 'hjq_new_course' into develop
|
2015-12-21 14:37:04 +08:00 |