Commit Graph

1506 Commits

Author SHA1 Message Date
jos d257c50746 Merge branch 'develop' of github.com:josdejong/jsoneditor into develop 2020-01-25 10:59:33 +01:00
jos eea9c797ad Added CSS classes on array and object nodes reflecting there expanded/collapsed state 2020-01-25 10:59:22 +01:00
fls-indinf bed062dda8 missing ` in navigationBar-Area (#887) 2020-01-21 19:40:09 +01:00
jos aa08a204f4 Publish v8.3.0 2020-01-18 14:30:01 +01:00
jos 7d4b72fb38 Publish v8.3.0 2020-01-18 14:26:28 +01:00
jos b3c0eedc08 Fix #790: editor breaking when missing some translations 2020-01-18 14:19:06 +01:00
jos 259b32d441 Publish v8.2.0 2020-01-16 19:43:55 +01:00
petermanders89 dab47eef75 Changing sass variables #881 (#882)
* Added !default to SASS color variables

* Added variable for icon path

* Small styling change in the icon variable

* Added default to the jse-icons variable
2020-01-16 19:38:18 +01:00
jos 0f031dc6cd Publish `v8.1.2` 2020-01-06 20:01:54 +01:00
Jos de Jong 090d41f8d9 Fix #877: Some CSS styling issues when used in combination with Materialize 2020-01-04 16:05:25 +01:00
Jos de Jong 0c061b33e3 Intent with 2 spaces 2020-01-04 15:09:15 +01:00
Jos de Jong 924ca1afc3 Fix #873: buttons Format, Compact, and Repair not supporting internationalization 2020-01-04 15:05:42 +01:00
jos 09827482bc Update history 2020-01-04 12:29:27 +01:00
jos d12a5e7cf2 Improve projection in example to flatten picking a single field 2020-01-04 12:24:12 +01:00
jos ad430a3173 Improve example with a `projection` which flattens the selected fields 2020-01-04 12:21:01 +01:00
jos 540566f0cd Write docs for `createQuery`, `executeQuery`, and `queryDescription` 2020-01-04 12:06:35 +01:00
jos 9ed5d5c5ae Work out handling of `'@'` field in example 2020-01-04 11:41:11 +01:00
jos 32871f85fd Work out error handling 2020-01-04 11:11:09 +01:00
jos 40d312b987 Work out fixme in the example 2020-01-04 10:46:21 +01:00
jos e09fde628b Change `showTransformModal` to pass an object with properties. Fix transform not working in `text` and `preview` mode. 2020-01-04 10:39:34 +01:00
jos aba0a58383 Change `showTransformModal` to pass an object with properties. Fix transform not working in `text` and `preview` mode. 2020-01-04 10:16:32 +01:00
jos 6ece0f9acb Merge branch 'develop' into feature/custom_query_language
# Conflicts:
#	src/js/JSONEditor.js
2020-01-04 09:59:22 +01:00
jos 3615b841c5 Change maintenance badge to 2020 2020-01-04 09:53:35 +01:00
jos 042cd1be79 Publish v8.1.1 2019-12-28 17:59:12 +01:00
jos 10a48ca7b2 Fix lint issues 2019-12-28 17:17:27 +01:00
jos 275fcc8fee Changed the file size reported in `preview` mode to `KB` and `MB` 2019-12-28 17:12:56 +01:00
jos 7729e8b38e Update devDependencies 2019-12-27 22:31:52 +01:00
jos c059fdb543 Have the preview test file actually load `preview` mode 2019-12-27 22:31:01 +01:00
jos 4937337147 Publish v8.1.0 2019-12-18 17:42:00 +01:00
jos d973464545 Rename test file 2019-12-18 17:39:32 +01:00
jos 582e0b1fc1 Fix color picker positioning when `popupAnchor` is defined 2019-12-18 17:37:25 +01:00
jos f86f3d4e1c Implemented `popupAnchor` allowing to select a custom anchor element. See #869 and #870. 2019-12-18 17:26:16 +01:00
jos 036c9e1914 Merge remote-tracking branch 'origin/develop' into develop 2019-12-16 20:29:06 +01:00
jos 7c3695df4a Fixed #502: CSS rule `* { font-family: ... }` resulting in Ace editor (`code` mode) not having a mono-space font anymore 2019-12-16 20:28:46 +01:00
greenkeeper[bot] 1f02eda866 Update jsoneditor in group default to the latest version 🚀 (#868)
* fix(package): update jsoneditor to version 8.0.0

* fix(package): update jsoneditor to version 8.0.0

* chore(package): update lockfile examples/react_demo/package-lock.json

* chore(package): update lockfile examples/react_advanced_demo/package-lock.json
2019-12-11 17:37:48 +01:00
jos c766290bf7 Fix linting issues 2019-12-11 17:12:37 +01:00
jos d2332dc308 Implement proof of concept for `createQuery` and `executeQuery`, see #857 2019-12-11 17:09:47 +01:00
jos 4eb55bffde Publish v8.0.0 2019-12-11 12:09:54 +01:00
jos 3aba2c243b Oops 2019-12-11 12:09:03 +01:00
jos 5c7e1e6fe9 Changed the behavior of `timestampTag` to fallback on the built-in rules when the function does not return a boolean. See #856. 2019-12-11 12:08:31 +01:00
jos 00c02b9bcf Publish v7.6.0 2019-12-11 11:56:50 +01:00
jos 03fa90bd71 Revert using field names to determine whether a value is a timestamp (see #847, #856) 2019-12-11 11:51:48 +01:00
jos a55977830f Update history 2019-12-11 11:39:05 +01:00
jos fd21b1c525 Add title for timestamp tag again (see #863) 2019-12-11 11:37:39 +01:00
Small ce15bb4b37 add timestampFormat (#863)
* add timestampFormat

* use createTextNode instead innerHTML
2019-12-11 11:34:24 +01:00
jos 90423573ab Publish v7.5.0 2019-12-08 21:53:55 +01:00
jos b73a7495fe Update history 2019-12-08 10:46:21 +01:00
Meir Rotstein 84950ac69a onValidationError to report any kind of error (#861)
* onValidationError to report any kind of error

* lint fixes
2019-12-08 10:35:22 +01:00
jos 7888dcf660 Update dependencies 2019-12-08 10:21:58 +01:00
jos 45ade363f4 Update dependencies of example projects 2019-12-08 10:19:21 +01:00