Commit Graph

358 Commits

Author SHA1 Message Date
jos 0db2c35c2b Using brace to load Ace. Ace and jsonlint are now packed by default with JSONEditor. Removed all redundant build stuff for the assets. 2015-02-27 21:54:04 +01:00
jos c18145f503 Reworked the source code to commonjs modules 2015-02-27 21:17:19 +01:00
jos abc3ac3625 Fixed #163: updated npm dependencies 2015-02-10 22:14:45 +01:00
jos 6653021fd8 Added a CONTRIBUTING.md file 2015-02-10 21:41:47 +01:00
jos 63e61dd817 Merge remote-tracking branch 'origin/master' 2015-01-25 15:12:20 +01:00
jos 376fc272ce Released version 3.2.0 2015-01-25 15:11:56 +01:00
jos 3f6f5d2a70 Fixed configured indentation not being applied to Ace editor (see #158) 2015-01-25 15:05:07 +01:00
jos f1e49c2ad0 Merge remote-tracking branch 'origin/develop' into develop 2015-01-23 10:39:24 +01:00
jos 82e4627e0e Fixed #154: Implemented shortcut keys to format and compact JSON when in mode `text` or `code`. 2015-01-23 10:39:12 +01:00
Jos de Jong 4d8d1c72fa Merge pull request #152 from hhzl/master
file name is jsoneditor.min.js
2014-12-22 10:47:14 +01:00
Hannes Hirzel 1ac05f41ac file name is jsoneditor.min.js 2014-12-21 18:34:58 +00:00
Jos de Jong 19cbdd03f7 Merge pull request #147 from DeanPoulin/develop
Included jsoneditor.css as a Main Component
2014-11-13 19:43:24 +01:00
Dean Poulin 3348dfc096 Included jsoneditor.css as a Main Component
Added the css file to bower so that the css will be identified as a main component used. Making this change allows gulp to identify the css and inject it into the project automatically at build time.

Executing the following shell commands:

    yo gulp-angular
    bower install jsoneditor --save
    gulp build

will result in the index.html automatically being injected as seen below:

    <!-- bower:css -->
    <link rel="stylesheet" href="../bower_components/jsoneditor/jsoneditor.css" />
    <!-- endbower -->
    <!-- endbuild -->

    <!-- build:js scripts/vendor.js -->
    <!-- bower:js -->
    <script src="../bower_components/jsoneditor/jsoneditor.min.js"></script>
    <!-- endbower -->
    <!-- endbuild -->
2014-11-13 13:31:02 -05:00
jos 66f41d87fd Merge branch 'master' into develop 2014-10-20 21:20:41 +02:00
Jos de Jong 75647308da Merge pull request #139 from tomalec/138-emptyStringPath
Use `""` as valid path in JSON
2014-10-20 21:18:32 +02:00
Tomek Wytrebowicz 8c4162f0bb Use `""` as valid path in JSON - fix for josdejong/jsoneditor#138 2014-10-18 01:59:24 +02:00
jos 2c84da0998 a css fix for firefox 2014-10-09 15:29:17 +02:00
jos 330e5bb6d1 Fixed #129: code is sanitized before throwing an error 2014-09-13 10:04:55 +02:00
jos cc1b12effc Updated version number to 3.1.3-SNAPSHOT 2014-09-03 12:02:05 +02:00
jos b03dd76c81 Released version 3.1.2 2014-09-03 11:54:08 +02:00
jos 14db0632c2 Fixed #126: lack of a semi colon at end of the bundled files 2014-08-28 21:20:14 +02:00
jos b0a1795c12 Some simplifications in parseJS 2014-08-01 09:46:50 +02:00
jos 8ca4c75326 Some more fixes in `parseJS` 2014-08-01 09:33:00 +02:00
jos fada177c4a Fixed `parseJS` not being able to parse a single quoted string to JSON 2014-08-01 09:06:54 +02:00
jos 2662d04b4d Updated version number to 3.2.0-SNAPSHOT 2014-08-01 08:57:47 +02:00
jos af3763e747 Added field main to bower.json 2014-08-01 08:55:53 +02:00
jos 4d58258919 Released version 3.1.1 2014-08-01 08:52:34 +02:00
jos fb16ec4586 Replaced parsing of JavaScript objects into JSON from `eval` to a dedicated `parseJS` function 2014-08-01 08:49:06 +02:00
jos 7ab134b95e Bumped version number to 3.2.0-SNAPSHOT 2014-07-28 22:02:57 +02:00
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