summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJakob Borg <jakob@nym.se>2015-08-18 13:30:25 +0200
committerJakob Borg <jakob@nym.se>2015-08-18 13:33:36 +0200
commit283c91548aa4a444cfee0d37d6792c59559e5c33 (patch)
tree32f20ba52e58898367590960ac11c3fcac04aed8
parent0ee123375da1835953833e4ef7213587944d46ed (diff)
Add release code name
I figured we're missing out on being cool and awesome by not having an alphabetically based release code name like the big guys. This commit fixes that. I've unilaterally decided on a theme of "$metal $bug" because metals are kind of cool, and bugs, well, ...
-rw-r--r--cmd/syncthing/gui.go1
-rw-r--r--cmd/syncthing/main.go3
-rw-r--r--gui/syncthing/core/aboutModalView.html8
-rw-r--r--lib/auto/gui.files.go4
4 files changed, 12 insertions, 4 deletions
diff --git a/cmd/syncthing/gui.go b/cmd/syncthing/gui.go
index ddee712a1..36e52e3ec 100644
--- a/cmd/syncthing/gui.go
+++ b/cmd/syncthing/gui.go
@@ -355,6 +355,7 @@ func (s *apiSvc) getSystemVersion(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json; charset=utf-8")
json.NewEncoder(w).Encode(map[string]string{
"version": Version,
+ "codename": Codename,
"longVersion": LongVersion,
"os": runtime.GOOS,
"arch": runtime.GOARCH,
diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go
index aedcf71ee..9c2c1ce60 100644
--- a/cmd/syncthing/main.go
+++ b/cmd/syncthing/main.go
@@ -45,6 +45,7 @@ import (
var (
Version = "unknown-dev"
+ Codename = "Aluminium Ant"
BuildEnv = "default"
BuildStamp = "0"
BuildDate time.Time
@@ -93,7 +94,7 @@ func init() {
BuildDate = time.Unix(int64(stamp), 0)
date := BuildDate.UTC().Format("2006-01-02 15:04:05 MST")
- LongVersion = fmt.Sprintf("syncthing %s (%s %s-%s %s) %s@%s %s", Version, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildEnv, BuildUser, BuildHost, date)
+ LongVersion = fmt.Sprintf(`syncthing %s "%s" (%s %s-%s %s) %s@%s %s`, Version, Codename, runtime.Version(), runtime.GOOS, runtime.GOARCH, BuildEnv, BuildUser, BuildHost, date)
if os.Getenv("STTRACE") != "" {
logFlags = log.Ltime | log.Ldate | log.Lmicroseconds | log.Lshortfile
diff --git a/gui/syncthing/core/aboutModalView.html b/gui/syncthing/core/aboutModalView.html
index 7bd1ddec7..b1c018648 100644
--- a/gui/syncthing/core/aboutModalView.html
+++ b/gui/syncthing/core/aboutModalView.html
@@ -1,5 +1,11 @@
<modal id="about" status="info" icon="heart-o" title="{{'About' | translate}}" large="yes" close="yes">
- <h1 class="text-center"><img alt="Syncthing" title="Syncthing" src="assets/img/logo-horizontal.svg" style="vertical-align: -16px" height="100" width="366"/><br/><small>{{versionString()}}</small></h1>
+ <h1 class="text-center">
+ <img alt="Syncthing" title="Syncthing" src="assets/img/logo-horizontal.svg" style="vertical-align: -16px" height="100" width="366"/>
+ <br/>
+ <small>{{versionString()}}</small>
+ <br/>
+ <small><i>"{{version.codename}}"</i></small>
+ </h1>
<hr/>
<p translate>Copyright &copy; 2015 the following Contributors:</p>
diff --git a/lib/auto/gui.files.go b/lib/auto/gui.files.go
index 1fffabdf6..2d0d62024 100644
--- a/lib/auto/gui.files.go
+++ b/lib/auto/gui.files.go
@@ -5,7 +5,7 @@ import (
)
const (
- AssetsBuildDate = "Sun, 16 Aug 2015 13:29:13 GMT"
+ AssetsBuildDate = "Tue, 18 Aug 2015 11:29:36 GMT"
)
func Assets() map[string][]byte {
@@ -54,7 +54,7 @@ func Assets() map[string][]byte {
assets["modal.html"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/3RST0/cPhC9/z7F/HLogkQ2gDjRXaoWqVIlKiHBpceJPUlcHDuyJ9BtlO/eibNNYbUcEv97783Mm9lo8wzKYozbrPUaLVSoKQPG0jhNv7ZZfpGBq3NkDrlGxrxE9aSD77bZMAjVR4JPwKEnuIZVZGSjVjCOB6wn2pUeg06sL95bQneS2KcT+OY/gM3/eS5LUcCt73bB1A3Dye0pXJ5fXMFjQ/Cwc4ob42r43HPjQ1wn+Mx5bEyEB98HRcLXBF99aEHuYl/+JMXAHlhEmEIbwVfp8N3/NtYi3PelNWoWujOKXKQzeF7D5fp8Dd8qQFCS0sK6v4MXjOA8gzaRgyl7Jg0vhhsBSMzKWDqb5X74HhQ68CWjkcURIEPD3F0XRTvHX/tQF6JaSLxiKirPkyGHzcm1QevrZO3+fljNL7ZeXYPFUNNs5jG28o7J8f79GKIh6X4AtBR4/ufDMPW0j+O48ITZXL0lsmFLrwACiZ1ULYmaapsZCZ39ZVQoQya60+Wkuikm6GvuMCS9cfwXsGiulrQLyfv9Gkqvd8khDuiisr2m95n7/NIgZm91Ku9lVl4XLV1m74B3HW2z+bBwSnYgX66pwt5y2sc2gzT8MiStWZSP2PTGGTYtxcWWD66M3ccZliqyyHRzOyV8aNymmJM6Uu6y3W/2yx8AAAD//wEAAP//qvxG6f8DAAA=")
assets["syncthing/app.js"], _ = base64.StdEncoding.DecodeString("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")
assets["syncthing/core/aboutModalDirective.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/1SOMQ7CMAxF954im1upSnc6cQBG2ENqWktOglwHhFDvTgpSgT/+/yw/F8fMTmxIQ2asYX5ErxPF0fokCE1lSuxAgl7pVgB3TlkPaXAMrbnkQlOKpm7M842uEdQs8af4lLMKed0Z2EP7NymGKzvFo3BZN4NuNei+/06EdztpYNiul75amr56AQAA//8BAAD//xLf4CHFAAAA")
- assets["syncthing/core/aboutModalView.html"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/5xYzVIbSRK++yky+rDejaBp8N/BKxQhwMaWwUEgFu811Z3qTlRdpa2qlhAsjzSnuc7NMe81WZLAxmFw1VwUXT9fZVZW/n3qtaZCBVztZTg2nc/AefSd28tYT0wGXBq9lzWE1ucy9OwV7WU3N88HYfdz+D94i9op9HR7m4FCW8v6klwGpTJu891/BtBrdmUKnRzt6crnJWlPNuv3uK0Bld/LRktd+oZ1fS/nuxlnS1HROfKuEEShTG3yxli+Ntqj2nbzsMkvA2xO1nOJKkfFtX4L+e6b2VUGDXHdiJzdnZ0MFlz5Zi97+eZNVvR7Yys/rkWl+jc3Ands9MhbkfzPf93e9or1Uq9odtdXke3Pwsfs2/X7B2a2tEEC/KOUz3/Di53d1+AbgolRyizkMDgQZS2PO2+se9srZqvTKp7fWcaaxcpYD2dLo/K2yndfbNZktVN3i4qdzzu9unol4ixRLoCu1fIG4V3LbzLzsPn+EDlG8d0xKOt5TZqs3KXK+gO0RsM+05hsr1AcB1J0hboiC0cWJ/EwXVlawGGnG2wTUN7oJZygoniM9U1nYXBFCiZn777AqGxa8YT4A7rKcudgv/NTmnMp39HYfQkiOCS4sEwJKNJw0IneZpkGkqt16joNwlVj4l9gX3y/Ei85bVjxLEE7S7pCDcdG1wkgFsjZNuxTOU3wyQPxjzHIr8IFLhNg1nkxyQesqUWtE4ASg0tNcMya9IJwnqJsY9nBB0kW8T69xgwNqXiIUazhE2lNVbxJDlGzxM0+2TrJIhvcibj/19/iUaTlWoPtFEBAfGHlTIJypmXNU/hAXKmEl3qnGMXqaMW7Qp2IB7asRJqTkhKv5TsrKp4Qe52g4nuSTCwFXJxfinqt5Z4JWMVXMBirZJkB959Q2mfIOg0r6aQ07PL/4pxDDXGk4n06oKfw0aVF6xErWRxx3dnKpfjNEEuawugaJ2inTAsu41PtEKdmDPvGxnvNEFtycIpeDJumpjXSnsxXZbKMh5F2cMjUJjzf0JSNJMwL4+IrwdA0ktQvrJFHi0d9kkspOPv6+59/LMtpvFNLwnvOZcPwCVusMBp3bCqSpCz1IAFiKzhel8dBjY3m+LIqibIU7MzYBIEr0Gl3aeIjJkCkDBxeM1YJbcyJmBAlnw9p1pQmRcUN8DzEXDTqFJ208jDsdD1WXXyndkoSKvJqFB9k6z5mRqF1Mq34frxRAlTBcTeOL6enbLyVanqZ4IlnSwmXUSf2mydUj5FUbJJOmZ1wqXiUp4lIO0fvyiYlj59zK5UjJXefm3Gopp+XtXSGCahWQAdk56TjzX4u1lvCmUjUKYn0gsizJGDUqBN0vJBiL+3u9KHde0WnNjSvEJ63YoH3Hz8ll/dMGFiXqqukGDxkls5M/AItgbEQMocQ2NUWS2ZyzzQfZY0Lc88ZN3qJsj0EYZMTof/ez9zboqiNQl1vS90SM4r0IwOn1tQW2zaoIOmu7qRd7hXY34Kf0eEXsIENOuEz1n3X3P1cIAtdG2+Xpi3GU7RYXXMpWuTq+lXW/3HmcbG7+Up2oCvcspX0vwZuhcWXcIhtoBZHdummnKCSyK8EaFxhHF0Jr/5h4ik7bHpiMYeZSQmkFFOsn6FwGmezZdZ/MHzCCCvbj1a78r/1BJfdZVcEv1ZiRbnuw/Hjkl9LA6qNDv/IwLGvEiSK/16SnRSu852lrP9w/LjEV/lKrBBui2VXIXwmcXE7dVvwUZcJCrilrrwNFqc5qWqc9X+ceeKRtyRTW0nYFdoOzgN9FdKL8cLn7G2ni/8Jb8r63w0eEZkWWiFWFdpLF8K5CP+mrMbD0eMX2llb9ciYWtEvLRnuQn5sjHeSxmarGwmLvxv/Ilpfw/mCQ7MbI2cS/gJckDMtbbMRKe9lAgbrmaf88lDIORzJu9yXj3Vm7hWrv0X7z/4CAAD//wEAAP//mMjPTR8VAAA=")
+ assets["syncthing/core/aboutModalView.html"], _ = base64.StdEncoding.DecodeString("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")
assets["syncthing/core/alwaysNumberFilter.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/2zM0arCMAzG8fs9Re66wWGc+9FX8B3qms5Al0rWIEP67m5TsIrfVeD/I44njU76OXmN2Jpl5TFfiKd+TIKma2BbHyhmlNa4eHPrctL5jGL+IOiGKTG0HdwPuU8wq3AVia+aa7GPwiuAtRaUPQZi9N+sevg/fJTS/DDHx7crz7N0Q/MAAAD//wEAAP//1dg68OkAAAA=")
assets["syncthing/core/basenameFilter.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/2yOTU7DMBCF9z3F0I1tCRx1XXySpgvTjBNLziTyDxIiuTuJg4QNvNVI75tvRlOfnPZynLrkkLPwQY84WOrlY/LIxAm2SGNdRM/Zmw5IekT2DCZtoJ0IuIDPTO3xGJOnorQ0p1gSe6z5LkApBYk6NJawExVU6M7na1W9aw+z9jGAguyRYXY28ubWNm17b8T1z7mng1+WY1E6pD4O8AqX388Vd7O7dq2nf7isvFXiF7jcfzbXY1y3x74AAAD//wEAAP//1ZQ6AXEBAAA=")
assets["syncthing/core/binaryFilter.js"], _ = base64.StdEncoding.DecodeString("H4sIAAAJbogA/6SSTU7DMBCF9z3F7GxDZUrFLjJLWKAewsTjdiR3jFxbokK5O0lTJIMa/jKbRJrvPX+LsbwtwSa9j64ElOJw5DbviLe6jQmFWkA/2lPImKR4JrbpKJbgS49RZJAK3k7MMAlzSVwtiV9KrolhyJ8XYIyBwg49MbqvWFUoViCaT8tuovEeblfrO7iqP5eKR/rGXMCbKYtTRuf4QK/opMOW9jYcxoeXsFYKrkHAI/1H9beOM+U2f5P70WqmztP3Oueujc07nWJ/KB/3NGSrZDf+dqpZvAMAAP//AQAA///Yhw40zwIAAA==")