 sw
|
20e80944a5
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 17:43:56 +08:00 |
 z9hang
|
9fcdaee0cc
|
课程讨论区回复后附件消失问题
|
2015-03-27 17:42:28 +08:00 |
|
sw
|
10515adc5c
|
课程通知和讨论区回复样式不对
|
2015-03-27 17:00:21 +08:00 |
|
z9hang
|
a89826f171
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 17:00:17 +08:00 |
|
z9hang
|
1c8b4c5bdd
|
去除导出ATOM
|
2015-03-27 16:59:52 +08:00 |
|
sw
|
b55ef84c9c
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 16:55:37 +08:00 |
|
sw
|
7fa8ccad7c
|
课程通知和讨论区编辑、新建时宽度不对
|
2015-03-27 16:55:23 +08:00 |
|
z9hang
|
a1e1e2dedf
|
课程讨论区，新建，编辑界面调整
|
2015-03-27 16:53:36 +08:00 |
|
sw
|
dc4686d130
|
去掉跟踪功能
|
2015-03-27 16:45:47 +08:00 |
|
z9hang
|
e10c747a5f
|
修改通知附件样式
|
2015-03-27 16:41:28 +08:00 |
|
z9hang
|
35e0f73345
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 16:23:19 +08:00 |
|
z9hang
|
cc2cce22cf
|
讨论区附件样式修改
|
2015-03-27 16:23:09 +08:00 |
|
sw
|
61ddfc6363
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 16:13:20 +08:00 |
|
sw
|
6a9abf12b9
|
1、当问卷描述过长，显示超过页面
2、描述未对齐
|
2015-03-27 16:11:56 +08:00 |
|
sw
|
8374ba1995
|
配置课程是对齐单选框
|
2015-03-27 16:05:38 +08:00 |
|
z9hang
|
acb01e452b
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 16:02:28 +08:00 |
|
z9hang
|
1c53731966
|
留言框样式调整
|
2015-03-27 16:02:06 +08:00 |
|
sw
|
1e3b28d4bd
|
修改上传图片样式
|
2015-03-27 15:57:47 +08:00 |
|
sw
|
9c8d402056
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 15:41:56 +08:00 |
|
sw
|
52acd8981f
|
修改上传文件样式
|
2015-03-27 15:41:28 +08:00 |
|
z9hang
|
5ec28d8fc3
|
置顶贴子显示
|
2015-03-27 15:39:59 +08:00 |
|
sw
|
7b70369438
|
上传文件样式调整
|
2015-03-27 15:19:13 +08:00 |
|
sw
|
a320956ccc
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 15:13:40 +08:00 |
|
sw
|
472ff76c72
|
启动匿评时弹框位置问题
|
2015-03-27 15:13:03 +08:00 |
|
z9hang
|
ef7949584c
|
课程资源tag点击报错问题，回退后删除无效问题
|
2015-03-27 15:02:13 +08:00 |
|
z9hang
|
41e372c16a
|
上传资源按钮样式调整
|
2015-03-27 14:51:59 +08:00 |
|
sw
|
8ee6f8a6f9
|
解决冲突丢失问题
|
2015-03-27 14:25:17 +08:00 |
|
sw
|
b9031095d4
|
Merge branch 'szzh' into sw_new_course
Conflicts:
Gemfile
app/controllers/courses_controller.rb
app/views/attachments/_form.html.erb
app/views/attachments/_form_course.html.erb
app/views/files/_attachement_list.html.erb
app/views/layouts/base.html.erb
app/views/layouts/base_projects.html.erb
config/locales/zh.yml
public/javascripts/attachments.js
|
2015-03-27 14:13:49 +08:00 |
|
sw
|
c68349803e
|
1、课程讨论区、通知提示信息样式
2、整理js
|
2015-03-27 13:42:15 +08:00 |
|
sw
|
83dfcdcc02
|
学生可以发帖
|
2015-03-27 11:57:49 +08:00 |
|
z9hang
|
bdaf574266
|
修改发布新帖，发布课程通知链接
|
2015-03-27 11:55:18 +08:00 |
|
z9hang
|
61b220c913
|
课程资源库删除资源tag失效问题
|
2015-03-27 11:28:27 +08:00 |
|
sw
|
240fc240e6
|
修改默认图片
修改上传按钮样式
|
2015-03-27 09:51:20 +08:00 |
|
sw
|
fcbcdffa44
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
Conflicts:
public/stylesheets/courses.css
|
2015-03-27 09:33:41 +08:00 |
|
sw
|
519c119543
|
修改上传文件样式
|
2015-03-27 09:32:13 +08:00 |
|
z9hang
|
d8da3bb73c
|
课程通知列表显示多一个空行问题
|
2015-03-27 09:05:43 +08:00 |
|
z9hang
|
b3acbec2e1
|
上传资源弹框样式修改
|
2015-03-26 20:35:40 +08:00 |
|
z9hang
|
ddecd61926
|
课程资源添加标签时无样式问题
|
2015-03-26 20:17:47 +08:00 |
|
sw
|
a99dda837a
|
课程动态描述过长超出界面
|
2015-03-26 19:11:06 +08:00 |
|
z9hang
|
b8ab3770f1
|
资源样式冲突调整
|
2015-03-26 19:10:27 +08:00 |
|
sw
|
9a2f572cf4
|
是否启用匿评功能异常
|
2015-03-26 19:06:17 +08:00 |
|
z9hang
|
cb498a44a6
|
去除多出的发布通知按钮
|
2015-03-26 19:04:47 +08:00 |
|
z9hang
|
a59677c22e
|
课程通知展开信息按钮显示隐藏控制
|
2015-03-26 19:02:40 +08:00 |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
2015-03-26 19:01:22 +08:00 |
|
sw
|
ed92faaedd
|
关闭课程与重开课程js
|
2015-03-26 18:12:24 +08:00 |
|
z9hang
|
2c5c261b70
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-26 17:41:43 +08:00 |
|
z9hang
|
e1afdab988
|
留言样式修改
|
2015-03-26 17:41:25 +08:00 |
|
sw
|
0d04eb745f
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-26 17:18:27 +08:00 |
|
sw
|
cb1fce32fe
|
配置课程
|
2015-03-26 17:17:31 +08:00 |
 lizanle
|
c704ba71d9
|
提出按ckeditor
|
2015-03-26 16:18:34 +08:00 |