 daiao
|
4584276cbd
|
Merge branch 'dev_daiao' into develop
|
2017-06-16 15:33:31 +08:00 |
 cxt
|
1aa0ce78c3
|
新版题库
|
2017-06-16 15:18:41 +08:00 |
|
cxt
|
72369ff2fd
|
班级作业的设置和列表变更
|
2017-06-14 15:01:44 +08:00 |
|
daiao
|
91d3bc04b5
|
个人主页的课堂列表和实训列表底部的“点击查看全部”更换成换页
|
2017-06-14 10:27:49 +08:00 |
|
cxt
|
cb12147d11
|
作品补交、补交附件
|
2017-06-14 09:25:09 +08:00 |
|
daiao
|
7e8eb7eae5
|
我的留言页面去掉左侧栏，把留言提上来，1200宽
|
2017-06-13 14:45:11 +08:00 |
|
daiao
|
841c334c33
|
个人主页的tab样式与“我的实训”保持一致
|
2017-06-13 10:22:09 +08:00 |
|
cxt
|
a57b533be8
|
导入资源的页面，cheekbox和资源名称没有对齐
|
2017-06-12 14:29:36 +08:00 |
|
cxt
|
e8ad9326ea
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-09 21:01:41 +08:00 |
|
cxt
|
4ebc4ce5aa
|
同一个楼层中有好几个评论，点击该楼层中每个评论下回复都应该只出现当前回复框
|
2017-06-09 19:03:23 +08:00 |
 huang
|
ac843971a0
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-09 16:55:56 +08:00 |
|
huang
|
3b57616986
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
public/stylesheets/css/edu-class.css
|
2017-06-09 16:55:22 +08:00 |
|
huang
|
b1d859405f
|
修改我的实训链接
|
2017-06-09 16:37:18 +08:00 |
|
huang
|
809a580cca
|
添加我的实训功能
|
2017-06-09 16:17:31 +08:00 |
|
cxt
|
a86d2bf7fe
|
作业列表页面除了提交状态的可以导出作品，其他状态的点击导出作品无效果
|
2017-06-09 15:21:05 +08:00 |
|
cxt
|
0f95f258b5
|
班级动态页面需要删除匿评时间后的+0800
|
2017-06-08 11:27:18 +08:00 |
|
cxt
|
400c9e7703
|
资源页面的公共资源cheekbox点击无效果
|
2017-06-08 09:28:00 +08:00 |
|
cxt
|
f58ddd65a6
|
班级资源的导入资源改版
|
2017-06-07 16:19:23 +08:00 |
|
cxt
|
75b37651fa
|
班级资源页面的发送点击无效，应该与课程的选用按钮相类似
|
2017-06-06 17:20:33 +08:00 |
|
cxt
|
cfe48f6295
|
班级动态中作业标签应该与作业列表中的一致
|
2017-06-06 14:41:57 +08:00 |
|
cxt
|
44441a6448
|
个人主页的粉丝和关注“查看更多”请先隐藏
|
2017-06-05 09:55:15 +08:00 |
|
cxt
|
be384a9714
|
只绑定了电话没有绑定邮箱，但是我的主页的账户安全显示不正确
|
2017-06-02 20:42:30 +08:00 |
|
cxt
|
94f242058e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-02 16:18:20 +08:00 |
|
cxt
|
c520c31640
|
弹框调整
|
2017-06-02 14:52:07 +08:00 |
|
daiao
|
2c73689a68
|
个人主页的课堂和实训“点击查看全部”样式问题
|
2017-06-02 14:47:25 +08:00 |
|
daiao
|
d70daee85d
|
主页的快速入口为空时标题栏显示样式调整
|
2017-06-02 14:34:27 +08:00 |
|
daiao
|
b586665b74
|
没有数据显示时使用的图片更换
|
2017-06-01 11:16:54 +08:00 |
|
daiao
|
2c9861cd07
|
主页的快速入口为空时标题栏显示样式调整
|
2017-05-31 14:49:41 +08:00 |
|
daiao
|
3bff36094a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-27 11:08:17 +08:00 |
|
daiao
|
da610854e7
|
修改智能课堂的左侧功能条
|
2017-05-27 11:08:01 +08:00 |
|
cxt
|
dfb8e6f576
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/courses/settings.html.erb
|
2017-05-27 10:32:17 +08:00 |
 Linda
|
c2dbf57680
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-26 17:29:13 +08:00 |
|
Linda
|
aaf2726651
|
资源的“删除”垃圾箱出现的太早，导致资源名称很早就被“...”了
|
2017-05-26 15:56:51 +08:00 |
|
cxt
|
8454330981
|
作业动态的齿轮菜单内容请修正
|
2017-05-26 15:46:26 +08:00 |
|
cxt
|
4f7a52ef9d
|
作业动态内容区域加宽了，请多显示2个优秀作品
|
2017-05-26 14:37:26 +08:00 |
|
daiao
|
95956a5004
|
配置页面
|
2017-05-26 11:08:06 +08:00 |
|
cxt
|
cf05073a94
|
作品编辑页的附件显示位置有错位
|
2017-05-26 09:36:53 +08:00 |
|
Linda
|
7e9b21a472
|
个人主页的课堂和实训列表的分享隐藏
|
2017-05-25 10:40:21 +08:00 |
|
cxt
|
ce440eacb0
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/syllabuses/_syllabus_homeworks.html.erb
|
2017-05-24 21:07:32 +08:00 |
|
cxt
|
ef568dde5c
|
新建和编辑作业的页面，请将“资源库”的入口隐藏
|
2017-05-24 20:42:49 +08:00 |
|
Linda
|
0629b76705
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-24 17:36:30 +08:00 |
|
Linda
|
7ae8f91446
|
新建作业的页面样式有点问题
|
2017-05-24 15:41:55 +08:00 |
|
Linda
|
b2db96bf34
|
主页的实训列表icon请与课堂保持一致
|
2017-05-24 11:02:49 +08:00 |
|
cxt
|
b92d4d16ba
|
作业详情页回复的展开更多
|
2017-05-24 11:00:21 +08:00 |
|
cxt
|
55e04d2886
|
作业详情页的回复
|
2017-05-24 10:49:33 +08:00 |
|
cxt
|
49ca398d67
|
Merge branch 'dev_cxt' into develop
|
2017-05-23 22:56:23 +08:00 |
|
cxt
|
599869f970
|
作业的回复
|
2017-05-23 22:55:20 +08:00 |
|
huang
|
81294a0616
|
个人首页课程、实训超过8个点击跳至相应社区页
|
2017-05-23 20:06:24 +08:00 |
|
huang
|
128d840037
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-05-23 19:05:19 +08:00 |
|
huang
|
6a3f9673b5
|
Merge branch 'dev_cxt' into develop
|
2017-05-23 19:04:50 +08:00 |