Browse Source

update gopmfile

pull/1362/merge
Unknwon 10 years ago
parent
commit
72377c721c
  1. 4
      .gopmfile
  2. 2
      conf/app.ini
  3. 4
      modules/bindata/bindata.go
  4. 2
      templates/org/settings/options.tmpl

4
.gopmfile

@ -29,8 +29,8 @@ github.com/msteinert/pam =
github.com/nfnt/resize = commit:53e9ca890b github.com/nfnt/resize = commit:53e9ca890b
github.com/russross/blackfriday = commit:6928e11ecd github.com/russross/blackfriday = commit:6928e11ecd
github.com/shurcooL/go = commit:bc30a0bd33 github.com/shurcooL/go = commit:bc30a0bd33
golang.org/x/net = commit:7dbad50ab5 golang.org/x/net =
golang.org/x/text = commit:5f741289c4 golang.org/x/text =
gopkg.in/ini.v1 = gopkg.in/ini.v1 =
gopkg.in/redis.v2 = commit:e617904962 gopkg.in/redis.v2 = commit:e617904962

2
conf/app.ini

@ -119,7 +119,7 @@ SKIP_VERIFY =
USE_CERTIFICATE = false USE_CERTIFICATE = false
CERT_FILE = custom/mailer/cert.pem CERT_FILE = custom/mailer/cert.pem
KEY_FILE = custom/mailer/key.pem KEY_FILE = custom/mailer/key.pem
; Mail from address, RFC 5322. This can be just an email address, or the "Name" <email@example.com> format ; Mail from address, RFC 5322. This can be just an email address, or the `"Name" <email@example.com>` format
FROM = FROM =
; Mailer user name and password ; Mailer user name and password
USER = USER =

4
modules/bindata/bindata.go

File diff suppressed because one or more lines are too long

2
templates/org/settings/options.tmpl

@ -47,7 +47,7 @@
<input class="ipt ipt-large ipt-radius {{if .Err_Location}}ipt-error{{end}}" id="location" name="location" type="text" value="{{.Org.Location}}" /> <input class="ipt ipt-large ipt-radius {{if .Err_Location}}ipt-error{{end}}" id="location" name="location" type="text" value="{{.Org.Location}}" />
</div> </div>
<div class="field {{if DisableGravatar}}hide{{end}}"> <div class="field {{if DisableGravatar}}hide{{end}}">
<label for="gravatar-email">Gravatar {{.i18n.Tr "email"}}</label> <label class="req" for="gravatar-email">Gravatar {{.i18n.Tr "email"}}</label>
<input class="ipt ipt-large ipt-radius {{if .Err_Avatar}}ipt-error{{end}}" id="gravatar-email" name="avatar" type="text" value="{{.Org.AvatarEmail}}" /> <input class="ipt ipt-large ipt-radius {{if .Err_Avatar}}ipt-error{{end}}" id="gravatar-email" name="avatar" type="text" value="{{.Org.AvatarEmail}}" />
</div> </div>
<div class="field"> <div class="field">

Loading…
Cancel
Save