Merge branch 'master' into serverpane
the build was successful Details

This commit is contained in:
erinn 2020-10-29 17:30:07 -07:00
commit 2433c667d8
6 changed files with 6 additions and 3 deletions

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -25,6 +25,7 @@ import (
mrand "math/rand"
"os"
"os/user"
"path"
"path/filepath"
"runtime"
"time"
@ -168,8 +169,10 @@ func mainUi(flagLocal bool, flagClientUI bool) {
if runtime.GOOS == "windows" {
dir = "/" + dir
}
gcd.SetAssetPath("file://" + filepath.Join(dir, "assets") + "/")
// QML uses '/' regardless of platform (so we use path.Join here not filepath.Join)
gcd.SetAssetPath("file://" + path.Join(dir, "assets") + "/")
}
log.Infof("gcd.assetPath = '%v'\n", gcd.AssetPath())
if buildVer != "" {
gcd.SetVersion(buildVer)

View File

@ -45,7 +45,7 @@ ApplicationWindow {
T.twemoji.ext = ".png"
T.twemoji.size = "72x72"
T.twemoji.className = "\" height=\""+size+"\" width=\""+size
var retText = T.twemoji.parse(Utils.htmlEscaped(text))
var retText = Utils.htmlEscaped(text)//T.twemoji.parse(Utils.htmlEscaped(text))//
retText = retText.replace(/\n/g,"<br/>")
// mutant standard stickers

@ -1 +1 @@
Subproject commit c530045798eea1a4ad7ed65db11c815d2fe0c63b
Subproject commit 925796d468b208787e232c06d18f77c219686a45