Skip to content

Commit

Permalink
Merge branch 'master' of github.com:KeroVieux/react-jsonschema-form
Browse files Browse the repository at this point in the history
* 'master' of github.com:KeroVieux/react-jsonschema-form:
  updated
  replace submit button paragraph tag with div (rjsf-team#766)
  Fixes rjsf-team#824 (rjsf-team#1147)
  Fix bug where matching anyOf branch is not selected correctly (rjsf-team#1129)
  Document a gotcha with `additionalProperties` (rjsf-team#1149)
  doc: add permalinks and fix internal hyperlinks in documentation
  doc: add doc build instructions, update PR/issue templates with doc links
  Add onBlur and onFocus events for radio and checkbox widgets (rjsf-team#1143)
  add ui:help tips (rjsf-team#1145)
  doc: fix browserstack logo size
  docs: remove docs from README and link to readthedocs rjsf-team#1138
  doc: organize docs into separate files rjsf-team#1138
  doc: add browserstack logo rjsf-team#990
  Add test and update documentation for using anyOf inside array items (rjsf-team#1131)

# Conflicts:
#	src/components/Form.js
  • Loading branch information
KeroVieux committed Jan 25, 2019
2 parents 23303f5 + a6fd525 commit 7108bf3
Show file tree
Hide file tree
Showing 19 changed files with 2,154 additions and 3,543 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
npm-debug.log
node_modules
build
_build
site
dist
lib
yarn.lock
5 changes: 2 additions & 3 deletions ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
### Prerequisites

- [ ] I have read the [documentation](https://github.com/mozilla-services/react-jsonschema-form/blob/master/README.md#readme);
- [ ] I have read the [documentation](https://react-jsonschema-form.readthedocs.io/);
- [ ] In the case of a bug report, I understand that providing a [SSCCE](http://sscce.org/) example is tremendously useful to the maintainers.
- [ ] Ideally, I'm providing a [sample JSFiddle](https://jsfiddle.net/n1k0/f2y3fq7L/6/) or a [shared playground link](https://mozilla-services.github.io/react-jsonschema-form/) demonstrating the issue.

### Description

Expand All @@ -13,8 +14,6 @@
2. [Second Step]
3. [and so on...]

Ideally, I'm providing a [sample JSFiddle](https://jsfiddle.net/n1k0/f2y3fq7L/6/) or a [shared playground link](https://mozilla-services.github.io/react-jsonschema-form/) demonstrating the issue.

#### Expected behavior

[What you expected to happen]
Expand Down
5 changes: 2 additions & 3 deletions PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@ If this is related to existing tickets, include links to them as well.
### Checklist

* [ ] **I'm updating documentation**
- [ ] I've checked the rendering of the Markdown text I've added
- [ ] If I'm adding a new section, I've updated the Table of Content
- [ ] I've [checked the rendering](https://react-jsonschema-form.readthedocs.io/en/latest/#contributing) of the Markdown text I've added
* [ ] **I'm adding or updating code**
- [ ] I've added and/or updated tests
- [ ] I've updated docs if needed
- [ ] I've updated [docs](https://react-jsonschema-form.readthedocs.io/) if needed
- [ ] I've run `npm run cs-format` on my branch to conform my code to [prettier](https://github.com/prettier/prettier) coding style
* [ ] **I'm adding a new feature**
- [ ] I've updated the playground with an example use of the feature
Loading

0 comments on commit 7108bf3

Please sign in to comment.