 caishi
|
eb58421cd1
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/users/show.html.erb
public/stylesheets/css/edu-common.css
public/stylesheets/css/edu-public.css
|
2017-07-21 15:21:55 +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 |
 huang
|
b83a333a9d
|
Merge branch 'develop' into dev_cs
Conflicts:
app/views/shixuns/index.html.erb
|
2017-07-20 17:19:46 +08:00 |
|
daiao
|
c1933b5608
|
项目实训的阶段内容划分5个tab进行编辑
|
2017-07-20 16:25:44 +08:00 |
 cxt
|
9185ec12ff
|
课程实训的申请发布功能请补上
|
2017-07-20 15:51:55 +08:00 |
|
caishi
|
f3fd5a521d
|
班级讨论区页面
|
2017-07-20 15:48:49 +08:00 |
|
cxt
|
b86b465a76
|
TPI的问题反馈更新为“评论”，直接在TPI中显示评论tab
|
2017-07-19 17:26:22 +08:00 |
|
daiao
|
75930637c0
|
个人主页列表细分tab显示
|
2017-07-18 15:24:12 +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
|
1726221c69
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-14 15:40:11 +08:00 |
|
daiao
|
3e4f551283
|
Merge branch 'dev_daiao' into develop
|
2017-07-14 15:04:25 +08:00 |
|
cxt
|
73fabce2bb
|
Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop
|
2017-07-14 09:58:42 +08:00 |
|
cxt
|
5535bfc62e
|
课程实训的新建编辑
|
2017-07-14 09:58:20 +08:00 |
|
huang
|
bf0b3c1031
|
TPM版本库添加修改文件对比功能
|
2017-07-13 16:15:46 +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
|
65a2355730
|
课程实训
|
2017-07-13 09:20:25 +08:00 |
|
daiao
|
f8095f5bcc
|
超级管理员的实训菜单“已发布实训”
|
2017-07-12 16:23:57 +08:00 |
|
daiao
|
429127fc47
|
顶部导航栏的搜索结果显示优化
|
2017-07-11 15:08:28 +08:00 |
|
daiao
|
2a2dd216b7
|
webssh+管理员实训页面
|
2017-07-10 15:13:11 +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 |
|
huang
|
535e8b7da9
|
管理员界面添加webssh选中功能
|
2017-07-07 17:22:50 +08:00 |
|
huang
|
5017464d68
|
Merge branch 'dev_cs' into dev_daiao
|
2017-07-07 16:27:00 +08:00 |
|
huang
|
65302fbc1d
|
Merge branch 'develop' into dev_cs
|
2017-07-07 15:43:49 +08:00 |
|
huang
|
d4c5d8b10e
|
admin 添加认证
|
2017-07-07 15:41:02 +08:00 |
|
huang
|
0a65ebb1d0
|
版本库添加在线编辑功能
|
2017-07-07 11:04:53 +08:00 |
|
cxt
|
7b9c59d6e8
|
基础数据加上“专业”、“课程”，实训的适用专业和课程
|
2017-07-06 17:52:59 +08:00 |
|
huang
|
cd67988902
|
tpi添加连接webssh及断开webssh接口
|
2017-07-06 11:32:13 +08:00 |
|
huang
|
0b2bdc526a
|
webssh.rb端口记录
|
2017-07-06 09:46:54 +08:00 |
|
huang
|
70c73444ca
|
Merge branch 'dev_daiao' of https://bdgit.trustie.net/hushasha/bigdata into dev_daiao
|
2017-07-05 14:16:54 +08:00 |
|
huang
|
624592281c
|
web ssh
|
2017-07-05 14:16:02 +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
|
adc677b0d8
|
作业设置改成整页保存
|
2017-07-04 14:20:25 +08:00 |
|
daiao
|
e2ccab60d6
|
管理员用户列表
|
2017-07-04 10:40:17 +08:00 |
|
daiao
|
398455fdde
|
Merge branch 'dev_daiao' into develop
|
2017-07-04 09:57:48 +08:00 |
|
daiao
|
0bdd38d264
|
管理员用户列表页面
|
2017-07-04 09:51:51 +08:00 |
|
huang
|
40b276e386
|
添加webssh测试调试
|
2017-07-03 17:06:55 +08:00 |
|
huang
|
70940aa38b
|
实训开启逻辑不合理处理，改成点击后判断逻辑及弹框
|
2017-06-30 14:04:32 +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
|
ccc4188291
|
个人主页显示临时调整方案
|
2017-06-30 09:35:52 +08:00 |
|
cxt
|
5508cedb45
|
实训作业
|
2017-06-28 15:23:09 +08:00 |
|
cxt
|
725697392e
|
自己评阅的历史记录应该可以删除，最新的不可以删除、连续评阅不成功
|
2017-06-27 15:04:34 +08:00 |
|
huang
|
03c41dfd06
|
解决冲突
|
2017-06-23 12:13:35 +08:00 |
|
daiao
|
e2c15578c4
|
Merge branch 'dev_daiao' into develop
Conflicts:
app/controllers/managements_controller.rb
config/routes.rb
|
2017-06-23 11:20:15 +08:00 |
|
daiao
|
395eb0244c
|
实训预备知识增加编辑功能
|
2017-06-23 08:57:56 +08:00 |
|
daiao
|
69d5a6eafb
|
用户试用认证
|
2017-06-22 17:03:00 +08:00 |
|
huang
|
a49c741aae
|
Merge branch 'dev_huang' of https://bdgit.trustie.net/hushasha/bigdata into dev_huang
|
2017-06-22 16:22:43 +08:00 |
|
huang
|
164ac37005
|
实训的一些修改
|
2017-06-22 16:21:47 +08:00 |