summaryrefslogtreecommitdiffstats
path: root/templates
diff options
context:
space:
mode:
authorUnknwon <joe2010xtmf@163.com>2015-02-08 21:26:14 -0500
committerUnknwon <joe2010xtmf@163.com>2015-02-08 21:26:14 -0500
commitf15fa9167ade8262bed437451585d319f12d1182 (patch)
tree1f6e32e4377d0c09fd3a57a66caf5098e0c16c97 /templates
parentcd0ee35b3f887cc4ab6ba16cc2d955bfae607678 (diff)
downloadgitea-f15fa9167ade8262bed437451585d319f12d1182.tar.gz
gitea-f15fa9167ade8262bed437451585d319f12d1182.zip
cmd: code fix for #905
- routers/admin: add rewrite update hook operation - conf/locale: update locale file due to ini behavior changes - cmd/cert_stub.go: remove useless code - cmd/fix.go: no longer need fix command(at least now)
Diffstat (limited to 'templates')
-rw-r--r--templates/.VERSION2
-rw-r--r--templates/admin/dashboard.tmpl5
-rw-r--r--templates/user/dashboard/feeds.tmpl4
3 files changed, 7 insertions, 4 deletions
diff --git a/templates/.VERSION b/templates/.VERSION
index 5a5ed364d9..a896ddd330 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.5.13.0207 Beta \ No newline at end of file
+0.5.13.0208 Beta \ No newline at end of file
diff --git a/templates/admin/dashboard.tmpl b/templates/admin/dashboard.tmpl
index b570517536..5db717bfe1 100644
--- a/templates/admin/dashboard.tmpl
+++ b/templates/admin/dashboard.tmpl
@@ -52,7 +52,10 @@
<td>{{.i18n.Tr "admin.dashboard.resync_all_sshkeys"}}</td>
<td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=5">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
</tr>
-
+ <tr>
+ <td>{{.i18n.Tr "admin.dashboard.resync_all_update_hooks"}}</td>
+ <td><i class="fa fa-caret-square-o-right"></i> <a href="{{AppSubUrl}}/admin?op=6">{{.i18n.Tr "admin.dashboard.operation_run"}}</a></td>
+ </tr>
</tbody>
</table>
</div>
diff --git a/templates/user/dashboard/feeds.tmpl b/templates/user/dashboard/feeds.tmpl
index 834e5f0a56..8acf228963 100644
--- a/templates/user/dashboard/feeds.tmpl
+++ b/templates/user/dashboard/feeds.tmpl
@@ -12,14 +12,14 @@
{{$.i18n.Tr "action.commit_repo" AppSubUrl .GetRepoLink .GetBranch .GetBranch AppSubUrl .GetRepoLink .GetRepoLink | Str2html}}
{{else if eq .GetOpType 6}}
{{ $index := index .GetIssueInfos 0}}
- {{$.i18n.Tr "action.create_issue" AppSubUrl .GetRepoLink $index .GetRepoLink $index | Str2html}}
+ {{$.i18n.Tr "action.create_issue" .GetRepoLink $index | Str2html}}
{{else if eq .GetOpType 8}}
{{$.i18n.Tr "action.transfer_repo" .GetContent AppSubUrl .GetRepoLink .GetRepoLink | Str2html}}
{{else if eq .GetOpType 9}}
{{$.i18n.Tr "action.push_tag" AppSubUrl .GetRepoLink .GetBranch .GetBranch AppSubUrl .GetRepoLink .GetRepoLink | Str2html}}
{{else if eq .GetOpType 10}}
{{ $index := index .GetIssueInfos 0}}
- {{$.i18n.Tr "action.comment_issue" AppSubUrl .GetRepoLink $index .GetRepoLink $index | Str2html}}
+ {{$.i18n.Tr "action.comment_issue" .GetRepoLink $index | Str2html}}
{{end}}
</p>
{{if eq .GetOpType 5}}