 sw
|
1315740e7b
|
Merge branch 'szzh' into develop
|
2015-03-27 18:21:09 +08:00 |
 guange
|
f139427f03
|
Merge remote-tracking branch 'origin/szzh' into guange_dev
Conflicts:
app/controllers/zipdown_controller.rb
app/views/bids/_homework_list.html.erb
config/routes.rb
db/schema.rb
public/javascripts/attachments.js
|
2015-03-27 18:17:46 +08:00 |
|
sw
|
ef6526b4a7
|
Merge branch 'szzh' into develop
|
2015-03-27 17:45:56 +08:00 |
|
sw
|
21db854adb
|
Merge branch 'develop' into szzh
|
2015-03-27 17:45:08 +08:00 |
|
sw
|
fcc4275a36
|
Merge branch 'sw_new_course' into szzh
|
2015-03-27 17:44:29 +08:00 |
|
sw
|
c0fc22ea72
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-27 17:44:14 +08:00 |
|
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 |
|
sw
|
728f2896d8
|
windows下无法打断点
|
2015-03-27 17:43:19 +08:00 |
 z9hang
|
9fcdaee0cc
|
课程讨论区回复后附件消失问题
|
2015-03-27 17:42:28 +08:00 |
whimlex
|
cf4a8e08c5
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-27 17:00:42 +08:00 |
|
whimlex
|
54908423bc
|
课程--作业附件显示问题;问题跟踪附件显示问题
|
2015-03-27 17:00:23 +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 |
 huang
|
77241fd5ab
|
Merge branch 'szzh' of http://repository.trustie.net/xianbo/trustie2 into szzh
|
2015-03-27 16:26:12 +08:00 |
|
huang
|
582c70a96c
|
修改项目讨论区未选择置顶/锁定选项时显示异常
|
2015-03-27 16:25:39 +08:00 |
|
sw
|
07de1f3de1
|
教师字体颜色不正确
|
2015-03-27 16:24:11 +08:00 |
|
z9hang
|
38b4967eb5
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 16:23:53 +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 |
|
whimlex
|
3d2fc8e5ef
|
IE8
|
2015-03-27 15:21:48 +08:00 |
|
sw
|
7b70369438
|
上传文件样式调整
|
2015-03-27 15:19:13 +08:00 |
|
whimlex
|
762c83b26c
|
commit
|
2015-03-27 15:17:18 +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
|
ec2e9eaf26
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 14:28:27 +08:00 |
|
z9hang
|
e6e1d5342f
|
图片预览框样式问题
|
2015-03-27 14:26:25 +08:00 |
|
sw
|
8ee6f8a6f9
|
解决冲突丢失问题
|
2015-03-27 14:25:17 +08:00 |
|
sw
|
2ca2f90830
|
上传文件js问题
|
2015-03-27 14:21:10 +08:00 |
|
sw
|
9af60424c2
|
去除错误代码
|
2015-03-27 14:14:11 +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 |
|
sw
|
5e43b4c819
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 11:56:20 +08:00 |