Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions apps/_dashboard/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -650,7 +650,7 @@ def swapbranch(project):
# swap branches then go back to gitlog so new commits load
checkout(project, branch)
redirect(URL("gitlog", project))
return diff2kryten(patch)
# return diff2kryten(patch)

@action("gitshow/<project>/<commit>")
@action.uses(Logged(session), "gitshow.html")
Expand Down Expand Up @@ -707,4 +707,4 @@ def update_translations(name):
"""find all T(...) decorated strings in the code and returns them"""
app_folder = os.path.join(FOLDER, name)
strings = Translator.find_matches(app_folder)
return {"strings": strings}
return {"strings": strings}
6 changes: 0 additions & 6 deletions apps/_dashboard/static/js/vue.min.js

This file was deleted.

2 changes: 1 addition & 1 deletion apps/_dashboard/templates/gitlog.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<base href="[[=URL('static')]]/">
<style>
* {margin: 0;}
html {background: white; color: black; font-family: "Courier"; font-size: 10px}}
html {background: white; color: black; font-family: "Courier"; font-size: 10px}
a { color: orange; font-weight: bold}
td {padding: 5px 10px; color: orange}
td.linelength { padding: 5px 10px; color: #f1f1f1; font-weight: bold}
Expand Down
8 changes: 5 additions & 3 deletions apps/_dashboard/templates/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ <h2><i class="fa fa-lock fa-2x"></i></h2>
<h2>API error</h2>
<pre v-text="last_error"></pre>
<button v-on:click="close_dialog_error">Ignore and Dismiss</button>
</div>"
</div>
<div class="panel accordion">
<input type="checkbox" id="applications">
<label for="applications">Installed Applications</label>
Expand Down Expand Up @@ -272,10 +272,12 @@ <h2>{{modal.title}}</h2>
<script src="js/ace/ext-modelist.js" type="text/javascript" charset="utf-8"></script>
<script src="js/utils.js"></script>
<script>
var USER_ID = [[= user_id or 0]];
var USER_ID = Number('[[= user_id or 0 ]]');
// "Number" is used only to avoid javascript linter warning about non-constant in template literal
</script>
<script>
T.languages = [[= languages]];
T.languages = JSON.parse('[[= languages ]]');
// "JSON.parse" is used only to avoid javascript linter warning about non-constant in template literal
</script>
<script src="js/index.js"></script>
</html>