 XuCheng642
|
6b8956e9ef
|
其他用户头像去除点击事件 课程搜索
|
2017-10-13 23:28:34 +08:00 |
 cxt
|
3f027ea05c
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/games/_game_show.html.erb
|
2017-10-13 18:57:16 +08:00 |
 daiao
|
9a798f3944
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/praise_tread/_edu_praise.html.erb
app/views/users/show.html.erb
|
2017-10-13 18:53:32 +08:00 |
|
cxt
|
b3fbfb2197
|
Merge branch 'dev_cs' into develop
|
2017-10-13 18:48:41 +08:00 |
|
cxt
|
dc88bad0fa
|
Merge branch 'dev_cxt' into develop
|
2017-10-13 18:47:48 +08:00 |
 miss
|
37ef75c4c9
|
全部实训首页的排版错乱问题
|
2017-10-13 18:46:06 +08:00 |
 caishi
|
5f928d4188
|
公共题库认证提示
|
2017-10-13 14:39:48 +08:00 |
|
caishi
|
3039110297
|
发送、确定、评测等按钮改为橙色背景
|
2017-10-13 10:43:06 +08:00 |
|
caishi
|
3d503336e0
|
橙色按钮
|
2017-10-13 10:15:43 +08:00 |
|
miss
|
d7cbe6e5ce
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-10-13 09:58:27 +08:00 |
|
miss
|
4c42d42cf2
|
分班样式的调整以及资源删除的样式调整
|
2017-10-13 09:57:47 +08:00 |
|
cxt
|
c7dc2a7878
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-10-12 17:34:30 +08:00 |
|
cxt
|
f9f1e25965
|
试卷相关
|
2017-10-12 17:34:14 +08:00 |
|
XuCheng642
|
797aac75b5
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-10-12 17:04:29 +08:00 |
|
XuCheng642
|
ee9dc6c6aa
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/controllers/managements_controller.rb
app/views/users/show.html.erb
|
2017-10-12 17:01:44 +08:00 |
|
XuCheng642
|
c72c4d2076
|
单位修改
|
2017-10-12 16:53:00 +08:00 |
|
miss
|
8bd27d4f3d
|
匿评申诉的样式问题
|
2017-10-12 16:17:06 +08:00 |
|
caishi
|
d1b1d6317d
|
新建课堂的课程名称增加tip
|
2017-10-12 16:06:45 +08:00 |
|
caishi
|
f9a36285fe
|
新建试卷时调整题目顺序，点击上下移动后tip不消失
|
2017-10-12 09:21:19 +08:00 |
|
caishi
|
cdf58a2709
|
实训作业和普通作业未提交tip
|
2017-10-11 14:55:34 +08:00 |
|
caishi
|
594a0a1d4a
|
Fork
|
2017-10-11 09:59:20 +08:00 |
|
caishi
|
c94e1ff079
|
作业说明外加Issues
|
2017-10-10 14:50:29 +08:00 |
|
caishi
|
ce33efba30
|
TPI评论
|
2017-10-09 17:23:17 +08:00 |
|
miss
|
abf89afc37
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 21:17:31 +08:00 |
 huang
|
2dd285f6e7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 21:06:25 +08:00 |
|
huang
|
c6c9507abe
|
文件目录添加根目录
|
2017-09-30 20:41:05 +08:00 |
|
caishi
|
274095eed2
|
合作者
|
2017-09-30 19:41:06 +08:00 |
|
caishi
|
c0f1c278d7
|
Merge branch 'dev_cs' into develop
|
2017-09-30 18:39:27 +08:00 |
|
caishi
|
c7ac2bdb41
|
Merge branch 'dev_cxt' into dev_cs
Conflicts:
app/views/messages/_course_show.html.erb
app/views/student_work/index.html.erb
|
2017-09-30 18:27:00 +08:00 |
|
miss
|
61a75ca0d7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 16:57:21 +08:00 |
|
miss
|
60707b1ed8
|
二次回复样式的冲突
|
2017-09-30 16:56:55 +08:00 |
|
cxt
|
0a5b79739a
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 16:34:31 +08:00 |
|
cxt
|
91ba070ca8
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/helpers/application_helper.rb
app/views/messages/_course_show.html.erb
app/views/student_work/index.html.erb
public/stylesheets/css/taskstyle.css
|
2017-09-30 16:33:07 +08:00 |
|
miss
|
5afcbb72c6
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
# Conflicts:
# app/controllers/shixuns_controller.rb
# public/stylesheets/css/edu-public.css
|
2017-09-30 16:18:36 +08:00 |
|
huang
|
b1e1ffcf80
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-30 15:33:48 +08:00 |
|
caishi
|
f8320101a5
|
TPI遮罩层
|
2017-09-30 14:53:58 +08:00 |
|
cxt
|
799d97d640
|
老师评阅
|
2017-09-30 14:36:17 +08:00 |
|
huang
|
3c19e12081
|
实训版本库代码同步功能
|
2017-09-30 10:42:26 +08:00 |
|
caishi
|
7c23cd9948
|
动态新建
|
2017-09-30 10:29:59 +08:00 |
|
caishi
|
25691d9c65
|
论坛帖子详情显示
|
2017-09-30 09:33:38 +08:00 |
|
caishi
|
a0de6028e7
|
合作者弹框
|
2017-09-29 21:35:43 +08:00 |
|
caishi
|
82890205c5
|
Merge branch 'develop' into dev_cs
|
2017-09-29 21:23:27 +08:00 |
|
miss
|
aa9ab75149
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-09-29 21:11:25 +08:00 |
|
miss
|
12cebcb252
|
学员统计板块的金币值模块以及其它问题的修改。tip样式的增加与修改
|
2017-09-29 21:10:56 +08:00 |
|
XuCheng642
|
1cb048adae
|
样式
|
2017-09-29 16:41:40 +08:00 |
|
XuCheng642
|
d679111b41
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/views/shixuns/_shixun_top.html.erb
public/stylesheets/css/edu-common.css
|
2017-09-29 16:35:44 +08:00 |
|
XuCheng642
|
cbb648dd40
|
自动授权列表
|
2017-09-29 16:18:41 +08:00 |
|
caishi
|
f6aad05821
|
系统提示性弹框的文字请统一改为黑色333
实训TPM待审核状态的tip修改
|
2017-09-29 15:56:17 +08:00 |
|
cxt
|
e13bb9316f
|
试卷的插入、上下移动、删除等功能
|
2017-09-29 15:55:37 +08:00 |
|
caishi
|
c04cc8d889
|
成员管理
|
2017-09-28 16:51:14 +08:00 |