 caishi
|
a506fd76ca
|
增加icon，修改样式
|
2017-07-28 16:53:44 +08:00 |
|
caishi
|
81b74c879a
|
选择题样式问题
|
2017-07-28 16:25:17 +08:00 |
|
caishi
|
efc009e74c
|
Merge branch 'develop' into dev_cs
|
2017-07-28 15:59:58 +08:00 |
 daiao
|
e1280f0689
|
选择题样式问题
|
2017-07-28 15:55:54 +08:00 |
|
caishi
|
5e419c22c3
|
Merge branch 'develop' into dev_cs
|
2017-07-28 15:50:23 +08:00 |
|
caishi
|
ff13216f21
|
之前隐藏的“查看全部”，重新显示
点击之后，跳转页面，显示全部的人员信息
|
2017-07-28 15:48:11 +08:00 |
|
daiao
|
1280d9a332
|
编程题编辑报错
|
2017-07-28 15:38:58 +08:00 |
|
daiao
|
804c2ed76a
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/games/_game_show.html.erb
|
2017-07-28 15:08:46 +08:00 |
|
daiao
|
b80675034d
|
参考答案为空时，TPI不要显示这个tab
|
2017-07-28 15:04:10 +08:00 |
|
daiao
|
c30f941777
|
班级动态页面的回复删除的alert弹框需要替换新样式
|
2017-07-28 14:53:42 +08:00 |
 miss
|
e7fa442c44
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-28 14:46:03 +08:00 |
|
miss
|
8e7c1b907e
|
拖拽功能的修改。
实训页面的tip修改
|
2017-07-28 14:44:51 +08:00 |
|
daiao
|
a61b4c244b
|
留言页面删除留言的弹出框需要替换新样式
|
2017-07-28 14:35:30 +08:00 |
|
daiao
|
7aad622cf2
|
作业列表中私有作业标题前应该加上锁的icon
|
2017-07-28 14:20:12 +08:00 |
|
daiao
|
70c016ad07
|
Merge branch 'dev_cs' into dev_daiao
Conflicts:
public/stylesheets/css/edu-common.css
|
2017-07-28 14:10:08 +08:00 |
|
daiao
|
648e0548d6
|
用户单选题
|
2017-07-28 11:14:30 +08:00 |
|
daiao
|
6b0abd4703
|
tpi单选多选题
|
2017-07-28 10:40:37 +08:00 |
|
caishi
|
2c1ad468e4
|
作品评阅、作业编辑、作业设置、作业详情、作业补交、提交作业页面各版块需要加上阴影
班级页面固定弹框高度
更换tab公共样式背景色
|
2017-07-28 10:28:51 +08:00 |
|
daiao
|
9b4478d629
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-27 14:45:34 +08:00 |
|
daiao
|
2a7111c800
|
单选多选题
|
2017-07-27 14:44:27 +08:00 |
|
caishi
|
e073a618e9
|
样式修改
|
2017-07-27 14:44:24 +08:00 |
|
daiao
|
12dea63148
|
实训TPM参考答案
|
2017-07-27 14:30:26 +08:00 |
|
caishi
|
fb098385d2
|
Merge branch 'develop' into dev_cs
|
2017-07-27 13:50:47 +08:00 |
|
daiao
|
8fcd8fd02a
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-27 13:47:09 +08:00 |
|
caishi
|
f805839a55
|
TPI评论区样式修改
添加答题选项的tab
|
2017-07-27 12:44:40 +08:00 |
 huang
|
3834a26b6e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-27 12:32:35 +08:00 |
|
huang
|
2a2386915b
|
webssh添加语言接口
|
2017-07-27 12:32:22 +08:00 |
|
daiao
|
a55b1ec340
|
实训首页增加4中语言分类
|
2017-07-27 11:20:39 +08:00 |
|
daiao
|
36ae8a5f26
|
测试webssh
|
2017-07-27 11:08:50 +08:00 |
|
daiao
|
f576a3aa36
|
我的实训页面任务关卡完成情况需要与我的主页显示一致
|
2017-07-27 11:07:45 +08:00 |
 cxt
|
33c19ff949
|
Merge branch 'dev_xucheng' into develop
|
2017-07-27 10:55:33 +08:00 |
 XuCheng642
|
a348d23889
|
超级管理员的实训课程列表bug修复
|
2017-07-27 10:32:55 +08:00 |
|
daiao
|
2064dfb502
|
Merge branch 'develop' into dev_daiao
|
2017-07-27 10:27:36 +08:00 |
|
daiao
|
6ce887424b
|
tpm增加预备知识
|
2017-07-27 10:07:58 +08:00 |
|
cxt
|
e9e4b7177e
|
Merge branch 'dev_xucheng' into develop
Conflicts:
Gemfile
app/helpers/application_helper.rb
app/views/managements/_shixun_authorization_list.html.erb
|
2017-07-27 09:49:02 +08:00 |
|
XuCheng642
|
0621ceb861
|
超级管理员页面修改
|
2017-07-27 09:45:31 +08:00 |
|
caishi
|
e6467a9ec3
|
Merge branch 'develop' into dev_cs
|
2017-07-27 09:05:43 +08:00 |
|
cxt
|
2155c66058
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/users/_my_homepage_courses_list.html.erb
|
2017-07-27 09:00:20 +08:00 |
|
caishi
|
5188fb7059
|
个人主页
|
2017-07-26 21:16:45 +08:00 |
|
caishi
|
a211100e34
|
我的主页修改
|
2017-07-26 20:47:22 +08:00 |
|
caishi
|
4618aa6b69
|
Merge branch 'dev_cs' into develop
Conflicts:
app/views/users/_my_homepage_shixuns_list.html.erb
|
2017-07-26 20:46:14 +08:00 |
|
caishi
|
443266a5c0
|
导航栏和个人主页样式修改
|
2017-07-26 20:42:15 +08:00 |
|
huang
|
0781f11782
|
实训的一些修改
|
2017-07-26 20:41:09 +08:00 |
|
daiao
|
5fdd7e82f5
|
单选多选增加验证提醒
|
2017-07-26 20:32:48 +08:00 |
|
cxt
|
54420bcff9
|
我的课堂的时间调整
|
2017-07-26 20:32:13 +08:00 |
|
cxt
|
c220e83d4b
|
Merge branch 'dev_cs' into develop
|
2017-07-26 20:00:35 +08:00 |
|
cxt
|
3d2a03fe38
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-07-26 20:00:24 +08:00 |
|
caishi
|
248ab43b10
|
样式修改
|
2017-07-26 19:59:46 +08:00 |
|
cxt
|
e81bd33dea
|
Merge branch 'dev_cs' into develop
|
2017-07-26 19:41:52 +08:00 |
|
cxt
|
f2da429849
|
Merge branch 'dev_cs' of https://bdgit.trustie.net/hushasha/bigdata into dev_cs
|
2017-07-26 19:41:22 +08:00 |