Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Try making liquid strict #232

Merged
merged 96 commits into from
Mar 22, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
96 commits
Select commit Hold shift + click to select a range
9ab889a
Remove errant .DS_Store file
peternewman Sep 6, 2016
6be4540
Ignore .DS_Store
peternewman Sep 6, 2016
080ac93
Merge pull request #1 from pidcodes/master
peternewman Sep 7, 2016
60b7958
Merge pull request #4 from pidcodes/master
peternewman Sep 9, 2016
c050a46
Create a list of organisations
peternewman Sep 9, 2016
895ba0d
Add an org list
peternewman Sep 9, 2016
8996523
Show number of PIDs per org
peternewman Sep 9, 2016
f9793e9
Fix HTML issue, sort orgs by title
peternewman Sep 9, 2016
2c76f60
Try and fix the PID count
peternewman Sep 9, 2016
1a88388
Try and fix issues
peternewman Sep 9, 2016
29eba86
Try again to fix issues
peternewman Sep 9, 2016
c1b8af9
Try yet again to fix issues
peternewman Sep 9, 2016
937ee8d
Correct the urlpart
peternewman Sep 9, 2016
52fc9de
Change to sort_natural, minor code tidy
peternewman Sep 9, 2016
ec3ec7c
Merge pull request #7 from pidcodes/master
peternewman Sep 10, 2016
c5ac7d8
Try and fix the sorting
peternewman Sep 11, 2016
96d7125
Try again to fix the sorting
peternewman Sep 11, 2016
4e3f9ac
Remove debugging
peternewman Sep 11, 2016
4814955
Add a link to orgs page
peternewman Sep 11, 2016
79e7144
Merge pull request #9 from pidcodes/master
peternewman Sep 28, 2016
dfcdea9
Install dependencies for Travis
peternewman Sep 28, 2016
ee66817
Create .travis.yml
peternewman Sep 28, 2016
2b64ddc
Add the Travis script
peternewman Sep 28, 2016
e9c3e2c
Update the Ruby version
peternewman Sep 28, 2016
a3ca614
Bump the Ruby version some more
peternewman Sep 28, 2016
f056bf3
Switch back to the documented version
peternewman Sep 28, 2016
9bdc498
Add the exclude
peternewman Sep 28, 2016
fb98a7d
Update based on https://github.com/jekyll/jekyll/pull/5413
peternewman Sep 28, 2016
7b05103
Add github-pages Gem
peternewman Sep 28, 2016
51f60cb
Add missing gems
peternewman Sep 28, 2016
c0b9104
Add redcarpet
peternewman Sep 28, 2016
db9e2a9
Switch to tasks so we can run multiple CI tasks
peternewman Sep 28, 2016
212f80a
Switch to tasks
peternewman Sep 28, 2016
b09fc9f
Fix the matrix
peternewman Sep 28, 2016
158861a
More matrix fixing
peternewman Sep 28, 2016
9b32ba0
Turn on more htmlproofer options
peternewman Sep 28, 2016
5f5875f
Make the check less strict
peternewman Sep 28, 2016
a161ad5
Don't bother complaining about extra jekyll tags
peternewman Sep 28, 2016
0360d48
Escape HTML entities
peternewman Sep 28, 2016
d6e9ff8
Fix the email link
peternewman Sep 28, 2016
0f40d13
Fix the link within the 404 page!
peternewman Sep 28, 2016
757c1fc
Escape more HTML entities
peternewman Sep 28, 2016
57ee312
Remove an invalid site URL
peternewman Sep 28, 2016
331bec4
Cache ruby bundles
peternewman Sep 28, 2016
48c7177
Escape even more HTML entities
peternewman Sep 28, 2016
73d6600
Escape yet more HTML entities
peternewman Sep 28, 2016
68c0db9
Escape more HTML entities and switch to a div
peternewman Sep 28, 2016
94da335
Try and fix the errant paragraph item
peternewman Sep 28, 2016
e88e8c1
Add a Travis badge to the readme
peternewman Sep 28, 2016
fcbb002
Update Gemfile
peternewman Sep 28, 2016
32f8d66
Update _config.yml
peternewman Sep 28, 2016
06e3eb9
Add some more checks to Travis
peternewman Sep 28, 2016
1aeaaee
Report GH Pages versions
peternewman Sep 28, 2016
70a1b63
Tidy up, add redcarpet back in
peternewman Sep 28, 2016
f028925
Try and stop the spurious paragraph tags
peternewman Oct 2, 2016
cd6aa72
Merge pull request #11 from pidcodes/master
peternewman Oct 7, 2016
b9247e8
Check Open Graph
peternewman Oct 7, 2016
f5956ee
Merge pull request #12 from pidcodes/master
peternewman Oct 19, 2016
4839ed3
Make pid.codes an internal domain
peternewman Oct 19, 2016
6132588
Ensure we've got the fixed html-proofer
peternewman Oct 20, 2016
90540b0
Merge pull request #14 from pidcodes/master
peternewman Nov 30, 2016
12c9803
Use the original orgpath URL
peternewman Dec 1, 2016
30b2e9c
Merge pull request #15 from pidcodes/master
peternewman Dec 2, 2016
ef8fba7
Ignore some broken URLs
peternewman Dec 2, 2016
4eb0a2d
Try and fix the syntax issue
peternewman Dec 2, 2016
940649e
Third try at fixing syntax
peternewman Dec 2, 2016
1b9e601
Ignore another broken URL
peternewman Dec 3, 2016
6786172
Alternative ignore of a specific URL
peternewman Dec 3, 2016
761baae
Ignore the remaining URLs
peternewman Dec 3, 2016
ed1a2cd
Update Instant Infrastructure URL
peternewman Dec 3, 2016
4a5b177
Remove a redundant URL ignore
peternewman Dec 3, 2016
1a99b1c
Update some broken links
peternewman Dec 3, 2016
9a15f19
Update links
peternewman Dec 3, 2016
e087e0e
Remove more resolved links
peternewman Dec 3, 2016
4628c56
Force links in kramdown
peternewman Dec 16, 2016
82ead7a
Merge pull request #17 from pidcodes/master
peternewman Dec 16, 2016
5478f6d
Format more links for kramdown
peternewman Dec 17, 2016
116cba2
Merge branch 'master' of https://github.com/pidcodes/pidcodes.github.…
peternewman Jan 4, 2017
b8d8aea
Make more links clickable/add more site URLs
peternewman Jan 4, 2017
537eda3
Fix more URLs
peternewman Jan 4, 2017
b6ea2e9
Fix some more URLs and ignore some others
peternewman Jan 4, 2017
4ecb261
Fix the remaining broken link
peternewman Jan 4, 2017
02185b4
Fix the URL I missed
peternewman Jan 4, 2017
59e7f51
Merge pull request #18 from pidcodes/master
peternewman Feb 7, 2017
0a7cb82
Make Jekyll liquid processing strict, make general Jekyll processing …
peternewman Feb 7, 2017
61b42a7
Try and fix the Liquid warning
peternewman Feb 7, 2017
a7df1fd
Try and fix more Liquid errors
peternewman Feb 7, 2017
ecd2973
Fix more Liquid errors
peternewman Feb 7, 2017
922014c
Switch to warn until we've fixed all the errors
peternewman Feb 7, 2017
1d8eba6
Switch back, warn doesn't actually log the errors :(
peternewman Feb 7, 2017
ee529dc
Fix another error
peternewman Feb 7, 2017
a3e32c4
Revert and try another fix as it just breaks it
peternewman Feb 7, 2017
9bc06a6
Go verbose
peternewman Feb 7, 2017
29e5b5d
Revert and try another fix
peternewman Feb 7, 2017
4d4aaea
Revert and fix
peternewman Feb 7, 2017
e4b88d6
Assign and fix
peternewman Feb 7, 2017
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
3 changes: 3 additions & 0 deletions _config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ share_stumbleupon: false
exclude: [vendor]
gems:
- jekyll-paginate
liquid:
error_mode: strict
verbose: true
markdown: kramdown
kramdown:
auto_ids: true
Expand Down
6 changes: 3 additions & 3 deletions _includes/data.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
{% assign vids = {{site.pages|where:"layout","vid"|sort:"url"}} %}
{% assign pids = {{site.pages|where:"layout","pid"|sort:"url"}} %}
{% assign orgs = {{site.pages|where:"layout","org"|sort:"url"}} %}
{% assign vids = site.pages|where:"layout","vid"|sort:"url" %}
{% assign pids = site.pages|where:"layout","pid"|sort:"url" %}
{% assign orgs = site.pages|where:"layout","org"|sort:"url" %}
2 changes: 1 addition & 1 deletion _includes/orgtable.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<thead>
<tr><th>Organisation</th><th>Number of PIDs</th></tr>
</thead>
{% assign sortedorgs = {{site.pages|where:"layout","org"|sort:"title"}} %}
{% assign sortedorgs = site.pages|where:"layout","org"|sort:"title" %}
{% for org in sortedorgs %}
{% assign urlparts = org.url|split:"/" %}
{% assign owner = urlparts[2] %}
Expand Down
2 changes: 1 addition & 1 deletion _layouts/pid.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{% include data.html %}
{% capture orgpath %}/org/{{page.owner}}/{% endcapture %}
{% assign org = {{orgs|where:"url",orgpath|first}} %}
{% assign org = orgs|where:"url",orgpath|first %}
{% assign urlparts = page.url|split:"/" %}
{% assign vid = urlparts[1] %}
{% assign pid = urlparts[2] %}
Expand Down
2 changes: 1 addition & 1 deletion _layouts/vid.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{% include data.html %}
{% assign org = {{orgs|where:"orgname",page.owner|first}} %}
{% assign org = orgs|where:"orgname",page.owner|first %}
{% assign urlparts = page.url|split:"/" %}
{% assign vid = urlparts[1] %}
<!DOCTYPE html>
Expand Down