0adf824f5b
Merge remote-tracking branch 'origin/develop' into develop
2017-04-15 11:51:56 +02:00
fd91632904
Merge branch 'master' into develop
2017-04-15 11:51:49 +02:00
3d2bf6bd48
Updated text
2017-04-14 14:34:31 +02:00
fcecb3fc2a
Updated text
2017-04-14 14:32:03 +02:00
77b7e10220
Updated text
2017-04-14 14:21:10 +02:00
66dced1dd3
Fixed image?
2017-04-14 14:17:15 +02:00
0007ee8de4
Added images again
2017-04-14 14:16:01 +02:00
fe3dffacf3
Drop broken images
2017-04-14 14:13:58 +02:00
d258167837
Renamed images
2017-04-14 14:11:35 +02:00
ac7ec05d1d
Switched to png image instead of svg
2017-04-14 14:10:07 +02:00
d152aea2ad
Switched to png image instead of svg
2017-04-14 14:09:47 +02:00
23b5b301c6
Fixed broken link
2017-04-14 14:08:22 +02:00
b26024b6e3
Merge remote-tracking branch 'origin/master'
2017-04-14 14:06:47 +02:00
e497f54f6d
Added link to BrowserStack
2017-04-14 14:06:25 +02:00
eadf5c6403
Merge pull request #383 from walkerrandolphsmith/develop
...
#382 Read only text mode.
2017-04-12 21:08:57 +02:00
c0b7139fd2
#382 Rename example file.
2017-04-12 11:51:50 -04:00
3539f40dc5
#382 Support read only code mode.
2017-04-12 11:51:50 -04:00
c29bcba5ff
#382 typo on typeof function check
2017-04-12 11:51:50 -04:00
2c72173366
#382 Read only text mode.
2017-04-12 11:51:50 -04:00
cfc5a805e7
Merge pull request #381 from chinesedfan/fix_bkgcolor
...
Optimize the input experience of Chinese IME
2017-04-04 22:00:14 +02:00
1265ed78a9
Merge pull request #380 from chinesedfan/upgrade_ace
...
Fixed #253 : upgrade ace to 1.2.6
2017-04-04 21:57:39 +02:00
a768784643
Optimize the input experience of Chinese IME
2017-03-30 16:38:53 +08:00
f5edad2d31
Fixed #253 : upgrade ace to 1.2.6
2017-03-30 14:23:16 +08:00
e1f686b8e5
Fixed #368 : Mode selection drop down not fully visible on small screen
2017-02-26 20:40:12 +01:00
6b5b54052c
Merge pull request #355 from isonet/master
...
Suggesting a different directive for Angular.js.
2017-01-21 21:12:35 +01:00
4bde72f7cf
Suggesting a different directive for Angular.js.
2017-01-18 09:13:37 +01:00
717ed48474
Fixed #309 : already loaded version of Ace being overwritten by the embedded version of JSONEditor
2017-01-06 21:46:23 +01:00
3117789ed7
Released v5.5.11
2017-01-06 20:58:19 +01:00
2f4f221c9a
Better fix for #347 (earlier fix introduced other CSS issues)
2017-01-06 20:56:03 +01:00
74b9aaf5fa
Fixed #347 : CSS more robust against global settings of div position
2017-01-03 20:43:43 +01:00
1c8ea64c2a
Fixed #54 : CSS more robust against global settings of div position
2017-01-03 20:43:10 +01:00
94ca26e457
Fixed a styling issue with Ace search box
2017-01-03 20:36:08 +01:00
8dc4752872
Fixed embedded version of jsoneditor ace theme not being loaded in minimalist version. Added docs and example on loading a custom Ace editor (see #55 )
2017-01-03 20:23:03 +01:00
4bc339f6fe
Released v5.5.10
2016-11-02 21:03:18 +01:00
df12832a6b
Fixed #85 : pressing enter in an input in a form containing a JSONEditor too breaks submitting the form
2016-11-01 21:00:21 +01:00
d73665acf3
Released v5.5.9
2016-10-17 21:16:01 +02:00
8913ce1f6f
Fixed #329 : Editor showing duplicate key warnings for keys defined on the Object prototype, like `toString` and `watch`
2016-10-15 10:49:44 +02:00
cee259f2a5
Released v5.5.8
2016-09-27 21:07:31 +02:00
4aa9e7db7f
Updated history
2016-09-24 19:23:31 +02:00
b4c9417b7a
Merge pull request #326 from nprdm/master
...
Fix https://github.com/josdejong/jsoneditor/issues/314
2016-09-24 19:20:51 +02:00
fe459e64c3
Update built artifacts with fix from 48408f4ded
2016-09-22 18:25:27 -04:00
48408f4ded
Fix https://github.com/josdejong/jsoneditor/issues/314
...
The JSON path parsing code assumes that string keys within square brackets in JSON paths will be valid, parseable JSON.
However, the ajv library on which this project depends emits string keys in single quotes.
For example, ajv can emit .foo['bar'], which will ultimately end up with a call to JSON.parse("'bar'"). This causes the "Unexpected token ' in JSON at position 0" error thrown from JSON.parse.
Since ajv shouldn't need to change and since this utility is gone in the next branch, this fix checks for ajv-formatted string keys and patches them to double-quoted strings before calling JSON.parse. This is the narrowest fix for the problem.
2016-09-22 18:06:22 -04:00
02f81ea8de
Released v5.5.7
2016-08-17 21:29:14 +02:00
e4073905a5
Fixed #308 : wrong positioning of label "empty array" when `onEditable` returns false
2016-07-05 20:09:34 +02:00
91d9bc6903
Released version 5.5.6
2016-06-15 19:35:28 +02:00
c2c7dd5adf
Fixed #303 : editor contents collapsed when the parent div of the JSONEditor has no height set
2016-06-06 21:25:45 +02:00
410dffbce7
Updated history
2016-06-06 21:11:31 +02:00
45be754de8
Merge pull request #305 from RDCH106/master
...
Added save dialog to example 4
2016-06-06 21:09:18 +02:00
9bf3e37153
Added save dialog
2016-06-03 19:32:21 +02:00
f084180730
Released v5.5.5
2016-05-24 19:54:56 +02:00
jos
Walker Randolph Smith
Xianming Zhong
Paul Biester
Stephen Thompson
Rubén de Celis Hernández