Commit Graph

1329 Commits

Author SHA1 Message Date
jos 94956ab038 Added accidentally removed screenshots again to the readme 2014-07-28 21:21:28 +02:00
jos 939632d5b0 Merge remote-tracking branch 'origin/master' 2014-07-28 21:14:20 +02:00
jos e2192df650 Merge branch 'develop'
Conflicts:
	README.md
2014-07-28 21:13:56 +02:00
jos e043a500be Released version 3.1.0 2014-07-28 21:11:55 +02:00
jos bc4a0ae25f Added a documentation page with shortcut keys 2014-07-28 21:00:41 +02:00
jos ca84b340bd Fixed: shortcut keys to manipulate the nodes are now disabled when mode is `form` or `view`. 2014-07-28 20:56:19 +02:00
jos 1671dc7da7 Documented `editable` option 2014-07-28 08:45:31 +02:00
jos 24bc21e00a Oops... uncommented try/catch again 2014-07-27 21:09:33 +02:00
jos b947e868eb Improved the `editable` callback: now also provides the path to a node and the nodes value 2014-07-27 21:08:59 +02:00
jos 1133024ae7 Implemented setting editable/readonly nodes individually via config function `editable` 2014-07-27 15:46:42 +02:00
jos c72ea9b6e1 Fixed #111: accept JavaScript objects as input, and turn them into valid JSON 2014-07-26 15:01:53 +02:00
jos bb53153d3b Added an example showing how to load/save local files 2014-07-21 21:04:11 +02:00
Jos de Jong c4fb31e8c6 Merge pull request #107 from ROMOPAT/patch-1
Typo in README.md
2014-06-12 16:18:25 +02:00
Patrick Romowicz ad029075c1 Typo in README.md 2014-06-12 15:40:28 +02:00
jos 5f43dcf1f3 Readme updated, ignored files in bower.json updated 2014-05-31 21:32:03 +02:00
jos b6f0e09996 Updated readme 2014-05-31 21:15:38 +02:00
jos a0283ef72e Ignoring gulpfile in npm 2014-05-31 21:12:50 +02:00
jos 9daad4e811 Released version 3.0.0 2014-05-31 21:10:53 +02:00
jos 6ce6cbdb60 Fixed build script 2014-05-31 21:09:13 +02:00
jos 4ea91d45b4 Added a how to publish description 2014-05-31 21:08:17 +02:00
jos ff6e54b715 Added zip task 2014-05-31 21:01:30 +02:00
jos 286c55fb40 Added all ace dependencies to ./asset/ace 2014-05-31 20:42:35 +02:00
jos 09fe8169d0 Fixed an error in registerMode 2014-05-30 21:28:40 +02:00
jos 459c2681ec Improved registerMode and setMode 2014-05-30 11:33:15 +02:00
jos 0c1331ba12 Changed TreeEditor and TextEditor into mixins for JSONEditor 2014-05-30 10:53:57 +02:00
jos 955232d587 Written build script for assets 2014-05-30 10:33:11 +02:00
jos 5f9d4a54a2 Added css concat and minify to gulpfile 2014-05-29 22:35:47 +02:00
jos d6da7f548e Refactored JSONEditor sourcecode to AMD modules 2014-05-29 22:13:37 +02:00
jos 6eea2b6335 Renamed files to match the contained prototype 2014-05-29 18:51:17 +02:00
jos 282dc4f7ac Moved sourcecode from `/jsoneditor` to `/src` 2014-05-29 18:42:14 +02:00
jos 4eae0cff1f Loading assets Ace Editor and JSONLint via npm. Auto build assets. 2014-05-29 18:35:39 +02:00
jos 85100e9fb4 Removed web application from the project 2014-05-29 14:22:50 +02:00
josdejong ec2b9fffdf Partly fix for #88: Indent mismatch 2014-02-19 20:34:41 +01:00
josdejong 45bed61601 Updated version number to 2.3.7-SNAPSHOT 2014-01-03 17:29:47 +01:00
josdejong b47fdf153a Released version 2.3.6 (Fixed #82) 2014-01-03 17:15:53 +01:00
josdejong 975a93442a Updated version number to 2.3.6-SNAPSHOT 2013-12-09 20:52:39 +01:00
josdejong 91a3f9c656 Released version 2.3.5 2013-12-09 20:36:24 +01:00
josdejong 870169447f Fixed #81: issue with non-breaking space characters 2013-12-07 15:51:23 +01:00
josdejong e302507c7a Fixed #80 and #70 (again) 2013-12-07 15:30:11 +01:00
josdejong e3bd8379f1 Updated version number to 2.3.5-SNAPSHOT 2013-11-19 19:52:04 +01:00
josdejong 7f960cdea5 Released version 2.3.4 2013-11-19 19:26:33 +01:00
josdejong 8e07ebb711 Switched everything to 2-space indentation 2013-11-15 18:11:50 +01:00
josdejong 8ddc6f3946 Disabled saving files using HTML5 on Firefox to prevent a Firefox bug 2013-11-15 16:03:52 +01:00
josdejong 1c1ffe4b8f Fixed blocking of mouse scroll when context menu is visible 2013-11-15 15:49:25 +01:00
josdejong 65c0c480d2 Cleaned up legacy code for IE8 2013-11-15 15:42:11 +01:00
josdejong 35568380f2 Dropped support for IE8 (was already broken). Improved error message for unsupported browsers. 2013-11-15 14:56:12 +01:00
josdejong 02843155b6 Merge branch 'master' into develop 2013-11-15 13:31:56 +01:00
Jos de Jong 8ab84aac27 Merge pull request #78 from d3lity/patch-1
typo fixed: JSON.stingify => JSON.stringify
2013-11-07 10:50:10 -08:00
d3lity ef2b073e84 typo fixed: JSON.stingify => JSON.stringify 2013-11-07 14:37:47 +02:00
josdejong f4ed563eed Updated version to 2.3.4-SNAPSHOT 2013-10-17 11:28:44 +02:00