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

Commit 6e5c7bd

Browse files
authored
Merge pull request #1 from json-schema-org/master
Pull changes
2 parents 645f333 + 344f939 commit 6e5c7bd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+4941
-143
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,7 @@
2626
[submodule "_includes/draft/2019-09"]
2727
path = _includes/draft/2019-09
2828
url = https://github.com/json-schema-org/json-schema-spec.git
29+
[submodule "_includes/draft/2020-12"]
30+
path = _includes/draft/2020-12
31+
url = https://github.com/json-schema-org/json-schema-spec.git
32+
branch = 2020-12

Gemfile.lock

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -247,4 +247,4 @@ DEPENDENCIES
247247
github-pages
248248

249249
BUNDLED WITH
250-
1.16.1
250+
2.2.7

README.md

Lines changed: 28 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,36 @@ For the current status of issues and pull requests, please see the following bad
1212
[![Available](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20Available.svg?color=brightgreen)](https://github.com/json-schema-org/json-schema-org.github.io/issues?q=is%3Aopen+is%3Aissue+label%3A%22Status%3A+Available%22) [![In Progress](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20In%20Progress.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Status:%20In%20Progress) [![Review Needed](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Status:%20Review%20Needed.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Status%3A%20Review%20Needed)
1313

1414
[![Critical](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Critical.svg?color=critical
15-
)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Critical) [![High](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20High.svg?color=important)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20High) [![Medium](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Medium.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Medium) [![Low](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Low.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Low)
15+
)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Critical) [![High](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20High.svg?color=important)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20High) [![Medium](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Medium.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Medium) [![Low](https://img.shields.io/github/issues/json-schema-org/json-schema-org.github.io/Priority:%20Low.svg)](https://github.com/json-schema-org/json-schema-org.github.io/labels/Priority%3A%20Low)
1616

1717
Labels are assigned based on [Sensible Github Labels](https://github.com/Relequestual/sensible-github-labels).
1818

19+
## Compile and run locally
20+
21+
This site runs via github pages, with automatically building PR previews via netlify.
22+
If you wish to compile and run this site locally, you will need to have ruby installed.
23+
24+
If you're not familiar with ruby, consider using `rvm` (https://rvm.io/).
25+
Once you have Ruby installed, follow these instructions while in the project directory
26+
27+
> Instructions
28+
>
29+
> 1. Install the jekyll and bundler gems.
30+
>
31+
> `gem install jekyll bundler`
32+
>
33+
> 2. Create a new Jekyll site at ./myblog.
34+
>
35+
> ...
36+
>
37+
> 3. Build the site and make it available on a local server.
38+
>
39+
> `bundle exec jekyll serve`
40+
>
41+
> 4. Browse to http://localhost:4000
42+
43+
Adapted from https://jekyllrb.com/docs/
44+
1945
## License
2046

21-
The source material in this repository is licensed under the AFL or BSD license.
47+
The source material in this repository is licensed under the AFL or BSD license.

_data/validator-libraries-modern.yml

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,13 @@
101101
date-draft: [2019-09]
102102
draft: [7, 6]
103103
license: GNU Affero General Public License v3.0
104+
- name: Vert.x Json Schema
105+
url: https://github.com/eclipse-vertx/vertx-json-schema
106+
notes: Validator for Eclipse Vert.x project JSON types.
107+
date-draft: [2019-09]
108+
draft: [7]
109+
license: Apache License, Version 2.0
110+
notes: includes custom keywords support, custom dialect support, asynchronous validation
104111
- name: everit-org/json-schema
105112
url: https://github.com/everit-org/json-schema
106113
notes:
@@ -130,9 +137,9 @@
130137
- name: JavaScript
131138
implementations:
132139
- name: ajv
133-
url: https://github.com/epoberezkin/ajv
134-
notes: "for Node.js and browsers - supports [custom keywords](https://github.com/epoberezkin/ajv-keywords) and [$data reference](https://github.com/json-schema-org/json-schema-spec/issues/51)"
135-
date-draft:
140+
url: https://github.com/ajv-validator/ajv
141+
notes: "for Node.js and browsers - supports [user-defined keywords](https://github.com/ajv-validator/ajv/blob/master/docs/keywords.md) and [$data reference](https://github.com/json-schema-org/json-schema-spec/issues/51)"
142+
date-draft: [2019-09]
136143
draft: [7, 6, 4]
137144
license: MIT
138145
- name: djv

_includes/draft-06

Submodule draft-06 updated 1 file

_includes/draft/2020-12

Submodule 2020-12 added at 0e08f03

_includes/footer.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ <h2 class="footer-heading">{{ site.title | escape }}</h2>
1212
{% include icon-github.html username=site.github_username %}
1313
</li>
1414
{% endif %}
15-
<li>Discussion: <a href="https://join.slack.com/t/json-schema/shared_invite/enQtNjc5NTk0MzkzODg5LTVlZGIxNmVhMGY2MWFlYTdiNDQ5NWFiZGUwOThhNmYxZDE0YzA5YjRiOTA5MGY4ZTZlZGZhZDFmYTY4NWM2N2Y">Slack</a> | <a href="https://groups.google.com/forum/#!forum/json-schema">Google Groups</a></li>
15+
<li>Discussion: <a href="/slack">Slack</a> | <a href="https://groups.google.com/forum/#!forum/json-schema">Google Groups</a></li>
1616
<li>Site edits: <a href="https://github.com/json-schema-org/json-schema-org.github.io">GitHub repo for site</a></li>
1717
</ul>
1818
</div>

_includes/header.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
<a class="page-link" href="{{ my_page.url | relative_url }}">{{ my_page.title | escape }}</a>
2626
{%- endif -%}
2727
{% endfor -%}
28-
<a class="page-link" href="https://join.slack.com/t/json-schema/shared_invite/enQtNjc5NTk0MzkzODg5LTVlZGIxNmVhMGY2MWFlYTdiNDQ5NWFiZGUwOThhNmYxZDE0YzA5YjRiOTA5MGY4ZTZlZGZhZDFmYTY4NWM2N2Y">Join our Slack</a>
28+
<a class="page-link" href="/slack">Join our Slack</a>
2929
</div>
3030
</nav>
3131
{%- endif -%}

0 commit comments

Comments
 (0)