 sw
|
94ecc3e59e
|
1、课程新增成员分页控件样式
2、课程老师列表翻页不可用
|
2015-03-30 17:03:20 +08:00 |
|
sw
|
ed02959e00
|
修改成员角色
|
2015-03-30 15:57:10 +08:00 |
|
sw
|
083a3b9de6
|
1、课程成员列表显示昵称
2、添加课程成员功能
|
2015-03-30 13:47:19 +08:00 |
|
sw
|
98bf8dd494
|
课程成员列表显示
|
2015-03-30 11:20:16 +08:00 |
|
sw
|
046536230c
|
增加课程配置界面、成员的基本信息以及相关js
|
2015-03-30 10:47:23 +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
|
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 |
 huang
|
582c70a96c
|
修改项目讨论区未选择置顶/锁定选项时显示异常
|
2015-03-27 16:25:39 +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 |
|
sw
|
07de1f3de1
|
教师字体颜色不正确
|
2015-03-27 16:24:11 +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 |
|
z9hang
|
1c53731966
|
留言框样式调整
|
2015-03-27 16:02:06 +08:00 |
|
sw
|
1e3b28d4bd
|
修改上传图片样式
|
2015-03-27 15:57:47 +08:00 |
|
sw
|
7b70369438
|
上传文件样式调整
|
2015-03-27 15:19: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
|
2ca2f90830
|
上传文件js问题
|
2015-03-27 14:21:10 +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
|
9629e3be11
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-27 11:32:20 +08:00 |
|
sw
|
65824be778
|
修改css
|
2015-03-27 11:32:13 +08:00 |
|
z9hang
|
15f0058374
|
修正课程资源界面搜索按钮样式
|
2015-03-27 11:14:49 +08:00 |
|
sw
|
240fc240e6
|
修改默认图片
修改上传按钮样式
|
2015-03-27 09:51:20 +08:00 |
|
sw
|
8c795edf9e
|
解决冲突
|
2015-03-27 09:33:56 +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 |
|
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
|
a59677c22e
|
课程通知展开信息按钮显示隐藏控制
|
2015-03-26 19:02:40 +08:00 |
|
sw
|
cba678a357
|
课程是否启用匿评
课程作业列表样式
加入与退出课程按钮样式
|
2015-03-26 19:01:22 +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
|
d1bc2b85d0
|
kindeditor。
|
2015-03-26 16:12:03 +08:00 |
|
sw
|
8f90fed8be
|
新建课程界面完成
|
2015-03-26 16:01:25 +08:00 |
|
z9hang
|
57dad3f3c7
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-26 15:55:21 +08:00 |
|
z9hang
|
8ef9779b46
|
修正课程讨论区样式。修正项目讨论区被影响的样式
|
2015-03-26 15:55:07 +08:00 |
|
lizanle
|
72eff3a032
|
Merge remote-tracking branch 'origin/szzh' into szzh
|
2015-03-26 15:25:51 +08:00 |
|
huang
|
26ed40f7e1
|
学生作业列表样式调整
|
2015-03-26 14:31:24 +08:00 |
|
sw
|
090190f3e6
|
Merge branch 'sw_new_course' of http://repository.trustie.net/xianbo/trustie2 into sw_new_course
|
2015-03-26 11:56:13 +08:00 |
|
sw
|
c8a08d5a56
|
1、切换分班功能
2、非老师用户不能编辑、删除分班
|
2015-03-26 11:55:42 +08:00 |
|
sw
|
ab7d12e514
|
1、修改、删除分班是js方法重构
2、验证分班名是否重复重构
|
2015-03-26 11:30:00 +08:00 |