p31729568
|
485f2c51eb
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
1ad0ee60aa
|
trainings: fix
|
6 years ago |
|
p31729568
|
e572e652d0
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
0e24d92643
|
tranings: fix bug
|
6 years ago |
|
p31729568
|
f84cfd45f0
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
e5a1bd5fc8
|
training: add offline later pay
|
6 years ago |
|
p31729568
|
4b1658681b
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
3ac89e3f65
|
training: add offline pay
|
6 years ago |
|
p31729568
|
6c3054f8a4
|
trainings: add pay and result page
|
6 years ago |
|
p31729568
|
8fddd8959e
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
48cf73dbbf
|
modify training
|
6 years ago |
 caishi
|
c15546369c
|
支付-发票类型
|
6 years ago |
|
caishi
|
8b27e66fc3
|
发票类型
|
6 years ago |
|
caishi
|
335988a0b1
|
支付折扣
|
6 years ago |
 杨树明
|
7f3f97b03d
|
调整题目多行显示体验
|
6 years ago |
|
p31729568
|
64cc6c9fb4
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
46450f2068
|
training: remove training category column
|
6 years ago |
|
p31729568
|
d387cbd409
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
8b716bf8af
|
trainings: fix require login
|
6 years ago |
|
p31729568
|
512797aeb4
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
7cebe3524f
|
trainings: fix 404
|
6 years ago |
|
p31729568
|
614eca8287
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
50f9946b6b
|
fix
|
6 years ago |
|
p31729568
|
87861d1bd7
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
b56921ca68
|
fix
|
6 years ago |
|
p31729568
|
3f6bf8d1f6
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
|
p31729568
|
e762fb336d
|
remove explan
|
6 years ago |
|
p31729568
|
e5dd2e40b7
|
merge
|
6 years ago |
|
p31729568
|
525b47e36c
|
modify
|
6 years ago |
|
p31729568
|
8ddfbcc7c7
|
training: add form check
|
6 years ago |
|
p31729568
|
1c52835c1a
|
training: enroll update
|
6 years ago |
|
p31729568
|
7d6c272f34
|
fix
|
6 years ago |
|
caishi
|
6fd2a01109
|
Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings
|
6 years ago |
|
caishi
|
37c529b356
|
支付
|
6 years ago |
 daiao
|
b407cd1057
|
创建课程体系报错
|
6 years ago |
cxt
|
7e7438d378
|
Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings
|
6 years ago |
|
cxt
|
d9e2f2d52e
|
tiaozn
|
6 years ago |
|
caishi
|
fa2adad9ab
|
Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings
Conflicts:
app/views/trainings/enroll.html.erb
|
6 years ago |
|
daiao
|
1519881efd
|
导出实训课程系统增加url
|
6 years ago |
|
caishi
|
b5730f6dcd
|
信息技术新工科产学研联盟师资研修
|
6 years ago |
|
daiao
|
94f1899930
|
课程等级体系导出excel
|
6 years ago |
|
cxt
|
f939186ca3
|
报名调整
|
6 years ago |
|
cxt
|
3e7cf794b6
|
大数据和人工智能的报名页
|
6 years ago |
|
cxt
|
15e50f3ee3
|
调整
|
6 years ago |
|
daiao
|
7126019a38
|
运营人员有权限查看课程相应列表的权限
|
6 years ago |
|
caishi
|
1fe13e8f4a
|
trainings(联盟师资培训)
|
6 years ago |
|
p31729568
|
2bcf334ecb
|
fix school management evaluate count incorrent error
|
6 years ago |
|
杨树明
|
620e510617
|
调整错误描述
|
6 years ago |
|
p31729568
|
5582c4a863
|
fix error because course not have end time
|
6 years ago |
|
daiao
|
32227c1f19
|
未发布的实训，实训管理员可以删除
|
6 years ago |
|
daiao
|
c62b4d9afa
|
最近一直出现cookies不对的情况，现在删除grape这边的cookies如果还出现就不是这个问题了
|
6 years ago |
|
daiao
|
00a1849f3b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
49deaab291
|
删除多余代码
|
6 years ago |
|
p31729568
|
4358dbbbcc
|
management user: fix search user bug && modify code to solve some n+1
|
6 years ago |
|
daiao
|
615fcd87f3
|
共享cookies
|
6 years ago |
|
daiao
|
bcbc37d66d
|
测试关闭共享cookies
|
6 years ago |
|
daiao
|
c19a6f26da
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
c4bd57e35c
|
注释共享cookies
|
6 years ago |
|
p31729568
|
2a6364b27e
|
management user: add province filter
|
6 years ago |
|
daiao
|
5b07b39fb2
|
运营人员也能查看课程
|
6 years ago |
|
daiao
|
aeec652649
|
1
|
6 years ago |
|
daiao
|
fa1c12a923
|
打印日志
|
6 years ago |
|
daiao
|
e7b89d797f
|
超级管理员回复是打开
|
6 years ago |
|
daiao
|
6eba1f21ac
|
实训评论超级管理员回复是公开的
|
6 years ago |
|
daiao
|
f1f3c69c4a
|
修复实训评论数不对的情况
|
6 years ago |
|
daiao
|
5d14b1862f
|
1
|
6 years ago |
|
daiao
|
f4f0a69873
|
1
|
6 years ago |
|
daiao
|
82295eef81
|
1
|
6 years ago |
|
daiao
|
09eed36ec6
|
1
|
6 years ago |
|
daiao
|
4072011dca
|
实训评论的回复
|
6 years ago |
|
cxt
|
c41ee264f4
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
cxt
|
7d34217b9e
|
用户注册的时候，如果选用的是老师身份，则给雅菲手机发送一条短信
|
6 years ago |
|
daiao
|
0901c8baa0
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
a0ea38196b
|
隐藏的实训除超级管理员外，其他人无法查看
|
6 years ago |
|
cxt
|
afc01ad67b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
p31729568
|
0e0396c539
|
fix school management sort bug
|
6 years ago |
|
p31729568
|
1523b992e0
|
modify school management view
|
6 years ago |
|
cxt
|
1ab1358aa9
|
Merge branch 'develop' into educoder
|
6 years ago |
|
p31729568
|
cb0b5a8880
|
fix
|
6 years ago |
|
p31729568
|
1829bada46
|
fix school management data incorrent bug
|
6 years ago |
|
cxt
|
186bdbd758
|
Merge branch 'develop' into educoder
|
6 years ago |
|
p31729568
|
9048780f31
|
fix management school data bug
|
6 years ago |
|
p31729568
|
10b31905ad
|
fix school management data incorrent bug
|
6 years ago |
|
p31729568
|
ef8b9bd5d3
|
fix school management grow data
|
6 years ago |
|
daiao
|
d66cdb9f60
|
Merge branch 'develop' into educoder
|
6 years ago |
|
p31729568
|
c9a38078e4
|
fix management school summary info bug
|
6 years ago |
|
daiao
|
0e94c25b8d
|
1
|
6 years ago |
|
daiao
|
1cdc0bdfd6
|
学校统计页面字面更改：
|
6 years ago |
|
p31729568
|
2aec2cafb7
|
fix bug
|
6 years ago |
|
p31729568
|
4ebe247633
|
modify management school report list && fix some bug
|
6 years ago |
|
daiao
|
c90f648219
|
1
|
6 years ago |
|
daiao
|
a53d2d3423
|
1
|
6 years ago |
|
daiao
|
55ae6091a7
|
测试退出登录的问题
|
6 years ago |
|
daiao
|
363b5ed00c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
0669dcf907
|
测试
|
6 years ago |
|
p31729568
|
319b3c1d0e
|
fix management school grow data incorrent
|
6 years ago |
|
daiao
|
41e897150b
|
超级管理页面，用户列表的更新用户信息的金币和经验链接错误
|
6 years ago |
|
p31729568
|
a720a5477b
|
remove ","
|
6 years ago |
|
p31729568
|
e1a8372b2b
|
management export school report xlsx add column
|
6 years ago |
 jingquan huang
|
b76f158df1
|
url优化
|
6 years ago |
|
jingquan huang
|
3a590d0580
|
Merge branch 'educoder' into develop
|
6 years ago |
|
jingquan huang
|
474a2d173c
|
react 问题
|
6 years ago |
|
jingquan huang
|
1a0ad14afb
|
500
|
6 years ago |
|
jingquan huang
|
b1551c9940
|
500
|
6 years ago |
|
jingquan huang
|
5f59d710d1
|
500
|
6 years ago |
|
jingquan huang
|
a2de61dc23
|
..
|
6 years ago |
|
jingquan huang
|
ce480703f4
|
..
|
6 years ago |
|
jingquan huang
|
d02c056427
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
808779e9bf
|
mooc
|
6 years ago |
|
jingquan huang
|
f1e83edd0b
|
mooc接口
|
6 years ago |
|
daiao
|
565f82c4aa
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
c1f6890f28
|
参数调整
|
6 years ago |
|
cxt
|
39c07c7b30
|
ttt
|
6 years ago |
|
cxt
|
1f3cf342ba
|
调整
|
6 years ago |
|
cxt
|
bf178e6647
|
调整
|
6 years ago |
|
cxt
|
f1c0c402eb
|
调整
|
6 years ago |
|
jingquan huang
|
b4d671be82
|
Merge branch 'educoder' into develop
|
6 years ago |
|
jingquan huang
|
1fc9ff448f
|
去掉接口分页
|
6 years ago |
 hjm
|
57171297c1
|
b
|
6 years ago |
|
hjm
|
939b575871
|
b
|
6 years ago |
|
p31729568
|
da6cdb5f58
|
fix school daily report task
|
6 years ago |
|
p31729568
|
c389f0f2a6
|
modify school active user count
|
6 years ago |
|
p31729568
|
f0d41767e7
|
modify school contrast order logical
|
6 years ago |
|
p31729568
|
ec8b047228
|
add shixun homework and shixun evaluate count to school daily report
|
6 years ago |
|
p31729568
|
15a2f16453
|
remove shixuns evaluate count code
|
6 years ago |
|
daiao
|
0d52d5fe4a
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
338e7aea69
|
1
|
6 years ago |
|
p31729568
|
b1155eca5c
|
remove game service increment evaluate count code
|
6 years ago |
|
hjm
|
9565048465
|
b
|
6 years ago |
|
jingquan huang
|
b3ffa73ed1
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
a112b47d21
|
vnc
|
6 years ago |
|
hjm
|
e26133f945
|
b
|
6 years ago |
|
p31729568
|
f19cbcb1c6
|
scholl management add shixun count and shixun evaluate count
|
6 years ago |
|
hjm
|
a958f2fa3f
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
hjm
|
3e8b1aa4d8
|
b
|
6 years ago |
|
jingquan huang
|
73128415d7
|
下载权限控制
|
6 years ago |
|
jingquan huang
|
b426ee47a0
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
867b6e2b72
|
下载参数梳理
|
6 years ago |
|
hjm
|
89fcc164e4
|
b
|
6 years ago |
|
jingquan huang
|
1754579a93
|
提供zip下载功能
|
6 years ago |
|
jingquan huang
|
0f20c7562d
|
add logger
|
6 years ago |
|
jingquan huang
|
3d49a48107
|
vnc免登录
|
6 years ago |
|
jingquan huang
|
ee6a57be5d
|
vnc
|
6 years ago |
|
jingquan huang
|
d1bebc1492
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
1f34e30a28
|
vnc在gamesow中自动调用
|
6 years ago |
|
daiao
|
cdeba2855b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
72e401d7d2
|
好大学字段命名修改
|
6 years ago |
|
p31729568
|
89acf0b0cd
|
modify school manager statistic text
|
6 years ago |
|
jingquan huang
|
03843caf39
|
500
|
6 years ago |
|
jingquan huang
|
0ddf6a7efd
|
vnc权限
|
6 years ago |
|
jingquan huang
|
228deb4794
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
972ad75518
|
vnc添加containers
|
6 years ago |
|
daiao
|
d3772615f8
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
eddd5e6144
|
1
|
6 years ago |
|
jingquan huang
|
8a45a61ef8
|
vnc免登陆
|
6 years ago |
|
jingquan huang
|
048c8571bc
|
vnc..
|
6 years ago |
|
jingquan huang
|
9c01b6ff77
|
vnc在gameshow中返回
|
6 years ago |
|
jingquan huang
|
a5c3034a3b
|
Merge branch 'educoder' into develop
|
6 years ago |
|
daiao
|
2df0d65ce7
|
1
|
6 years ago |
|
daiao
|
151ab55dbb
|
1
|
6 years ago |
|
daiao
|
99511fe5e6
|
1
|
6 years ago |
|
daiao
|
ba6df7b9b1
|
1
|
6 years ago |
|
daiao
|
2c980c14f5
|
1
|
6 years ago |
|
jingquan huang
|
7e87cd2f82
|
vnc
|
6 years ago |
|
daiao
|
46e1c04e01
|
1
|
6 years ago |
|
daiao
|
d36972bec9
|
1
|
6 years ago |
|
daiao
|
6ecea79dc3
|
1
|
6 years ago |
|
daiao
|
2a3bbc2909
|
1
|
6 years ago |
|
daiao
|
582e0b19c6
|
1
|
6 years ago |
|
daiao
|
b13bf24330
|
1
|
6 years ago |
|
daiao
|
d99036f918
|
1
|
6 years ago |
|
daiao
|
c3c0b8db98
|
1
|
6 years ago |
|
daiao
|
c6f4da3187
|
1
|
6 years ago |
|
daiao
|
51e4759bcc
|
1
|
6 years ago |
|
daiao
|
833a99dfb6
|
1
|
6 years ago |
|
daiao
|
4a42989a33
|
1
|
6 years ago |
|
daiao
|
8a24cf69de
|
1
|
6 years ago |
|
daiao
|
e8e65c8572
|
Merge branch 'develop' into educoder
|
6 years ago |
|
daiao
|
c86d364744
|
试用授权导出增加邮箱
|
6 years ago |
|
daiao
|
f3a25e9812
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
92a08caf95
|
1
|
6 years ago |
|
cxt
|
8337331103
|
后端-试卷、试卷题库的实训题增加改名称的功能
|
6 years ago |
|
daiao
|
0f359082e5
|
超级管理员评测时间详情页面增加最大执行时间
|
6 years ago |
|
daiao
|
257f55ec00
|
1
|
6 years ago |
|
daiao
|
dce940523a
|
1
|
6 years ago |
|
daiao
|
3e416f2538
|
1
|
6 years ago |
|
daiao
|
23d8e023df
|
1
|
6 years ago |
|
p31729568
|
1fb7c35c30
|
fix session
|
6 years ago |
|
daiao
|
b4ec3363ef
|
1
|
6 years ago |
|
daiao
|
f47cf35233
|
1
|
6 years ago |
|
daiao
|
e8fd8b97a3
|
1
|
6 years ago |
|
p31729568
|
30cd567050
|
fix
|
6 years ago |
|
p31729568
|
41195aaa6e
|
fix create cnmooc
|
6 years ago |
|
daiao
|
965b320e2c
|
1
|
6 years ago |
|
daiao
|
b252983b7d
|
1
|
6 years ago |
|
daiao
|
b1263a1cd0
|
1
|
6 years ago |
|
daiao
|
528361da6f
|
1
|
6 years ago |
|
daiao
|
2a4eac0f4b
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
p31729568
|
7dd479f689
|
fix cnmooc create user api
|
6 years ago |
|
daiao
|
40e15f9f1d
|
好大学api接口
|
6 years ago |
|
daiao
|
d3e61ab869
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
84466f113d
|
1
|
6 years ago |
|
杨树明
|
f06a1b5df6
|
实训题 前端增加题目修改
|
6 years ago |
|
daiao
|
c98a07c7df
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
p31729568
|
3d1e29cf0a
|
cnmooc source url
|
6 years ago |
|
p31729568
|
02aa938fe4
|
add cnmooc use create api
|
6 years ago |
guange
|
2f9fb67479
|
sonar评测取最后一个附件
|
6 years ago |
|
daiao
|
50e0bf1a92
|
1
|
6 years ago |
|
guange
|
71d2066131
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
guange
|
924448efaa
|
取出补交的作业
|
6 years ago |
|
daiao
|
f17754c148
|
1
|
6 years ago |
|
daiao
|
40a1e1d034
|
实训反馈导出增加账号回复内容和时间
|
6 years ago |
|
cxt
|
00e4170593
|
课堂的school_id迁移
|
6 years ago |
|
cxt
|
f14bf75b30
|
统计调整
|
6 years ago |
|
cxt
|
8e2e10629a
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
cxt
|
d48ec8974e
|
学院统计的课堂调整
|
6 years ago |
|
daiao
|
f027b52e4a
|
好大学代码修复
|
6 years ago |
|
daiao
|
d56728da62
|
好大学代码问题
|
6 years ago |
|
daiao
|
6db6d8cd8d
|
评测时间取时在一天之内
|
6 years ago |
|
daiao
|
e662286174
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
daiao
|
5afb8d00d6
|
好大学接口数据
|
6 years ago |
|
cxt
|
c49f381345
|
调整
|
6 years ago |
|
cxt
|
2968f969b3
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
|
jingquan huang
|
c10ed929da
|
评测记录添加唯一表示
|
6 years ago |
|
cxt
|
ecff82dc0c
|
超级管理员的课堂列表增加按课堂名称搜索
|
6 years ago |
|
cxt
|
58bf8a9947
|
实训作业的重命名功能
|
6 years ago |
|
cxt
|
8ad8395bfe
|
Merge branch 'educoder' into develop
|
6 years ago |
|
daiao
|
bdee75e777
|
1
|
6 years ago |
|
daiao
|
07b7fe630e
|
fork实训不复制背景知识
|
6 years ago |
|
jingquan huang
|
294e5440eb
|
Merge branch 'develop' into educoder
|
6 years ago |
|
jingquan huang
|
9ccd8c1c52
|
去掉日志
|
6 years ago |
|
jingquan huang
|
88fa6989fe
|
添加日志
|
6 years ago |
|
jingquan huang
|
768881c1c3
|
提交信息区分用户提交和自动保存
|
6 years ago |
|
jingquan huang
|
334d0a800d
|
评测监控12小时一类
|
6 years ago |
|
jingquan huang
|
bfc78eb673
|
调整日志监控等级
|
6 years ago |
|
jingquan huang
|
a5d2976f17
|
评测添加一些日志
|
6 years ago |
|
jingquan huang
|
f3f879973d
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
|
jingquan huang
|
29cf900c99
|
shixun默认值
|
6 years ago |
|
杨树明
|
c677f58ca1
|
b
|
6 years ago |
|
杨树明
|
2c20ad2ed5
|
b
|
6 years ago |
|
杨树明
|
02194f5503
|
b
|
6 years ago |
|
p31729568
|
27acd561c0
|
fix copy ec year bug
|
6 years ago |
|
p31729568
|
bef79a52c2
|
fix copy ec year
|
6 years ago |
|
hjm
|
478b73bbfb
|
b
|
6 years ago |
|
hjm
|
95ded6f4ca
|
b
|
6 years ago |
|
hjm
|
0e2dcf12fd
|
md
|
6 years ago |
|
hjm
|
78a2cfb044
|
md
|
6 years ago |
|
hjm
|
add56f399b
|
md
|
6 years ago |
|
hjm
|
f2bde62acd
|
md
|
6 years ago |
|
p31729568
|
38fe8a2f9e
|
fix copy ec year issue
|
6 years ago |
