cxt
|
11418510e3
|
调整
|
5 years ago |
p31729568
|
e8b9293609
|
fix competition join
|
5 years ago |
|
cxt
|
fc64faa030
|
调整
|
5 years ago |
|
p31729568
|
848d8e2fc3
|
Merge branch 'dev_library' into develop
|
5 years ago |
|
p31729568
|
d59f7a541c
|
fix create library
|
5 years ago |
|
cxt
|
94abdac635
|
调整
|
5 years ago |
|
cxt
|
cf6c2912d7
|
调整
|
5 years ago |
 caishi
|
784ddfbcb5
|
Merge branch 'dev_library' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_library
|
5 years ago |
|
caishi
|
d6ee509244
|
代码标注组”的竞赛首页
|
5 years ago |
|
cxt
|
d3b2e47dc0
|
调整
|
5 years ago |
|
cxt
|
77cee20dc6
|
调整
|
5 years ago |
|
p31729568
|
a40ff91f9e
|
fix library
|
5 years ago |
|
p31729568
|
0b41298aa0
|
Merge branch 'dev_race' into develop
|
5 years ago |
|
p31729568
|
788727f920
|
competition gcc dev 2019
|
5 years ago |
|
cxt
|
006c59bdf3
|
Merge branch 'develop' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into develop
|
5 years ago |
|
cxt
|
f73afb5f2f
|
Merge branch 'educoder' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into educoder
|
5 years ago |
|
cxt
|
cde31b1702
|
学生列表导出成绩调整
|
5 years ago |
|
p31729568
|
0b087c98e0
|
Merge branch 'develop' into dev_race
|
5 years ago |
|
p31729568
|
70eb506c57
|
fix library user image
|
5 years ago |
|
p31729568
|
8195a7063c
|
Merge branch 'dev_library' into develop
|
5 years ago |
|
p31729568
|
5e971cdded
|
modify library
|
5 years ago |
|
p31729568
|
142c33112a
|
Merge branch 'dev_library' of https://bdgit.educoder.net/Hjqreturn/pgfqe6ch8 into dev_library
|
5 years ago |
|
p31729568
|
1c0e08a3dd
|
library feature
|
5 years ago |
 daiao
|
f89ba73d31
|
新建报错
|
5 years ago |
|
daiao
|
1b9f97f21f
|
实训配置更改
|
5 years ago |
|
caishi
|
fbd7cb6b52
|
还原以前的页面
|
5 years ago |
|
caishi
|
4105c7a9e8
|
第二次全国大赛
|
5 years ago |
 杨树明
|
e4ec176fbd
|
调整
|
5 years ago |
|
杨树明
|
41698baf08
|
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts:
# app/views/shixuns/_settings_edit.html.erb
|
5 years ago |
|
杨树明
|
7eb7e0f969
|
调整
|
5 years ago |
|
daiao
|
4af236dc3e
|
调整实训服务器配置
|
5 years ago |
|
daiao
|
f8e5a7c89c
|
刷新镜像配置页面：
|
5 years ago |
|
杨树明
|
2fcf391018
|
调整
|
5 years ago |
|
杨树明
|
aca6075606
|
Merge remote-tracking branch 'origin/develop' into develop
|
5 years ago |
|
杨树明
|
bf6bccfc7a
|
调整
|
5 years ago |
|
杨树明
|
c78e450054
|
调整
|
5 years ago |
|
cxt
|
3c6848085f
|
调整
|
5 years ago |
|
cxt
|
39141fc803
|
未登录时浏览器title显示更改
|
5 years ago |
|
daiao
|
2f5f6d113a
|
实训配置页面
|
5 years ago |
|
daiao
|
fc921d37b0
|
实训配置页面
|
5 years ago |
|
p31729568
|
e84afb2f41
|
competition setting && competition team
|
5 years ago |
|
杨树明
|
5a4907eee2
|
调整
|
5 years ago |
|
杨树明
|
39d46e8222
|
实训配置页服务器设置调整
|
5 years ago |
|
caishi
|
d0496b45be
|
文库
|
5 years ago |
|
p31729568
|
070be6e895
|
competition staff setting
|
5 years ago |
|
p31729568
|
cefa6fa68b
|
library management
|
5 years ago |
|
daiao
|
eb61f98246
|
实训配置资源统一设置
|
5 years ago |
|
daiao
|
3ed7b1150e
|
配置
|
5 years ago |
|
daiao
|
8bb477ce1e
|
Merge branch 'develop' into educoder
|
5 years ago |
|
daiao
|
c2dee3b831
|
还原之前的改动
|
5 years ago |
|
daiao
|
b40f1844fb
|
实训还原配置：
|
5 years ago |
|
daiao
|
8740915626
|
去除多余日志
|
5 years ago |
|
daiao
|
0efc596169
|
上线
|
5 years ago |
|
daiao
|
c91c3b9574
|
上线
|
5 years ago |
|
daiao
|
6b13b450b1
|
增加调试信息
|
5 years ago |
|
daiao
|
29275e62d1
|
查看日志
|
5 years ago |
|
daiao
|
17da33dcba
|
调试
|
5 years ago |
|
daiao
|
f0ff7c8b67
|
去除北京只是
|
5 years ago |
|
daiao
|
38b64a41d4
|
打印日志
|
5 years ago |
|
daiao
|
82b0d86360
|
1
|
5 years ago |
|
daiao
|
71a71f7e8b
|
实训配置改版
|
5 years ago |
|
p31729568
|
3148f7e714
|
fix log
|
5 years ago |
|
p31729568
|
4569af8cd1
|
fix management user trial list
|
5 years ago |
|
daiao
|
357a6844c6
|
Merge branch 'develop' into educoder
|
5 years ago |
|
daiao
|
088c9fc4a1
|
单例模式没使用
|
5 years ago |
|
p31729568
|
fedf652221
|
Merge branch 'develop' into educoder
|
5 years ago |
|
p31729568
|
f698b1468c
|
modify training ec name
|
5 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 |
