Skip to content
This repository was archived by the owner on Apr 13, 2023. It is now read-only.

Bugfix/invalid jade #32

Merged
chipbell4 merged 8 commits into from
Aug 21, 2018
Merged

Bugfix/invalid jade #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
5773051
Removing highlights pin, so that later nodes can pick up newer compat…
chipbell4 Aug 17, 2018
6619e6a
Re-locking packages
chipbell4 Aug 17, 2018
12ea781
Getting node 10 to work.
chipbell4 Aug 21, 2018
eeb9918
Bumping version
chipbell4 Aug 21, 2018
f643652
Forgot to fix the method call
chipbell4 Aug 21, 2018
a343c6f
Fixing some issues with the seeder running locally
chipbell4 Aug 21, 2018
fefbc94
Merge branch 'bugfix/node-10-installations' into bugfix/invalid-html
chipbell4 Aug 21, 2018
8bdb199
Fixing some broken jade templates
chipbell4 Aug 21, 2018
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
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM node:8
FROM node:10

COPY package.json /package.json
COPY npm-shrinkwrap.json /npm-shrinkwrap.json
Expand Down
2 changes: 1 addition & 1 deletion app/routes/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ module.exports = function(app)
res.locals.version = app.get('version');
res.locals.marked = function(str)
{
return marky(str).html();
return marky(str);
};
res.locals.isActive = function(url, undefined)
{
Expand Down
5 changes: 1 addition & 4 deletions app/views/games/releases.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ append gameContent
button.btn.btn-default.btn-block.status.dropdown-toggle(data-toggle="dropdown")
span.bullet
span.name=release.status.toUpperCase()
|
span.caret
ul.dropdown-menu.statusChange-menu
li(class=(release.status == "dev" ? "active" : ""))
Expand Down Expand Up @@ -59,14 +58,12 @@ append gameContent
span.glyphicon.glyphicon-play
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Debug" href="//#{host}/embed/#{game.slug}?version=#{release.version}&debug=1&controls=1&title=1&token=#{token}")
span.glyphicon.glyphicon-wrench
|
span.glyphicon.glyphicon-play
else
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Release" href="//#{host}/embed/#{game.slug}?commitId=#{release.commitId}&controls=1&title=1&token=#{token}")
span.glyphicon.glyphicon-play
a.btn.btn-sm.btn-default.external(data-toggle="tooltip" title="Debug" href="//#{host}/embed/#{game.slug}?commitId=#{release.commitId}&debug=1&controls=1&title=1&token=#{token}")
span.glyphicon.glyphicon-wrench
|
span.glyphicon.glyphicon-play
.col-sm-9: .row: .col-sm-12
if release.version
Expand All @@ -87,4 +84,4 @@ append gameContent
if release.updatedBy
| by #{release.updatedBy.name}
if release.notes
p!= marked(release.notes)
p!= marked(release.notes)
Loading