 caishi
|
a8378ebc2f
|
Merge branch 'dev_cs' into develop
|
2017-08-11 21:00:16 +08:00 |
|
caishi
|
d29910ee9a
|
加载效果的显示
|
2017-08-11 20:43:33 +08:00 |
|
caishi
|
5bb9e70f57
|
Merge branch 'dev_cs' into develop
|
2017-08-11 19:26:41 +08:00 |
|
caishi
|
0b2cbb0c9a
|
继续实战的加载效果
|
2017-08-11 19:25:07 +08:00 |
 cxt
|
c85db2fd5a
|
Merge branch 'dev_cs' into develop
|
2017-08-11 17:23:27 +08:00 |
|
caishi
|
d5a0492914
|
新增加载等待的样式
|
2017-08-11 17:21:42 +08:00 |
|
cxt
|
139a0597d8
|
Merge branch 'dev_xucheng' into develop
Conflicts:
app/views/layouts/base_management.html.erb
app/views/managements/_class_shixuns_list.html.erb
app/views/managements/_users_authorization_list.html.erb
app/views/managements/identity_authentication.html.erb
app/views/managements/shixun_authorization.html.erb
app/views/managements/subject_authorization.html.erb
config/routes.rb
public/javascripts/edu/account.js
public/javascripts/edu/syllabus.js
|
2017-08-11 15:20:56 +08:00 |
 XuCheng642
|
d3a67b42b2
|
超级管理员相关页面
|
2017-08-11 11:27:04 +08:00 |
|
cxt
|
14d7d8fa7a
|
课程的新建和编辑的下拉框调整
|
2017-08-10 17:30:53 +08:00 |
|
caishi
|
4a217fd38a
|
班级、课程页面改版
|
2017-08-10 09:21:48 +08:00 |
|
cxt
|
c25b584898
|
实名认证和职业认证
|
2017-08-04 11:20:28 +08:00 |
|
cxt
|
a18ce6d7cd
|
Merge branch 'dev_cs' into dev_cxt
|
2017-08-01 16:50:03 +08:00 |
|
cxt
|
780f0d22e1
|
班级作业和讨论区点击回复时回复框获取焦点
|
2017-08-01 16:23:22 +08:00 |
|
caishi
|
baacb95877
|
超级管理员tab切换样式修改
|
2017-08-01 14:57:35 +08:00 |
|
caishi
|
56d520c569
|
实训套件界面修改，以及tab样式的公用
|
2017-08-01 08:57:44 +08:00 |
 miss
|
55b5b7fd03
|
拖拽留白区域的解决
tip样式的完善
|
2017-07-31 16:12:24 +08:00 |
|
cxt
|
8f995d7b46
|
Merge branch 'dev_cxt' into develop
|
2017-07-28 17:00:27 +08:00 |
|
cxt
|
f82b8f0e20
|
班级讨论区的上线
|
2017-07-28 16:59:17 +08:00 |
 daiao
|
a61b4c244b
|
留言页面删除留言的弹出框需要替换新样式
|
2017-07-28 14:35:30 +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 |
|
cxt
|
4a0d8ab856
|
实训套件的编辑
|
2017-07-26 19:05:46 +08:00 |
|
cxt
|
a48483ef69
|
实训套件的编辑页面
|
2017-07-26 18:57:08 +08:00 |
|
cxt
|
160e1514ca
|
实训套件新建流程和查看页面布局变更：Step1-增加新建独立页
|
2017-07-25 15:41:36 +08:00 |
|
cxt
|
cbf111179b
|
实训新建、预备知识、配置页面的markdown自动保存
|
2017-07-21 10:03:30 +08:00 |
|
cxt
|
c15080f5da
|
作业列表页面删除作业时需要给出一个加载提示层
|
2017-07-20 16:50:30 +08:00 |
|
cxt
|
816e6d605e
|
基本资料增加“昵称”，个人主页显示“昵称”
|
2017-07-18 14:47:50 +08:00 |
|
cxt
|
9f1ee5e5da
|
first_level_discipline_id
|
2017-07-18 09:31:56 +08:00 |
|
cxt
|
7242bc73be
|
课程实训首页
|
2017-07-14 12:37:20 +08:00 |
|
cxt
|
5535bfc62e
|
课程实训的新建编辑
|
2017-07-14 09:58:20 +08:00 |
|
cxt
|
9cc454fa3b
|
课程的参考资料保存需要优化
|
2017-07-11 10:53:50 +08:00 |
|
cxt
|
627436e8a8
|
作业设置中的匿评点击无效果
|
2017-07-10 09:50:02 +08:00 |
|
cxt
|
4cf34198f0
|
编辑作业输入错误答案点击提交会弹出提示框，点击取消再去提交就会不给提示框就直接提交成功了
|
2017-07-07 21:10:55 +08:00 |
|
cxt
|
537bd14aa9
|
新建作业和题库时关掉提示信息后无法再次显示
|
2017-07-07 20:36:17 +08:00 |
|
cxt
|
7b9c59d6e8
|
基础数据加上“专业”、“课程”，实训的适用专业和课程
|
2017-07-06 17:52:59 +08:00 |
|
cxt
|
b9eef2c887
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-05 10:13:04 +08:00 |
|
cxt
|
cebd0c6c77
|
新建班级中的学分保留一位小数
|
2017-07-04 16:26:18 +08:00 |
|
cxt
|
adc677b0d8
|
作业设置改成整页保存
|
2017-07-04 14:20:25 +08:00 |
|
daiao
|
0bdd38d264
|
管理员用户列表页面
|
2017-07-04 09:51:51 +08:00 |
|
daiao
|
6ab954372a
|
管理员用户列表
|
2017-07-03 10:57:30 +08:00 |
|
cxt
|
c5510912ec
|
分组作业提示错误
|
2017-06-30 23:32:50 +08:00 |
|
cxt
|
6309eb1c80
|
火狐浏览器阻止enter键提交表单
|
2017-06-30 22:32:02 +08:00 |
|
cxt
|
5f71476e7a
|
课堂授课大纲颜色不正确
|
2017-06-30 19:46:48 +08:00 |
|
cxt
|
47ff17fbbb
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-30 16:28:35 +08:00 |
|
daiao
|
d61ac51c55
|
恢复示例代码没有显示转圈等待，突然就刷新了
|
2017-06-30 15:43:01 +08:00 |
|
cxt
|
3534ec2ac9
|
分组作业提交作业页面，小组成员搜索框输入关键字后回车，页面直接保存跳转至详情页面，应该回车同搜索效果
|
2017-06-30 14:40:01 +08:00 |
|
daiao
|
289ff1a329
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/users/_my_homepage_shixuns_list.html.erb
|
2017-06-30 09:54:09 +08:00 |
|
daiao
|
baa0809549
|
个人主页（翻页问题未解决）
|
2017-06-29 16:59:14 +08:00 |
|
cxt
|
5508cedb45
|
实训作业
|
2017-06-28 15:23:09 +08:00 |
|
cxt
|
0bd49899c7
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-06-23 20:02:29 +08:00 |