Merge branch 'master' into feature/recording

This commit is contained in:
ArsenArsen 2017-06-13 12:11:03 +02:00 committed by GitHub
commit 9913af5a41
4 changed files with 9 additions and 5 deletions

1
CNAME Normal file
View File

@ -0,0 +1 @@
kshare.arsenarsen.com

View File

@ -5,8 +5,8 @@ A [ShareX](https://getsharex.com/) inspired cross platform utility written with
|:---:|:-----:|:--:|
|[![Build Status](https://nativeci.arsenarsen.com/job/KShare/badge/icon)](https://nativeci.arsenarsen.com/job/KShare)| [![Build Status](https://nativeci.arsenarsen.com/job/KShare%20Windows%20x86_64/badge/icon)](https://nativeci.arsenarsen.com/job/KShare%20Windows%20x86_64/)| Soon |
## Screenshot
Made with KShare itself, of course :)
![](https://i.arsenarsen.com/2iphpxpah8.png)
Made with KShare itself, of course :)
![](http://i.imgur.com/ffWvCun.png)
## Usage
See the [wiki](https://github.com/ArsenArsen/KShare/wiki).

1
_config.yml Normal file
View File

@ -0,0 +1 @@
theme: jekyll-theme-minimal

View File

@ -153,9 +153,11 @@ QJsonObject recurseAndReplace(QJsonObject &body, QByteArray &data, QString conte
} else if (v.isString()) {
QString str = v.toString();
if (str.startsWith("/") && str.endsWith("/")) {
o.insert(s, str.replace("%image", data).replace("%contenttype", contentType));
}
}
o.insert(s, str.mid(1, str.length() - 2).replace("%imagedata", data).replace("%contenttype", contentType));
} else
o.insert(s, v);
} else
o.insert(s, v);
}
return o;
}