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.

Sign up for GitHub

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

Jump to bottom

Cherry pick commits from jdorn/json-editor #1

Merged
merged 20 commits into from
Apr 20, 2016
Merged

Cherry pick commits from jdorn/json-editor #1

merged 20 commits into from
Apr 20, 2016

Conversation

jhnns
Copy link

@jhnns jhnns commented Apr 19, 2016

Cherry picked commits from https://github.com/jdorn/json-editor.

Contains these features:

Most notably: jdorn@ee9b215 which adds an option to remove enum properties when the property is not flagged as required in the schema.

englercj and others added 20 commits April 18, 2016 16:24
@englercj @jhnns
optimize a few utility functions
2c4c0bc 
(cherry picked from commit 0124eed)
@jhnns
Move switcher styles to theme.
62ac2cc 
(cherry picked from commit e7b7712)
@brettz9 @jhnns
Check that regex matching template vars is not null
200ec8f 
(cherry picked from commit 027d53e)
@brettz9 @jhnns
Avoid displaying string "undefined" when value is undefined
c46f062 
(cherry picked from commit 0fe72a2)
@kshepard @jhnns
Allow spaces in template variables
246e901 
(cherry picked from commit 1f96a06)
@lepinay @jhnns
optional select option on bool and enumerated properties
6d4514d 
(cherry picked from commit ee9b215)
@lepinay @jhnns
jshint
95f7a1c 
(cherry picked from commit 54ba7d2)
@lepinay @jhnns
required as property list
f35a9ae 
(cherry picked from commit 24ccab3)
@jdorn @jhnns
jslint fix
9bd9938 
(cherry picked from commit 49dc2d3)
@jhnns
Added the possibility filter on watched variables
a556eda 
(cherry picked from commit 43d1063)
@jdorn @jhnns
Version bump to 0.7.22
7e71adf 
(cherry picked from commit 729b587)
@jdorn @jhnns
Fire select2 change event on change instead of blur, reduce duplicate…
65d5273 
… change firing for select editor.

Closes jdorn#501
(cherry picked from commit 451fc93)
@jhnns
Fix gramatical error in validation message. Fixes jdorn#511
1a69427 
(cherry picked from commit 3a6e6ae)

# Conflicts:
#	src/defaults.js
@lepinay @jhnns
Infers that when type is not set but properties are defined, we can i…
00468f1 
…nfer that type is actually object

(cherry picked from commit 9678499)
@jdorn @jhnns
Move inline style to themes so it can be overridden. Fixes jdorn#509
28900ff 
(cherry picked from commit 635adc1)
@jdorn @jhnns
Add custom_validators option to set instance-specific custom validato…
b8e34b8 
…rs. Fixes jdorn#503

(cherry picked from commit 0d7b2c8)
@tvolf @jhnns
Add download attribute for link tag to transfer downloaded filename
11e6f05 
(cherry picked from commit f3df3f1)
@jdorn @jhnns
Cleanup download code, improve documentation.
3c75201 
(cherry picked from commit 8ee407e)
@jhnns
Improve documentation
96e2aef 
(some lines are cherry picked from commit 2b66657)
@jhnns
Add dist
b805878
@sagold sagold merged commit dd352b1 into sueddeutsche:develop Apr 20, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
8 participants
@jhnns @sagold @englercj @brettz9 @kshepard @lepinay @jdorn @tvolf