杨树明
|
41698baf08
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# app/views/shixuns/_settings_edit.html.erb
|
6 years ago |
杨树明
|
7eb7e0f969
|
调整
|
6 years ago |
daiao
|
4af236dc3e
|
调整实训服务器配置
|
6 years ago |
daiao
|
f8e5a7c89c
|
刷新镜像配置页面:
|
6 years ago |
杨树明
|
2fcf391018
|
调整
|
6 years ago |
杨树明
|
aca6075606
|
Merge remote-tracking branch 'origin/develop' into develop
|
6 years ago |
杨树明
|
bf6bccfc7a
|
调整
|
6 years ago |
杨树明
|
c78e450054
|
调整
|
6 years ago |
cxt
|
3c6848085f
|
调整
|
6 years ago |
cxt
|
39141fc803
|
未登录时浏览器title显示更改
|
6 years ago |
daiao
|
2f5f6d113a
|
实训配置页面
|
6 years ago |
daiao
|
fc921d37b0
|
实训配置页面
|
6 years ago |
p31729568
|
e84afb2f41
|
competition setting && competition team
|
6 years ago |
杨树明
|
5a4907eee2
|
调整
|
6 years ago |
杨树明
|
39d46e8222
|
实训配置页服务器设置调整
|
6 years ago |
caishi
|
d0496b45be
|
文库
|
6 years ago |
p31729568
|
070be6e895
|
competition staff setting
|
6 years ago |
p31729568
|
cefa6fa68b
|
library management
|
6 years ago |
daiao
|
eb61f98246
|
实训配置资源统一设置
|
6 years ago |
daiao
|
3ed7b1150e
|
配置
|
6 years ago |
daiao
|
8bb477ce1e
|
Merge branch 'develop' into educoder
|
6 years ago |
daiao
|
c2dee3b831
|
还原之前的改动
|
6 years ago |
daiao
|
b40f1844fb
|
实训还原配置:
|
6 years ago |
daiao
|
8740915626
|
去除多余日志
|
6 years ago |
daiao
|
0efc596169
|
上线
|
6 years ago |
daiao
|
c91c3b9574
|
上线
|
6 years ago |
daiao
|
6b13b450b1
|
增加调试信息
|
6 years ago |
daiao
|
29275e62d1
|
查看日志
|
6 years ago |
daiao
|
17da33dcba
|
调试
|
6 years ago |
daiao
|
f0ff7c8b67
|
去除北京只是
|
6 years ago |
daiao
|
38b64a41d4
|
打印日志
|
6 years ago |
daiao
|
82b0d86360
|
1
|
6 years ago |
daiao
|
71a71f7e8b
|
实训配置改版
|
6 years ago |
p31729568
|
3148f7e714
|
fix log
|
6 years ago |
p31729568
|
4569af8cd1
|
fix management user trial list
|
6 years ago |
daiao
|
357a6844c6
|
Merge branch 'develop' into educoder
|
6 years ago |
daiao
|
088c9fc4a1
|
单例模式没使用
|
6 years ago |
p31729568
|
fedf652221
|
Merge branch 'develop' into educoder
|
6 years ago |
p31729568
|
f698b1468c
|
modify training ec name
|
6 years ago |
jingquan huang
|
6eacfca355
|
Merge branch 'develop' into educoder
|
6 years ago |
p31729568
|
a4aa4b4029
|
modify training ec fee to 500
|
6 years ago |
cxt
|
21b6b7cb65
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
cxt
|
53d6f47082
|
Merge branch 'develop' into educoder
|
6 years ago |
cxt
|
fbda6b378d
|
作业导出成绩增加评语的导出
|
6 years ago |
jingquan huang
|
3a68b2cb0e
|
版权归属更新
|
6 years ago |
p31729568
|
f5405ec534
|
fix
|
6 years ago |
p31729568
|
effee3e7c8
|
support new version watcher data
|
6 years ago |
p31729568
|
80c5bfe42e
|
user fanslist and watchlist support new version watcher
|
6 years ago |
cxt
|
bb19710158
|
答案抄袭的调整
|
6 years ago |
cxt
|
9a20426e6a
|
试卷列表的时间排序
|
6 years ago |
cxt
|
2d8f82e36a
|
Merge branch 'develop' into educoder
|
6 years ago |
caishi
|
66607ae158
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
caishi
|
695466e459
|
支付tip
|
6 years ago |
杨树明
|
e6b6e91921
|
调整题目多行显示体验
|
6 years ago |
daiao
|
1f4700f947
|
不管镜像同步选择新旧,都直接发布
|
6 years ago |
daiao
|
0bd28514e9
|
选择镜像后,直接发布
|
6 years ago |
daiao
|
33750be0a5
|
镜像同步不需要经过中间层同步
|
6 years ago |
daiao
|
db1566638c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
daiao
|
e234a2e57f
|
镜像同步
|
6 years ago |
p31729568
|
e7364ee9e9
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
p31729568
|
66f52ddfcc
|
trainings feature
|
6 years ago |
p31729568
|
18a908b110
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
p31729568
|
ce67c42c27
|
remove wechat pay test
|
6 years ago |
p31729568
|
991cdc8258
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
p31729568
|
b41ca035dd
|
add whitelist for wxpay test
|
6 years ago |
cxt
|
b128c9721f
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
cxt
|
4925e9f4c0
|
实名认证和职业认证的短消息提醒更换手机号码
|
6 years ago |
p31729568
|
efe1991773
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
p31729568
|
65c91f890a
|
open wechat pay method
|
6 years ago |
p31729568
|
bc9bbdfcde
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
p31729568
|
ef8ee3c7e5
|
test wexpau
|
6 years ago |
caishi
|
ab054713bf
|
合作伙伴-产学联盟
|
6 years ago |
daiao
|
8c57e3363e
|
合作伙伴增加产学联盟
|
6 years ago |
p31729568
|
41adc37658
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
p31729568
|
e8f40b9430
|
add wechat pay support
|
6 years ago |
daiao
|
cb0010913f
|
vnc域名调整
|
6 years ago |
daiao
|
cd7db688d2
|
vnc的url调整
|
6 years ago |
p31729568
|
d8e3214a16
|
modify trainings
|
6 years ago |
p31729568
|
92c7dd4ead
|
modify trainings
|
6 years ago |
p31729568
|
56bea6da3a
|
modify trainings
|
6 years ago |
p31729568
|
3a301499ca
|
modify trainings
|
6 years ago |
caishi
|
aeb3fe9b0e
|
Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings
|
6 years ago |
caishi
|
dba3a65800
|
支付信息
|
6 years ago |
p31729568
|
c0a3620bb4
|
training: modify flow
|
6 years ago |
caishi
|
0d5d7f63c2
|
Merge branch 'dev_trainings' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_trainings
|
6 years ago |
caishi
|
d02d10e95c
|
支付-微信开通提示
|
6 years ago |
p31729568
|
0814e7b412
|
fix business not permission at ec major school show
|
6 years ago |
p31729568
|
567bcfdf65
|
business add permission
|
6 years ago |
p31729568
|
098c9e3186
|
modify
|
6 years ago |
p31729568
|
a893358e29
|
trainings: modify
|
6 years ago |
p31729568
|
c69ed1c1f4
|
Merge branch 'dev_trainings' into develop
|
6 years ago |
p31729568
|
5816bc25cb
|
trainings: fix
|
6 years ago |
caishi
|
8ebc32383a
|
支付--适配iphone
|
6 years ago |
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 |
hjm
|
cfed9da95e
|
b
|
6 years ago |
p31729568
|
e5e9b1a04b
|
fix get nav data api
|
6 years ago |
caishi
|
cb20217d49
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
caishi
|
8b42018d40
|
实训课程右侧教学团队
|
6 years ago |
杨树明
|
e38e35c72b
|
b
|
6 years ago |
p31729568
|
9d00433565
|
add students_url to get nav api
|
6 years ago |
p31729568
|
7efe78c83a
|
fix copy ec year
|
6 years ago |
杨树明
|
436571090a
|
b
|
6 years ago |
杨树明
|
d5e334738f
|
b
|
6 years ago |
杨树明
|
b7c7127f3a
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
杨树明
|
b6953aa038
|
b
|
6 years ago |
p31729568
|
b30d8a6a89
|
modify create ec year code
|
6 years ago |
hjm
|
ce9dc71211
|
b
|
6 years ago |
hjm
|
a2acd872c9
|
Merge branch 'dev_ec' into develop
|
6 years ago |
jingquan huang
|
eb705d526e
|
Merge branch 'educoder' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
jingquan huang
|
9b32b4675c
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
jingquan huang
|
fdecb7c53d
|
修整
|
6 years ago |
jingquan huang
|
ae07c1b6df
|
自动评测不记录
|
6 years ago |
caishi
|
7d2730cfa5
|
工程认证
|
6 years ago |
hjm
|
80f9ee5ed5
|
b
|
6 years ago |
jingquan huang
|
b920395ede
|
中间数据监控接口标识存储
|
6 years ago |
jingquan huang
|
d27f6a1ba4
|
Merge branch 'develop' of http://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
jingquan huang
|
407f5615f2
|
identifier生成
|
6 years ago |
guange
|
a2ca817642
|
merge
|
6 years ago |
guange
|
88096c807f
|
加入质量检测请求
|
6 years ago |
daiao
|
dd7f28230c
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
daiao
|
e72abe4305
|
还原
|
6 years ago |
jingquan huang
|
346850df2b
|
Merge branch 'educoder' into develop
|
6 years ago |
jingquan huang
|
5a88a81d0f
|
平台时间记录错误问题
|
6 years ago |
daiao
|
c8f178f8a7
|
测试版测试人数
|
6 years ago |
cxt
|
b124c358c9
|
调整
|
6 years ago |
daiao
|
db3422a8f1
|
Merge branch 'develop' into educoder
|
6 years ago |
cxt
|
22bddecf47
|
调整
|
6 years ago |
cxt
|
7dc216bf69
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
cxt
|
82b7df0d8b
|
调整
|
6 years ago |
jasder
|
36666c961b
|
FIX Adj jump url
|
6 years ago |
daiao
|
07e6182c7e
|
post中间层信息增加错误信息日志
|
6 years ago |
daiao
|
fe2eab517b
|
post中间层信息增加错误信息日志
|
6 years ago |
cxt
|
d69fd728a3
|
优化作业列表和作品列表
|
6 years ago |
daiao
|
d4ad370635
|
职业路径页面无法编辑
|
6 years ago |
cxt
|
cb03317076
|
实训作业列表优化
|
6 years ago |
daiao
|
6d18d11200
|
1
|
6 years ago |
daiao
|
b86841fe01
|
评测页面调整
|
6 years ago |
daiao
|
741b51f668
|
超级管理员评测页面排序显示问题
|
6 years ago |
daiao
|
a80e89e5f0
|
1
|
6 years ago |
daiao
|
24881fa282
|
评测还原
|
6 years ago |
daiao
|
9beb3131d2
|
评测时间创建时间
|
6 years ago |
daiao
|
0292431bec
|
创建时间
|
6 years ago |
daiao
|
3d959e025a
|
超级管理员的课堂列表Excel导出功能也增加 课堂学生的“评测次数”统计数据
|
6 years ago |
daiao
|
d648ecb8ed
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
daiao
|
f31d1a4c11
|
评测增加创建pod和clone代码状态的信息
|
6 years ago |
p31729568
|
db64dbe8e9
|
modify school grow data list
|
6 years ago |
daiao
|
c67157ca7e
|
【实训】允许跳关,但是用户点后续关卡的挑战按钮都跳到了第一关
|
6 years ago |
daiao
|
9bb4442121
|
【课堂】学生的成绩导出,增加邮箱信息的导出
|
6 years ago |
daiao
|
fa2cc5b867
|
1
|
6 years ago |
杨树明
|
146873ffdc
|
解决生产环境】项目-issue中的结束时间日历显示不全导致用户无法选择
|
6 years ago |
daiao
|
2912f32041
|
超级管理员的课堂列表页面增加 课堂学生的“评测次数”统计显示
|
6 years ago |
daiao
|
8d44fea995
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
daiao
|
0bfee48829
|
恢复调试
|
6 years ago |
p31729568
|
5360ed4d3a
|
fix save school fail bug
|
6 years ago |
daiao
|
2374e6f31c
|
超级管理员评测时间页面增加按时间搜索并增加最大执行时间列
|
6 years ago |
jingquan huang
|
4300887c85
|
评测记录样式修整
|
6 years ago |
jingquan huang
|
64e7c5a953
|
评测结果记录按总时间倒排
|
6 years ago |
jingquan huang
|
2862d530f7
|
评测简版
|
6 years ago |
jingquan huang
|
dec3922a2a
|
评测
|
6 years ago |
jingquan huang
|
034312aec4
|
简略版统计
|
6 years ago |
cxt
|
b8daa7e818
|
调整导入学生账号
|
6 years ago |
cxt
|
1350e8fb59
|
超级管理员的账号导入
|
6 years ago |
cxt
|
88d4bed989
|
升级通知的时间间隔
|
6 years ago |
daiao
|
1d197501bd
|
1
|
6 years ago |
daiao
|
af97c45716
|
解锁测试集
|
6 years ago |
jingquan huang
|
037e7c08ec
|
..
|
6 years ago |
jingquan huang
|
1b2494ea5e
|
Merge branch 'educoder' into develop
|
6 years ago |
jingquan huang
|
3685c386db
|
实训临时一些优化
|
6 years ago |
daiao
|
62e36d87e5
|
1
|
6 years ago |
daiao
|
b4bc64e401
|
图片类实训打印日志
|
6 years ago |
cxt
|
9e68757d50
|
日志
|
6 years ago |
cxt
|
110fbbc87b
|
日志
|
6 years ago |
daiao
|
eea7aae984
|
修改回来
|
6 years ago |
daiao
|
dee79a3d75
|
Merge branch 'develop' into educoder
|
6 years ago |
daiao
|
542830b315
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
daiao
|
b139d1cf28
|
评测策略修改
|
6 years ago |
jasder
|
01a9662ac2
|
FIX 修复合作伙伴添加客户后,与我的菜单中 '客户管理'列表数据不一致的bug
|
6 years ago |
Alec Zhou
|
8b7bce39bb
|
修改绑定邮箱的链接
|
6 years ago |
cxt
|
cfa9e4adb8
|
导出调整
|
6 years ago |
cxt
|
056c89bfae
|
导出调整
|
6 years ago |
Alec Zhou
|
b24547f9e0
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
Alec Zhou
|
923d702d01
|
将current_user修改为User.current
|
6 years ago |
cxt
|
28191b71ea
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
cxt
|
39423255da
|
实训报告导出报500
|
6 years ago |
p31729568
|
8c3767cfa2
|
fix my account page reject trial auth notify modal bug
|
6 years ago |
p31729568
|
dbaed7bc12
|
modify reject trial auth modal
|
6 years ago |
cxt
|
aa6e3dddbf
|
试用授权未审批页面增加学校统计链接
|
6 years ago |
Alec Zhou
|
584da88eca
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
Alec Zhou
|
4b7d55cbef
|
创建openi记录之后建立起user与openi之间的联系
|
6 years ago |
cxt
|
6a80a0bbf1
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
cxt
|
31635eb93f
|
试卷题的表格样式
|
6 years ago |
p31729568
|
fcfda1f9a2
|
fix export school statistic xls empty bug
|
6 years ago |
Alec Zhou
|
fbf86d64dc
|
解除openi单点登录相关代码的注释
|
6 years ago |
p31729568
|
495cc01315
|
not statistic deleted courses to school statistic report
|
6 years ago |
p31729568
|
35e26e22f7
|
remove debug code
|
6 years ago |
p31729568
|
1fa27ae9d3
|
fix reject trial auth feature issue
|
6 years ago |
p31729568
|
9c3fdd0c08
|
fix management agree or reject trial auth
|
6 years ago |
cxt
|
3c76641df3
|
调整
|
6 years ago |
cxt
|
4c2d678253
|
调整
|
6 years ago |
cxt
|
efa4020aa3
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
cxt
|
f6e533c6b6
|
试用授权的审批短信发送手机号变更
|
6 years ago |
cxt
|
e2669b8e78
|
试卷分数迁移
|
6 years ago |
p31729568
|
6c53f561d8
|
modify reject trial auth tiding content
|
6 years ago |
p31729568
|
f1b0c6a038
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
p31729568
|
05cd6b874b
|
reject trial authorization modal feature
|
6 years ago |
daiao
|
7359854e28
|
超级管理员 已发布实训路径的excel导出增加实训的实训发布时间和课程等级列
|
6 years ago |
daiao
|
85c96c5167
|
1
|
6 years ago |
daiao
|
aa525adae9
|
Merge branch 'develop' into educoder
|
6 years ago |
杨树明
|
745597348d
|
b
|
6 years ago |
jingquan huang
|
5950eb66d6
|
添加权限
|
6 years ago |
jingquan huang
|
c71677710d
|
..
|
6 years ago |
jingquan huang
|
e3af858ecc
|
本地导入线上
|
6 years ago |
jingquan huang
|
593ee71e79
|
..
|
6 years ago |
杨树明
|
859e3e9a62
|
后台撤销授权功能优化 (前端)
|
6 years ago |
huang
|
41a1795b32
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
6 years ago |
huang
|
e6b3b6b535
|
本地到线上仓库同步
|
6 years ago |
huang
|
fe1b87f9d6
|
'..'
|
6 years ago |
杨树明
|
c7cc754046
|
b
|
6 years ago |
Alec Zhou
|
8b711ac57d
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
Alec Zhou
|
21043d1a6c
|
修复未绑定邮箱用户点击开始实战按钮页面无反应的bug
|
6 years ago |
p31729568
|
1298e748f2
|
modify school statistic service to decrease response time
|
6 years ago |
Alec Zhou
|
face0cc8de
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
Alec Zhou
|
2f92f650d5
|
增加邮箱为空的判断
|
6 years ago |
p31729568
|
0f6e2b0bf8
|
do not save useless school daily report data && clear school daily report useless data rake
|
6 years ago |
daiao
|
27b59fa3cc
|
1
|
6 years ago |
daiao
|
09c221b5b5
|
实训报告取分
|
6 years ago |
jasder
|
2807c3f433
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
jasder
|
70cb0254bf
|
FIX bug
|
6 years ago |
Alec Zhou
|
081eef9fb5
|
将注释的openi单点登录的代码重新加上
|
6 years ago |
jingquan huang
|
54f51ff3f4
|
图像被串改问题
|
6 years ago |
jingquan huang
|
2fc8833bef
|
图像修改添加权限
|
6 years ago |
Alec Zhou
|
59e084ba48
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
Alec Zhou
|
59b117376e
|
暂时注释openi相关代码
|
6 years ago |
p31729568
|
922553af6e
|
fix school data grow list error
|
6 years ago |
p31729568
|
bfe8f6800f
|
fix css display issue && fix export school report error
|
6 years ago |
p31729568
|
8348c95b57
|
modify school contrast data feature
|
6 years ago |
Alec Zhou
|
c76c43eb29
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
Alec Zhou
|
451e06dcaa
|
后台创建openi关联用户时直接授权,并且修改了生成用户名的规则
|
6 years ago |
cxt
|
c28692ffc5
|
调整
|
6 years ago |
cxt
|
0560d0e2c5
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
cxt
|
09abc5511f
|
编辑部门url
|
6 years ago |
Alec Zhou
|
97c2b1f1f5
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
Alec Zhou
|
90e7e056ec
|
修复重定向过多的bug
|
6 years ago |
p31729568
|
6a08ec9a27
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
p31729568
|
50d7ed2deb
|
export school statistic data feature
|
6 years ago |
daiao
|
5f8341dcf5
|
1
|
6 years ago |
daiao
|
731d8532e4
|
1
|
6 years ago |
daiao
|
b49c1f5752
|
1
|
6 years ago |
daiao
|
f738ba4cc5
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
6 years ago |
cxt
|
14b2ce10da
|
Merge branch 'educoder' into develop
|
6 years ago |
cxt
|
fdec1f663d
|
超级管理员的试用授权“已审批”增加学院统计
|
6 years ago |