Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
207 commits
Select commit Hold shift + click to select a range
12e60cb
use notie alerts, components for datasets page and add-dataset
timwis Apr 9, 2016
28ea00c
dataset form
timwis Apr 10, 2016
90b7ee3
dataset display component
timwis Apr 10, 2016
16d5734
all the rest - admin page, organizations, clean up index
timwis Apr 10, 2016
7d1e51a
remove old index
timwis Apr 10, 2016
451b90b
datasets-list can be filtered by data attribute, add datasets list to…
timwis Apr 10, 2016
aef5ca4
Merge branch 'gh-pages' into components
timwis Apr 10, 2016
a04b641
use tabs on admin page
timwis Apr 10, 2016
f5ec9a1
add editable-list component, use it for categories and dataset resources
timwis Apr 11, 2016
cd57477
use categories-form, move yaml formatting methods to components
timwis Apr 11, 2016
fa9a418
remove updateYamlString from file model
timwis Apr 11, 2016
b2cd01a
Merge branch 'gh-pages' into edit-categories
timwis Apr 11, 2016
0b8430b
build js
timwis Apr 11, 2016
d4eaab0
Merge branch 'gh-pages' into components
timwis Apr 11, 2016
727f8e0
build js
timwis Apr 11, 2016
5128d8d
Merge pull request #87 from timwis/components
timwis Apr 14, 2016
da19e75
build js
timwis Apr 14, 2016
b5cf1d6
Merge pull request #90 from timwis/edit-categories
timwis Apr 14, 2016
e016a90
slugify title instead of slug property. fixes #92
timwis Apr 15, 2016
cbc1745
don't show org logo if there isn't one
timwis Apr 15, 2016
74f73c3
remove fork me banner. #91
timwis Apr 16, 2016
5e4e6a2
configurable greeting
timwis Apr 16, 2016
aedc533
category images, list categories on front page. #94
timwis Apr 16, 2016
0181916
Add theme switcher. Closes #95
timwis Apr 16, 2016
7354839
build js
timwis Apr 16, 2016
c7c32fb
add fork me button back (different pull request)
timwis Apr 16, 2016
0751909
add fork me button back to index.html
timwis Apr 16, 2016
77e4564
prefix logo path with slash
timwis Apr 16, 2016
13d5ed7
prefix theme logo with baseurl
timwis Apr 16, 2016
e575028
remove unnecessary dont-breakout style
timwis Apr 16, 2016
df34c36
use wells intead of custom class for editable list items
timwis Apr 16, 2016
cf81daf
Merge pull request #97 from timwis/homepage
timwis Apr 17, 2016
a39947f
merge homepage branch, resolve conflict in main.css
timwis Apr 17, 2016
113cb02
Merge pull request #98 from timwis/bootswatch-themes
timwis Apr 17, 2016
80b910d
remove fork me banner
timwis Apr 17, 2016
afaa9b3
use notie.css from cdn
timwis Apr 17, 2016
8d120f7
don't show org logo if it isn't set
timwis Apr 17, 2016
3ffdbde
Add license field
pezholio Apr 7, 2016
1170a64
Display license on frontend
pezholio Apr 7, 2016
7bc469c
Add license to sample data
pezholio Apr 7, 2016
feec4f0
Allow custom licenses
pezholio Apr 7, 2016
3fe8ff1
Add license labels
pezholio Apr 7, 2016
bf0f7a9
Add help text with link to open definition
pezholio Apr 7, 2016
3895e44
Load licenses from yaml
pezholio Apr 18, 2016
32da0a6
Display license on frontend
pezholio Apr 18, 2016
daa6eb7
Update sample dataset to use new schema
pezholio Apr 18, 2016
ac4ceb1
Add license to data.json
pezholio Apr 18, 2016
56299db
Make list of licenses configurable
pezholio Apr 18, 2016
2c7a0c2
show currently selected license on dataset form
timwis Apr 19, 2016
f387bf0
remove form/hidden.html (not used)
timwis Apr 19, 2016
f83c138
js lint
timwis Apr 19, 2016
9a338a9
use license.html field_name, label, placeholder from schema
timwis Apr 19, 2016
989b988
don't show license on dataset page if it's empty
timwis Apr 19, 2016
e9f5824
Merge branch 'odijkan-add-license' into gh-pages
timwis Apr 19, 2016
7ffef7e
use babel-polyfill. closes #108
timwis Apr 24, 2016
27fb425
build js
timwis Apr 24, 2016
e23e78b
include bootstrap/collapse plugin. fixes #113
timwis May 7, 2016
1f620a5
build js
timwis May 7, 2016
5acf5a2
Add version to github-api dependency
timwis Jun 24, 2016
7a6cc01
Remove logo that conflicts with the CKAN one
Jul 4, 2016
9bc041b
Merge pull request #122 from davidread/remove-logo
timwis Jul 4, 2016
1cf04b9
Remove JKAN logo per #121
timwis Jul 4, 2016
731a672
use specific commit for github-api, per #124
timwis Jul 28, 2016
04ed383
update to github-api version 2.3.0
wilsaj Jul 29, 2016
5a634a9
use specific commit for github-api, per #124 (#125)
timwis Jul 29, 2016
8b2c48c
reconcile merge conflicts
timwis Jul 29, 2016
b259845
Merge branch 'wilsaj-github-api-v2.3.0' into gh-pages
timwis Jul 29, 2016
f41e86e
use jkan_theme property instead of theme per #127
timwis Oct 4, 2016
c7dd205
build
timwis Oct 4, 2016
10f4663
Updated _config.yml
timwis Oct 4, 2016
633cfa2
set theme back to default
timwis Oct 4, 2016
0111d1f
updated json dependency to 1.8.5 due to a ruby 2.4 compatibility erro…
tobinbradley May 15, 2017
18a92eb
Merge pull request #130 from tobinbradley/gh-pages
timwis May 16, 2017
419bf0e
typo in setting callback url
lxyu0405 Jun 12, 2017
edcf80b
Merge pull request #131 from lxyu0405/https-typo
timwis Jun 12, 2017
e3adb87
Fix dataset pluralisation
pezholio Jun 27, 2017
8316371
Merge pull request #132 from pezholio/fix-dataset-pluralisation
timwis Jun 27, 2017
8fea9ea
Remove links to tweets in README
amercader Sep 28, 2018
d99ff7c
Merge pull request #147 from amercader/patch-1
timwis Sep 28, 2018
fdc0a5d
copy develop instructions from okestonia branch
tursics Dec 30, 2018
ff71526
fix 'npm found 2 vulnerabilities (1 high, 1 critical)'
tursics Dec 30, 2018
b519eee
add the package-lock.json file
tursics Dec 30, 2018
7941922
Remove readme changes to split them into another PR
timwis Jan 27, 2019
dac4970
Merge pull request #151 from codeforberlin/bugfix/improve-install-steps
timwis Jan 27, 2019
8b50e44
JS Updates for Bootstrap 4
keeganmcbride Jan 27, 2019
8cb0169
Bootstrap 4 updates + NPM updates
keeganmcbride Feb 4, 2019
223362c
Fix some UI issues
keeganmcbride Feb 8, 2019
2957c2d
JS updates + fix category alignment + fix admin tab list +
keeganmcbride Jul 6, 2019
571ddc5
Update gems
keeganmcbride Jul 6, 2019
a12f82a
fix cancel buttons + layouts
keeganmcbride Jul 6, 2019
9a3db1c
Update the themes that are compatible with BS4 + change thumbnails.
keeganmcbride Jul 6, 2019
35bcb73
Fix organization + dataset edit layout.
keeganmcbride Jul 8, 2019
e85a9e9
Fix padding between search bar and datasets list
timwis Jul 29, 2019
8b26f38
Use flexbox on dataset and organisation pages
timwis Jul 29, 2019
aaa9f88
Fix mobile navbar issue.
keeganmcbride Jul 29, 2019
306871b
remove comments from navbar in header
keeganmcbride Jul 29, 2019
60d309f
Change dropdown menu to BS4
keeganmcbride Jan 31, 2020
f004643
Merge pull request #153 from timwis/bootstrap4
BryanQuigley Oct 13, 2022
8c7ab3a
Add docker compose option and switch CI from Travis to GH Actions
BryanQuigley Oct 13, 2022
156035b
Add Edit on Github pages for orgs/datasets
BryanQuigley Nov 4, 2022
5f18b15
Use built-in helper to generate GitHub edit link
timwis Nov 11, 2022
49bb0ec
Add basic Netlify CMS configuration for discussion
timwis Nov 15, 2022
08ed572
Allow grouping datasets by organization for easier navigation in Netl…
timwis Nov 16, 2022
d4f7383
Allow editing site settings in Netlify CMS
timwis Nov 16, 2022
d134854
Allow uploading organization logo
timwis Nov 18, 2022
e8d771a
Provide variable config to Netlify CMS from Jekyll
timwis Nov 18, 2022
afb8ae7
Wrap licenses.yml and categories.yml in a top-level 'items' key
timwis Nov 21, 2022
7332234
Make most fields optional in Netlify CMS form
timwis Nov 21, 2022
4f568f6
Add remaining fields in Netlify CMS form
timwis Nov 21, 2022
a29d2a7
Point 'Edit' buttons to Netlify CMS for datasets and organizations, a…
timwis Nov 21, 2022
4926e22
Support relative organization logo urls on organizations list
timwis Nov 21, 2022
d34652d
Force upgrade NPM everything
BryanQuigley Nov 4, 2022
1f41d9e
Update watch script to use webpack 5 API
timwis Nov 26, 2022
54b94e1
Merge pull request #196 from BryanQuigley/upgrade
timwis Nov 26, 2022
84743c2
Merge branch 'gh-pages' into netlify-cms
timwis Nov 26, 2022
1dc6188
Remove built-in editing UI
timwis Nov 26, 2022
f8f196d
Rename Netlify CMS directory and config file
timwis Jan 13, 2023
0898332
Merge pull request #203 from timwis/netlify-cms
timwis Jan 13, 2023
3a9dd1e
Merge pull request #213 from timwis/remove-built-in-editing
timwis Jan 13, 2023
67fd053
Add webrick to Gemfile for Ruby 3.x support
timwis Jan 15, 2023
895c6b6
Add basic netlify config
timwis Jan 15, 2023
b028185
Add jekyll as explicit dependency
timwis Jan 16, 2023
d2090c1
Remove netlify.toml
timwis Jan 16, 2023
4a3135b
Add .ruby-version
timwis Jan 16, 2023
372e65d
Merge pull request #222 from timwis/support-ruby-3x
timwis Jan 17, 2023
502cad6
Merge branch 'gh-pages' into v2
timwis Jan 17, 2023
22ee0aa
Add x86_64-linux platform to Gemfile.lock
timwis Jan 20, 2023
928ea5e
Remove default baseurl setting from _config.yml
timwis Jan 20, 2023
1c73a1e
Fix insecure content warning in sample dataset
timwis Jan 20, 2023
57e5033
Support nil baseurl in JavaScript
timwis Jan 20, 2023
b0c39be
Remove legacy config values from JavaScript
timwis Jan 20, 2023
90c1faf
Remove Netlify Identity JavaScript library
timwis Jan 22, 2023
028a579
Add Netlify deployment instructions to the README
timwis Jan 22, 2023
9ea2f7b
Merge branch 'v2' into netlify-deploy
timwis Jan 23, 2023
9b9bc98
Add netlify.toml to automatically set build command
timwis Jan 23, 2023
98a812b
Add Netlify Build plugin to generate metadata normally provided by gi…
timwis Jan 24, 2023
b8462a2
Set baseurl to empty string in _config_override.yml
timwis Jan 25, 2023
34c9dba
Save netlify branch to site.branch, and use that in editor config, de…
timwis Jan 26, 2023
7674ce7
Switch order config files are loaded in netlify build
timwis Jan 26, 2023
48e2d29
Improve readability of config generation in netlify build plugin
timwis Jan 26, 2023
722fe49
Remove instructions in README to change build command
timwis Jan 26, 2023
00458bd
Add GitHub Pages / self hosting docs
timwis Jan 27, 2023
8bba026
Merge pull request #226 from timwis/netlify-deploy
timwis Jan 27, 2023
bf9add9
Merge pull request #231 from timwis/self-host-docs
timwis Jan 27, 2023
8d22f88
Add categories list and category page template
lukemckinstry Dec 15, 2022
90d0195
Fix logos on categories list, and use site.categories on homepage
timwis Feb 2, 2023
eb73a60
Populate category datasets from basic where clause
timwis Feb 2, 2023
44a365c
Migrate _data/categories.yml into individual files in _categories col…
timwis Feb 2, 2023
78926ac
Fix edit button in category layout, and remove legacy view switcher
timwis Feb 3, 2023
035ec0f
Update Netlify CMS config to use categories collection instead of dat…
timwis Feb 3, 2023
100413f
Rename categories collection to dataset_categories
timwis Feb 6, 2023
ca6698c
Merge pull request #234 from timwis/category-pages
timwis Feb 6, 2023
4cd3ddf
Organization pages now show data without JS.
dracos Mar 28, 2018
e7346d9
Correct an if statement.
dracos Mar 28, 2018
a60ef97
Only show search filter if JS enabled.
dracos Mar 28, 2018
7f981d0
Use progressive enhancement on datasets page to ensure it works witho…
timwis Feb 7, 2023
02dca92
Move to Jekyll 4.2.2 in docker-compose
BryanQuigley Feb 6, 2023
bc8ba2c
Disable Natual language checks so build passes
BryanQuigley Feb 6, 2023
efed4bc
Merge pull request #237 from timwis/progressive-enhancement
timwis Feb 9, 2023
531b8f3
Use GitHub Actions to deploy to GitHub Pages
timwis Feb 9, 2023
c591688
Remove explicit ruby version from github actions workflow
timwis Feb 13, 2023
b950969
Fix breadcrumbs and org link
timwis Feb 13, 2023
fc0872d
Use parcel for JS bundling
timwis Feb 9, 2023
9241841
Tidy up package.json
timwis Feb 13, 2023
50fe0aa
Update package-lock.json with boilerplate package name removed
timwis Feb 14, 2023
f7f270b
Merge branch 'v2' into parcel
timwis Feb 14, 2023
3454f98
Add vendor to gitignore
lydiascarf Feb 14, 2023
4db43c5
Merge pull request #242 from lydiascarf/add-vendor-to-gitignore
timwis Feb 14, 2023
f047075
Merge branch 'v2' into parcel
timwis Feb 14, 2023
0f8c857
Merge pull request #240 from timwis/parcel
timwis Feb 14, 2023
b908355
Merge pull request #238 from timwis/github-actions-deploy-pages
timwis Feb 15, 2023
0efc107
Remove redundant breadcrumb on categories index page
timwis Feb 20, 2023
057c5c3
Merge pull request #239 from timwis/fix-breadcrumbs-and-org-link
timwis Feb 20, 2023
1e0a7bd
Add installation and running locally docs
timwis Feb 20, 2023
49254c6
Add upgrading docs
timwis Feb 21, 2023
81a7885
Add architecture docs
timwis Feb 23, 2023
bd68386
Add schema customisation docs
timwis Feb 27, 2023
dfe2132
Tidy up docs links on readme
timwis Feb 27, 2023
a1c545d
Define browser support, and add legacy browser build
timwis Feb 27, 2023
33c86db
Rename Netlify CMS references to Decap CMS
timwis Feb 28, 2023
9929675
Remove duplicate mentions of netlify cms in architecture docs
timwis Feb 28, 2023
f6831e1
Fix 'edit' URLs
timwis Feb 28, 2023
b8cfd65
Update organization link from org logo on dataset page
timwis Feb 28, 2023
ca5d08b
Remove form_template references in schema
timwis Feb 28, 2023
7d39108
Merge pull request #251 from timwis/rename-netlify-cms
timwis Mar 1, 2023
43871d5
Include editor and scripts in architecture directory listing
timwis Mar 1, 2023
bff67d4
Merge pull request #244 from timwis/versioned-docs
timwis Mar 1, 2023
d247d8a
Merge pull request #252 from timwis/fix-urls
timwis Mar 1, 2023
cd429dc
Merge pull request #250 from timwis/browser-support
timwis Mar 1, 2023
a4329e6
Fix docker spin up steps (#2)
Mar 3, 2023
d5614e9
Remove legacy authentication section from _config.yml
timwis Mar 14, 2023
a41c677
Fix git permissions so gh-pages can pull info from git-remotes
Mar 14, 2023
ac878be
Update files to exclude from build
Mar 16, 2023
abe99e3
Merge pull request #255 from timwis/remove-auth-from-config
timwis Mar 20, 2023
0d2a72c
Merge pull request #258 from timwis/v2_config_excluded_files
timwis Mar 20, 2023
e35657b
Add npm to docker container and instructions for use
Mar 16, 2023
9bca30d
Upgrade to bootstrap v5 in markup + fixes
timwis Mar 1, 2023
1a0667e
Upgrade bootstrap to v5 in package.json
Mar 20, 2023
7a9f089
Upgrade-related class name changes
Mar 20, 2023
ef72a4b
Add background back to breadcrumb
Mar 21, 2023
a481391
Drop deprecated media class
Mar 23, 2023
a281c4e
Merge pull request #260 from lydiascarf/lydiascarf/10-upgrade-to-boot…
timwis Mar 24, 2023
5de5991
Several UI Tweaks - categories, but mostly datasets page
Mar 27, 2023
7bbb321
Custom hero image
Mar 27, 2023
95f9e69
Homepage tweaks
Mar 29, 2023
758556e
Merge pull request #263 from lydiascarf/homepage-tweaks
timwis Mar 30, 2023
e1bbde6
Merge pull request #245 from timwis/v2
timwis Mar 30, 2023
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
1 change: 0 additions & 1 deletion .babelrc

This file was deleted.

11 changes: 11 additions & 0 deletions .github/super-linter.env
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
VALIDATE_ALL_CODEBASE=true
VALIDATE_CSS=false
VALIDATE_DOCKERFILE_HADOLINT=false
VALIDATE_EDITORCONFIG=false
VALIDATE_GITLEAKS=false
VALIDATE_HTML=false
VALIDATE_JAVASCRIPT_STANDARD=false
VALIDATE_JSCPD=false
VALIDATE_JSON=false
VALIDATE_MARKDOWN=false
VALIDATE_NATURAL_LANGUAGE=false
18 changes: 18 additions & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
---
name: CI

on:
pull_request:

jobs:
lint:
# Run GH Super-Linter against code base
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- run: cat .github/super-linter.env >> "$GITHUB_ENV"
- name: Lint Code Base
uses: github/super-linter@v4
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
DEFAULT_BRANCH: develop
70 changes: 70 additions & 0 deletions .github/workflows/github-pages.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
# This workflow uses actions that are not certified by GitHub.
# They are provided by a third-party and are governed by
# separate terms of service, privacy policy, and support
# documentation.

# Sample workflow for building and deploying a Jekyll site to GitHub Pages
name: Deploy Jekyll site to Pages

on:
# Runs on pushes targeting this branch
push:
branches: [gh-pages]

# Allows you to run this workflow manually from the Actions tab
workflow_dispatch:

# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
permissions:
contents: read
pages: write
id-token: write

# Allow one concurrent deployment
concurrency:
group: "pages"
cancel-in-progress: true

jobs:
# Build job
build:
runs-on: ubuntu-latest
steps:
- name: Checkout
uses: actions/checkout@v3
- name: Setup Ruby
uses: ruby/setup-ruby@ee2113536afb7f793eed4ce60e8d3b26db912da4 # v1.127.0
with:
bundler-cache: true # runs 'bundle install' and caches installed gems automatically
cache-version: 0 # Increment this number if you need to re-download cached gems
- name: Setup Pages
id: pages
uses: actions/configure-pages@v3
- name: Write metadata to a file Jekyll can use
env:
BRANCH: ${{ github.ref_name }}
run: |
echo "branch: $BRANCH" > _config.ci.yml
- name: Build with Jekyll
# Outputs to the './_site' directory by default
run: bundle exec jekyll build --baseurl "${{ steps.pages.outputs.base_path }}" --config _config.ci.yml,_config.yml
env:
JEKYLL_ENV: production
PAGES_REPO_NWO: ${{ github.repository }}
JEKYLL_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

- name: Upload artifact
# Automatically uploads an artifact from the './_site' directory by default
uses: actions/upload-pages-artifact@v1

# Deployment job
deploy:
environment:
name: github-pages
url: ${{ steps.deployment.outputs.page_url }}
runs-on: ubuntu-latest
needs: build
steps:
- name: Deploy to GitHub Pages
id: deployment
uses: actions/deploy-pages@v1
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,6 @@ _site
_config.dev.yml
node_modules
*.map
_config.ci.yml
.parcel-cache
vendor
1 change: 1 addition & 0 deletions .ruby-version
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
3.1.2
13 changes: 0 additions & 13 deletions .travis.yml

This file was deleted.

24 changes: 24 additions & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
FROM ruby:3.1-bullseye

ENV NODE_MAJOR_VERSION 18

RUN curl --silent --show-error --location --retry 5 --retry-connrefuse --retry-delay 4 https://deb.nodesource.com/setup_${NODE_MAJOR_VERSION}.x | bash - \
&& apt-get update \
&& apt-get install -y --quiet --no-install-recommends \
nodejs

ENV GEM_HOME=/usr/gem
ENV PATH="$GEM_HOME/bin/:$PATH"

RUN gem install bundler -v '2.4.3'
# throw errors if Gemfile has been modified since Gemfile.lock
RUN bundle config --global frozen 1

WORKDIR /srv/jekyll
COPY Gemfile Gemfile.lock ./
RUN bundle install

# Add so gh-pages can detect git remotes
RUN git config --global --add safe.directory /srv/jekyll

CMD ["/bin/bash"]
5 changes: 3 additions & 2 deletions Gemfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
source "https://rubygems.org"

gem "jekyll"
gem "html-proofer"
gem "github-pages", group: :jekyll_plugins
gem "jekyll", "~> 3.9"
gem "webrick", "~> 1.7"
Loading