 daiao
|
adf6ca742f
|
实训宽版tpi
|
2017-03-30 16:35:37 +08:00 |
|
daiao
|
09bb152fea
|
实训tpm
|
2017-03-30 13:39:34 +08:00 |
|
daiao
|
60355b3276
|
实训tpi界面调整
|
2017-03-30 10:55:43 +08:00 |
 huang
|
bac27107f5
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-30 10:44:35 +08:00 |
|
huang
|
a7bad19b8d
|
下一关
|
2017-03-30 10:43:58 +08:00 |
|
daiao
|
c5c229ca30
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-30 10:06:06 +08:00 |
|
daiao
|
b070292b45
|
实训任务通关展示
|
2017-03-30 10:05:55 +08:00 |
|
huang
|
1e37c83d63
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-30 09:53:49 +08:00 |
|
huang
|
d4aac72822
|
下一关修正
|
2017-03-30 09:53:28 +08:00 |
|
daiao
|
eea8939c49
|
实训tpi
|
2017-03-30 09:04:52 +08:00 |
|
daiao
|
b744b9786f
|
实训弹框高度调整
|
2017-03-29 17:48:47 +08:00 |
|
daiao
|
2aaaf5469a
|
实训过关/通关弹框
|
2017-03-29 17:44:02 +08:00 |
|
huang
|
50caa50898
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-29 16:09:42 +08:00 |
|
huang
|
690ef2de28
|
版本库文件编辑界面
|
2017-03-29 16:09:26 +08:00 |
|
daiao
|
e01bf2f978
|
实训Utf-8
|
2017-03-29 16:07:54 +08:00 |
|
daiao
|
34dd39e5c3
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-29 15:41:43 +08:00 |
|
daiao
|
6ab6540c35
|
底部加入margin值
|
2017-03-29 15:41:21 +08:00 |
|
huang
|
1bb2363b09
|
tpi样式调整
|
2017-03-29 15:40:54 +08:00 |
|
huang
|
bfdb109b64
|
game index
|
2017-03-29 15:04:24 +08:00 |
|
huang
|
ff20a493e5
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
Conflicts:
app/views/games/_game_show.html.erb
app/views/layouts/base_myshixun.html.erb
|
2017-03-29 14:55:35 +08:00 |
|
huang
|
574e59453d
|
去掉base报错信息
|
2017-03-29 14:54:26 +08:00 |
|
huang
|
287de92129
|
修改game结构，从challenge中获取公共属性
|
2017-03-29 14:51:57 +08:00 |
|
daiao
|
1830e36652
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-29 14:34:36 +08:00 |
|
daiao
|
f597027de5
|
新框架下TPI实训任务
|
2017-03-29 14:34:14 +08:00 |
|
huang
|
123132cd62
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-29 14:26:11 +08:00 |
|
huang
|
b59f39754b
|
开启实训事务一致性处理
|
2017-03-29 14:25:54 +08:00 |
 Linda
|
20ad1e313e
|
md图标
|
2017-03-29 14:21:20 +08:00 |
|
huang
|
54e4ec526d
|
实训ceshi
|
2017-03-29 09:14:41 +08:00 |
|
huang
|
78fd0bbd8b
|
暂去统计
|
2017-03-28 17:16:46 +08:00 |
|
huang
|
a175c4ad37
|
shixun结构修改
|
2017-03-28 17:15:45 +08:00 |
|
huang
|
7a21a4332c
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-28 14:39:29 +08:00 |
|
huang
|
3719b8c973
|
实训入口
|
2017-03-28 14:39:07 +08:00 |
|
daiao
|
b45e5fbf9f
|
实训TPI
|
2017-03-28 14:06:42 +08:00 |
|
daiao
|
b97fb143bf
|
codemirror样式调整
|
2017-03-27 16:25:39 +08:00 |
|
huang
|
71cb5c297b
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-27 13:59:35 +08:00 |
|
huang
|
d68552a61f
|
版本库初始显示问题
|
2017-03-27 13:59:16 +08:00 |
|
daiao
|
aee9e19b02
|
实训TPI的CodeMirror
|
2017-03-27 10:59:01 +08:00 |
|
huang
|
1f36ec2636
|
添加日志打印
|
2017-03-26 11:39:09 +08:00 |
|
daiao
|
6594440c0d
|
codemirror第一行换号的问题
|
2017-03-26 11:01:42 +08:00 |
|
huang
|
ab3db9ac43
|
yangshi
|
2017-03-24 23:40:03 +08:00 |
|
huang
|
dc3ba4dab3
|
样式问题
|
2017-03-24 23:34:28 +08:00 |
|
huang
|
ad3a35ce6c
|
显示问题
|
2017-03-24 23:29:17 +08:00 |
|
huang
|
0329001ea2
|
不显示问题
|
2017-03-24 23:25:57 +08:00 |
|
huang
|
ba68647c1b
|
不能编辑的问题
|
2017-03-24 22:50:22 +08:00 |
|
huang
|
3c96615c09
|
js引用问题
|
2017-03-24 22:26:26 +08:00 |
|
huang
|
c14c0e7227
|
编辑调试
|
2017-03-24 22:23:08 +08:00 |
|
huang
|
b1a2fa3f29
|
编辑问题
|
2017-03-24 22:17:54 +08:00 |
|
huang
|
f3f0dd4a15
|
Merge branch 'dev_shixun_project' of https://git.trustie.net/jacknudt/trustieforge into dev_shixun_project
|
2017-03-24 21:55:47 +08:00 |
|
huang
|
608c034a3d
|
编辑问题
|
2017-03-24 21:55:38 +08:00 |
|
daiao
|
fa0d84738a
|
Form加号 删除失效
|
2017-03-24 21:46:07 +08:00 |