Skip to content

Commit

Permalink
update repository url
Browse files Browse the repository at this point in the history
  • Loading branch information
hifocus committed Jun 15, 2023
1 parent 42ed171 commit 6f61852
Show file tree
Hide file tree
Showing 8 changed files with 29 additions and 29 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Expand Up @@ -8,5 +8,5 @@ jobs:
env:
SSH_PRIVATE_KEY: ${{ secrets.GITEE_PRIVATE_KEY }}
with:
source-repo: "git@github.com:hifocus/merger.git"
source-repo: "git@github.com:qr-merger/merger.git"
destination-repo: "git@e.coding.net:justhx/demo-qrcdn-com.git"
18 changes: 9 additions & 9 deletions README-CN.md
Expand Up @@ -15,14 +15,14 @@


<p align="center">
<a href="https://github.com/hifocus/merger/releases"><img alt="Version" src="https://img.shields.io/github/release/hifocus/merger/all.svg?style=flat-square"/></a>
<a href="https://github.com/hifocus/merger/graphs/contributors"><img alt="Contributors" src="https://img.shields.io/github/contributors/hifocus/merger.svg?style=flat-square"/></a>
<a href="https://github.com/hifocus/merger/stargazers"><img alt="Stargazers" src="https://img.shields.io/github/stars/hifocus/merger.svg?style=flat-square"/></a>
<a href="https://github.com/hifocus/merger/blob/master/LICENSE"><img alt="License" src="https://img.shields.io/github/license/hifocus/merger.svg?style=flat-square"/></a>
<a href="https://www.jsdelivr.com/package/gh/hifocus/merger"><img alt="jsDelivr" src="https://data.jsdelivr.com/v1/package/gh/hifocus/merger/badge"/></a>
<a href="https://github.com/qr-merger/merger/releases"><img alt="Version" src="https://img.shields.io/github/release/qr-merger/merger/all.svg?style=flat-square"/></a>
<a href="https://github.com/qr-merger/merger/graphs/contributors"><img alt="Contributors" src="https://img.shields.io/github/contributors/qr-merger/merger.svg?style=flat-square"/></a>
<a href="https://github.com/qr-merger/merger/stargazers"><img alt="Stargazers" src="https://img.shields.io/github/stars/qr-merger/merger.svg?style=flat-square"/></a>
<a href="https://github.com/qr-merger/merger/blob/master/LICENSE"><img alt="License" src="https://img.shields.io/github/license/qr-merger/merger.svg?style=flat-square"/></a>
<a href="https://www.jsdelivr.com/package/gh/qr-merger/merger"><img alt="jsDelivr" src="https://data.jsdelivr.com/v1/package/gh/qr-merger/merger/badge"/></a>
</p>

[这里](https://github.com/hifocus/merger/issues/4)提交你的 merger 站点以供[展示](https://merger.qrcdn.com/#/?id=%e5%85%b6%e4%bb%96%e6%bc%94%e7%a4%ba%e7%ab%99%e7%82%b9)
[这里](https://github.com/qr-merger/merger/issues/4)提交你的 merger 站点以供[展示](https://merger.qrcdn.com/#/?id=%e5%85%b6%e4%bb%96%e6%bc%94%e7%a4%ba%e7%ab%99%e7%82%b9)

## 特性

Expand All @@ -42,10 +42,10 @@
- [部署](https://merger.qrcdn.com/docs/deploy)
- [演示站点](https://demo.qrcdn.com)
- [其他演示站点](https://merger.qrcdn.com/cn/docs/introduction#%E5%85%B6%E4%BB%96%E6%BC%94%E7%A4%BA%E7%AB%99%E7%82%B9)
- [提交问题](https://github.com/hifocus/merger/issues)
- [合并请求](https://github.com/hifocus/merger/pulls)
- [提交问题](https://github.com/qr-merger/merger/issues)
- [合并请求](https://github.com/qr-merger/merger/pulls)
- [感谢](https://merger.qrcdn.com/cn/docs/introduction#%E6%84%9F%E8%B0%A2)

## 开源许可证

[GNU General Public License v3.0](https://github.com/hifocus/merger/blob/master/LICENSE)
[GNU General Public License v3.0](https://github.com/qr-merger/merger/blob/master/LICENSE)
18 changes: 9 additions & 9 deletions README.md
Expand Up @@ -15,14 +15,14 @@ Language: <strong>English</strong> / <a href="./README-CN.md">Chinese 中文</a>


<p align="center">
<a href="https://github.com/hifocus/merger/releases"><img alt="Version" src="https://img.shields.io/github/release/hifocus/merger/all.svg?style=flat-square"/></a>
<a href="https://github.com/hifocus/merger/graphs/contributors"><img alt="Contributors" src="https://img.shields.io/github/contributors/hifocus/merger.svg?style=flat-square"/></a>
<a href="https://github.com/hifocus/merger/stargazers"><img alt="Stargazers" src="https://img.shields.io/github/stars/hifocus/merger.svg?style=flat-square"/></a>
<a href="https://github.com/hifocus/merger/blob/master/LICENSE"><img alt="License" src="https://img.shields.io/github/license/hifocus/merger.svg?style=flat-square"/></a>
<a href="https://www.jsdelivr.com/package/gh/hifocus/merger"><img alt="jsDelivr" src="https://data.jsdelivr.com/v1/package/gh/hifocus/merger/badge"/></a>
<a href="https://github.com/qr-merger/merger/releases"><img alt="Version" src="https://img.shields.io/github/release/qr-merger/merger/all.svg?style=flat-square"/></a>
<a href="https://github.com/qr-merger/merger/graphs/contributors"><img alt="Contributors" src="https://img.shields.io/github/contributors/qr-merger/merger.svg?style=flat-square"/></a>
<a href="https://github.com/qr-merger/merger/stargazers"><img alt="Stargazers" src="https://img.shields.io/github/stars/qr-merger/merger.svg?style=flat-square"/></a>
<a href="https://github.com/qr-merger/merger/blob/master/LICENSE"><img alt="License" src="https://img.shields.io/github/license/qr-merger/merger.svg?style=flat-square"/></a>
<a href="https://www.jsdelivr.com/package/gh/qr-merger/merger"><img alt="jsDelivr" src="https://data.jsdelivr.com/v1/package/gh/qr-merger/merger/badge"/></a>
</p>

Submit your merger site [here](https://github.com/hifocus/merger/issues/4) for [presentation](https://merger.qrcdn.com/#/en-gb/?id=other-demo-sites)
Submit your merger site [here](https://github.com/qr-merger/merger/issues/4) for [presentation](https://merger.qrcdn.com/#/en-gb/?id=other-demo-sites)

This project is sponsored by <a target="_blank" href="https://www.cloudflare.com"><img src="https://vip2.loli.io/2023/06/15/leUw2vnXKZRTcLE.png" height="30px"></a>

Expand All @@ -44,10 +44,10 @@ This project is sponsored by <a target="_blank" href="https://www.cloudflare.com
- [Deployment](https://merger.qrcdn.com/docs/deploy)
- [Live Demo](https://demo.qrcdn.com)
- [Demo From Users](https://merger.qrcdn.com/docs/introduction#Demo-From-Users)
- [Issues](https://github.com/hifocus/merger/issues)
- [Pull Requests](https://github.com/hifocus/merger/pulls)
- [Issues](https://github.com/qr-merger/merger/issues)
- [Pull Requests](https://github.com/qr-merger/merger/pulls)
- [Credit](https://merger.qrcdn.com/docs/introduction#Credit)

## License

[GNU General Public License v3.0](https://github.com/hifocus/merger/blob/master/LICENSE)
[GNU General Public License v3.0](https://github.com/qr-merger/merger/blob/master/LICENSE)
2 changes: 1 addition & 1 deletion assets/bundles/function.main.js

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions assets/js/function.js
@@ -1,8 +1,8 @@

// Merger - Merge Your Qrcode Together. Even Quicker.
// User docs: https://merger.qrcdn.com
// Released under GNU General Public License v3.0. Open source at https://github.com/hifocus/merger.
// Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/hifocus/merger/graphs/contributors).
// Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger.
// Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/qr-merger/merger/graphs/contributors).
// Copyright reservation is required.

var client;
Expand Down Expand Up @@ -283,7 +283,7 @@ document.getElementById("name").innerHTML = finaltitle;
document.getElementById("description").innerHTML = finalsub;

// Copyright console log copied from https://github.com/MoePlayer/APlayer/. Thank you.
console.log(`${'\n'} %c Merger 0.27.0 %c https://github.com/hifocus/merger ${'\n'}`, 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #fadfa3; padding:5px 0;');
console.log(`${'\n'} %c Merger 0.27.0 %c https://github.com/qr-merger/merger ${'\n'}`, 'color: #fadfa3; background: #030307; padding:5px 0;', 'background: #fadfa3; padding:5px 0;');

function showqrcode() {
if (location.href.substr(location.href.lastIndexOf('#') + 1) == "showqrcode" && selected == "yes") document.getElementById('showqrcode').style.display = "flex";
Expand Down
4 changes: 2 additions & 2 deletions assets/styles/style.css
@@ -1,8 +1,8 @@
/*
Merger - Merge Your Qrcode Together. Even Quicker.
User docs: https://merger.qrcdn.com
Released under GNU General Public License v3.0. Open source at https://github.com/hifocus/merger.
Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/hifocus/merger/graphs/contributors).
Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger.
Author @hifocus (https://github.com/hifocus), and contributors(https://github.com/qr-merger/merger/graphs/contributors).
Copyright reservation is required.
*/

Expand Down
4 changes: 2 additions & 2 deletions merger.html
@@ -1,8 +1,8 @@
<!--
Merger v0.27.0 - Merge Your Qrcodes Together. Even Quicker.
User docs: https://docs.qrcdn.com/merger
Released under GNU General Public License v3.0. Open source at https://github.com/hifocus/merger.
Author @hifocus (https://github.com/hifocus) and contributors(https://github.com/hifocus/merger/graphs/contributors).
Released under GNU General Public License v3.0. Open source at https://github.com/qr-merger/merger.
Author @hifocus (https://github.com/hifocus) and contributors(https://github.com/qr-merger/merger/graphs/contributors).
Please preserve the copywrite information above as required by the license.
-->
<!DOCTYPE html>
Expand Down
4 changes: 2 additions & 2 deletions package.json
Expand Up @@ -9,7 +9,7 @@
},
"repository": {
"type": "git",
"url": "git://github.com/hifocus/merger.git"
"url": "git://github.com/qr-merger/merger.git"
},
"keywords": [
"qr",
Expand All @@ -21,7 +21,7 @@
"author": "hifocus",
"license": "GPL-3.0-or-later",
"bugs": {
"url": "https://github.com/hifocus/merger/issues"
"url": "https://github.com/qr-merger/merger/issues"
},
"homepage": "https://qrcdn.com",
"dependencies": {
Expand Down

0 comments on commit 6f61852

Please sign in to comment.