 guange
|
e3b395960c
|
base64的+号要处理一下
|
2015-12-25 17:46:45 +08:00 |
 cxt
|
8ed01bf572
|
issue列表报500
|
2015-12-25 17:16:47 +08:00 |
|
cxt
|
f63f38fb82
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 17:07:34 +08:00 |
|
cxt
|
bca503f171
|
追加附件必须填写描述
|
2015-12-25 17:07:27 +08:00 |
 huang
|
68751e53d0
|
Merge branch 'szzh' into develop
|
2015-12-25 16:36:02 +08:00 |
 Tim
|
445d5dc379
|
组织下拉菜单修改
|
2015-12-25 16:30:09 +08:00 |
|
huang
|
801651cba6
|
解决组织两个footer冲突问题
|
2015-12-25 16:16:06 +08:00 |
|
huang
|
533be61cf7
|
添加底部样式
|
2015-12-25 16:13:17 +08:00 |
|
huang
|
e5b4b9915d
|
添加footer图片
|
2015-12-25 16:06:24 +08:00 |
|
huang
|
5d1b63d6fa
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 16:05:07 +08:00 |
|
huang
|
7412c1caf6
|
添加footer
|
2015-12-25 16:04:49 +08:00 |
|
cxt
|
11bf8f77dc
|
Merge branch 'szzh' of https://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 15:59:33 +08:00 |
|
cxt
|
914c1ad369
|
Merge branch 'cxt_course' into szzh
|
2015-12-25 15:59:24 +08:00 |
|
cxt
|
7f133c860a
|
发布和编辑作业时可设置是否启用匿评
|
2015-12-25 15:57:30 +08:00 |
|
huang
|
9fd6f3b89f
|
Merge branch 'cxt_course' of http://git.trustie.net/jacknudt/trustieforge into cxt_course
|
2015-12-25 15:50:58 +08:00 |
|
huang
|
a16d6803ae
|
Merge branch 'szzh' of http://git.trustie.net/jacknudt/trustieforge into szzh
|
2015-12-25 15:48:41 +08:00 |
|
huang
|
a0c8e52d0a
|
Merge branch 'hjq_new_course' into szzh
|
2015-12-25 15:48:00 +08:00 |
|
huang
|
f4fc978b23
|
课程留言bug
|
2015-12-25 15:47:22 +08:00 |
|
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 |
|
cxt
|
b8d8cece02
|
关联项目的样式修改
|
2015-12-25 14:56:08 +08:00 |
|
cxt
|
aa653d558f
|
作品确认弹框的按钮样式调整
|
2015-12-25 11:26:48 +08:00 |
|
cxt
|
0b42430e2d
|
课程通知动态无法回复
|
2015-12-25 11:10:26 +08:00 |
|
cxt
|
ce5f0eb855
|
关联项目的样式修改
|
2015-12-25 11:00:41 +08:00 |
|
huang
|
e7a109d28f
|
Merge branch 'develop' into hjq_new_course
|
2015-12-25 10:40:40 +08:00 |
|
cxt
|
e86778a9c7
|
删除不存在的留言动态
|
2015-12-25 10:13:29 +08:00 |
|
huang
|
ad46564545
|
test
|
2015-12-25 10:06:48 +08:00 |
|
huang
|
a92d33300b
|
里程碑 添加 “已解决”，区分已解决和已关闭
|
2015-12-24 17:18:52 +08:00 |
|
cxt
|
3e39eacd19
|
新建课程通知时通知标题框自动获取焦点
|
2015-12-24 16:45:45 +08:00 |
|
huang
|
f7f03b2094
|
0
|
2015-12-24 16:10:41 +08:00 |
|
huang
|
8639609832
|
切换分支--暂时待处理
|
2015-12-24 15:42:05 +08:00 |
|
cxt
|
82fa0f0aaf
|
公开的课程不勾选“学生列表公开”，但非课程成员却可以通过url访问该课程学生列表
|
2015-12-24 15:28:11 +08:00 |
|
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 |