ycc
|
2c6e486654
|
Merge branch 'release/v1.8'
# Conflicts:
# application/controllers/information.php
|
9 years ago |
|
ycc
|
adc238c792
|
修改提交地址，不带域名，原因是前端是https，后端是http，post之后被转向
|
9 years ago |
|
ycc
|
70f910c8ca
|
添加删除静态化文件的函数
|
9 years ago |
|
ycc
|
ef0cc5857f
|
Merge branch 'release/v1.7'
|
9 years ago |
|
ycc
|
52c671d5b0
|
修改缓存地址
|
9 years ago |
|
ycc
|
3ec42f6e49
|
Merge branch 'hotfix/新的pull地址' into develop
|
9 years ago |
|
ycc
|
4c735de4cf
|
Merge branch 'hotfix/新的pull地址'
|
9 years ago |
|
ycc
|
b7de4677c5
|
修改缓存时间，新的pull地址
|
9 years ago |
|
ycc
|
d42feda193
|
Merge branch 'hotfix/删除域名转向' into develop
|
9 years ago |
|
ycc
|
d6378f4807
|
Merge branch 'hotfix/删除域名转向'
|
9 years ago |
|
ycc
|
9976e9216e
|
no message
|
9 years ago |
|
ycc
|
e42b58b1ff
|
Merge branch 'release/v1.6'
|
9 years ago |
|
ycc
|
854eb1924c
|
缓存不自动更新
|
9 years ago |
|
ycc
|
3692347e46
|
Merge branch 'release/v1.5'
|
9 years ago |
|
ycc
|
1addfcbed6
|
Merge branch 'hotfix/fix_ci' into develop
|
9 years ago |
|
ycc
|
6a20a12549
|
Merge branch 'hotfix/fix_ci'
|
9 years ago |
|
ycc
|
a61a163426
|
no message
|
9 years ago |
|
ycc
|
0b571359ee
|
Merge branch 'release/v1.4'
|
9 years ago |
|
ycc
|
4f7da8168d
|
服务器上是D盘
|
9 years ago |
|
ycc
|
3426b6e12b
|
Merge branch 'release/v1.3'
|
9 years ago |
|
ycc
|
bf5b164de5
|
Merge branch 'hotfix/show_commit_error' into develop
|
9 years ago |
|
ycc
|
2860986840
|
Merge branch 'hotfix/show_commit_error'
|
9 years ago |
|
ycc
|
5c7ea21e93
|
把提交的错误显示出来
|
9 years ago |
|
尹诚诚
|
ba4c34dd38
|
Update .gitlab-ci.yml
|
9 years ago |
|
ycc
|
99bc5e6d9e
|
Merge branch 'release/v1.2'
|
9 years ago |
|
ycc
|
b1b4648735
|
Merge branch 'feature/静态化' into develop
|
9 years ago |
|
ycc
|
14218217ed
|
生成静态化文件
|
9 years ago |
|
ycc
|
2e26cf6f03
|
添加静态页面
|
9 years ago |
|
ycc
|
6c579fffa1
|
Merge branch 'master' of git.mycht.cn:developers/asiahighlights.com
|
9 years ago |
|
ycc
|
d4ba432ac0
|
Merge branch 'release/v1.0'
|
9 years ago |
|
ycc
|
65177f96bf
|
取消301转向
|
9 years ago |
|
尹诚诚
|
1e65117dd1
|
Update .gitlab-ci.yml
|
9 years ago |
|
ycc
|
a4be192116
|
init
|
9 years ago |