 daiao
|
a8891d3d4f
|
Merge branch 'dev_daiao' into develop
Conflicts:
public/stylesheets/css/edu-public.css
|
2017-08-04 14:11:26 +08:00 |
 cxt
|
c25b584898
|
实名认证和职业认证
|
2017-08-04 11:20:28 +08:00 |
|
daiao
|
397e59e5d1
|
html实训
|
2017-08-04 09:38:10 +08:00 |
|
daiao
|
7a889642c4
|
个人主页关注与粉丝页面
|
2017-08-02 10:54:39 +08:00 |
|
daiao
|
6e1e199079
|
实训TPM“编程任务”改为“实践任务”
|
2017-07-31 13:54:10 +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
|
648e0548d6
|
用户单选题
|
2017-07-28 11:14:30 +08:00 |
|
daiao
|
2064dfb502
|
Merge branch 'develop' into dev_daiao
|
2017-07-27 10:27:36 +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 |
|
daiao
|
0bf70f145e
|
单选多选题的编辑/新建页面
|
2017-07-26 18:50:52 +08:00 |
|
daiao
|
f53e820774
|
我已经通过第2关未开启第3关，退出实训后继续实战进入的还是第1关，应该是当前任务第2关吧
|
2017-07-25 15:04:30 +08:00 |
|
daiao
|
8b225ae48c
|
个人主页优化
|
2017-07-24 16:42:46 +08:00 |
 caishi
|
f7ee05076b
|
Merge branch 'dev_daiao' into dev_cs
Conflicts:
app/views/layouts/_logined_header.html.erb
|
2017-07-24 14:53:43 +08:00 |
|
daiao
|
0892eb1472
|
个人主页调整
|
2017-07-24 14:49:37 +08:00 |
|
caishi
|
3410002b10
|
Merge branch 'dev_huang' into dev_cs
|
2017-07-24 10:53:36 +08:00 |
|
cxt
|
9a3fca4507
|
添加学生报500
|
2017-07-21 21:31:32 +08:00 |
|
cxt
|
293997b2da
|
班级添加学生
|
2017-07-21 20:00:12 +08:00 |
|
XuCheng642
|
dce824cb1a
|
Merge branch 'develop' into dev_xucheng
Conflicts:
config/routes.rb
|
2017-07-21 15:28:29 +08:00 |
|
XuCheng642
|
01cff7d3e4
|
课程实训的管理员申请页面
|
2017-07-21 15:26:07 +08:00 |
 huang
|
b4ff730229
|
创建答题选项
|
2017-07-21 14:21:10 +08:00 |
|
huang
|
52d27f1167
|
单选多选题编辑
|
2017-07-21 11:09:17 +08:00 |
|
daiao
|
06f73b6c82
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/views/courses/index.html.erb
app/views/shixuns/_form.html.erb
|
2017-07-21 10:00:45 +08:00 |
|
daiao
|
c1933b5608
|
项目实训的阶段内容划分5个tab进行编辑
|
2017-07-20 16:25:44 +08:00 |
|
XuCheng642
|
f11a305ecb
|
Merge branch 'develop' into dev_xucheng
Conflicts:
app/models/syllabus.rb
app/views/managements/shixuns.html.erb
|
2017-07-20 14:37:28 +08:00 |
|
XuCheng642
|
ba4910c33d
|
管理员相关界面
|
2017-07-20 14:34:44 +08:00 |
|
cxt
|
24a3fdc453
|
个人资料的真实姓名增加“隐藏真实姓名”选项
|
2017-07-20 11:14:46 +08:00 |
|
cxt
|
b86b465a76
|
TPI的问题反馈更新为“评论”，直接在TPI中显示评论tab
|
2017-07-19 17:26:22 +08:00 |
|
cxt
|
022f4526b8
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-18 14:52:54 +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 |
|
daiao
|
c06fb46f25
|
我已经通过第2关未开启第3关，退出实训后继续实战进入的还是第1关，应该是当前任务第2关吧
|
2017-07-18 09:11:52 +08:00 |
|
cxt
|
c25255dfd6
|
删除实训时关联删除课程实训
|
2017-07-17 10:51:37 +08:00 |
|
daiao
|
99ff8e401a
|
管理员实训页面列表搜索后SSH不能使用问题
|
2017-07-17 10:15:51 +08:00 |
|
daiao
|
94aaf39e55
|
用户认证
|
2017-07-14 16:50:24 +08:00 |
|
daiao
|
3e4f551283
|
Merge branch 'dev_daiao' into develop
|
2017-07-14 15:04:25 +08:00 |
|
cxt
|
7242bc73be
|
课程实训首页
|
2017-07-14 12:37:20 +08:00 |
|
cxt
|
5535bfc62e
|
课程实训的新建编辑
|
2017-07-14 09:58:20 +08:00 |
|
daiao
|
ca7d812266
|
Merge branch 'develop' into dev_daiao
|
2017-07-13 15:26:47 +08:00 |
|
daiao
|
49277f39a1
|
超级管理员的实训菜单“已关闭实训
|
2017-07-13 09:48:17 +08:00 |
|
cxt
|
0ebf73860e
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/layouts/_unlogin_header.html.erb
|
2017-07-13 09:22:26 +08:00 |
|
cxt
|
65a2355730
|
课程实训
|
2017-07-13 09:20:25 +08:00 |
|
daiao
|
b1ec3e9aac
|
首页实训的单个模块需要加上经验值的icon
|
2017-07-13 08:54:34 +08:00 |
|
huang
|
9ef47950f2
|
实训删除的时候关联删除myshixun
|
2017-07-12 14:07:48 +08:00 |
|
cxt
|
e6a3d8d455
|
课程实训
|
2017-07-11 17:16:28 +08:00 |
|
cxt
|
55e4ac5381
|
消息机制现在走的是留言，请在头像下拉菜单的留言右侧增加显示新消息的提示
|
2017-07-11 14:42:18 +08:00 |
|
cxt
|
4f3bc9a2e4
|
Merge branch 'dev_cxt' into develop
Conflicts:
app/controllers/shixuns_controller.rb
app/helpers/application_helper.rb
|
2017-07-07 18:25:44 +08:00 |
|
cxt
|
1f85875f9d
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
Conflicts:
app/views/courses/index.html.erb
|
2017-07-07 18:23:20 +08:00 |
|
cxt
|
5ba8c73f1b
|
实训首页的搜索
|
2017-07-07 16:17:45 +08:00 |