Commit Graph

614 Commits

Author SHA1 Message Date
Jos de Jong 9187c4b26d Merge pull request #243 from 1j01/svg
Use SVG for icons
2015-12-14 19:56:56 +01:00
Isaiah Odhner b03e9cedc4 Use pseudo-elements for field/value placeholders 2015-12-12 11:41:05 -05:00
Isaiah Odhner 65fc58005c Use SVG for icons 2015-12-11 22:35:57 -05:00
jos 277bb185d5 Fixed #234: Remove dependency on a fork of the `jsonlint` project on github 2015-11-07 19:20:19 +01:00
jos c6ff2d0197 Merge remote-tracking branch 'origin/develop' into develop 2015-11-02 20:46:29 +01:00
Jos de Jong cd04fe1ba6 Merge pull request #233 from tzachyrm/patch-1
Fix the calling to 'editor.get' in the documentation
2015-11-02 20:45:29 +01:00
Tzach 63842294ad Update api.md 2015-11-02 09:53:13 +02:00
Jos de Jong 1923692511 Merge pull request #225 from cobblers-children/onMode
Add an 'onMode' callback option which is invoked after setMode finishes.
2015-09-22 10:58:51 +02:00
Jason Marshall a41ff76c56 Add an 'onMode' callback option which is invoked after setMode finishes. 2015-09-17 15:05:11 -07:00
jos c6642a7444 Released version 4.2.1 2015-06-13 11:16:31 +02:00
jos 36fa3c40df Fixed #161: Added `consolas` font to solve a text selection issue on chinese machines 2015-06-13 11:14:00 +02:00
jos ca857b38cf Changed header 2015-05-14 21:41:02 +02:00
jos 0869e214bd Added a link to the Angular.js directive (See #192) 2015-05-14 21:39:01 +02:00
jos 755190417c Released version 4.2.0 2015-05-14 21:29:35 +02:00
jos 8a574995ff Fixed #190: documented the neat for a content-type header 2015-05-14 21:25:10 +02:00
jos 8416944f5c Fixed `editor.get()` manipulating the code when containing an error (see #191) 2015-05-14 21:18:14 +02:00
jos a7f41b8ef5 Implemented option `ace` to provide a custom version of the Ace editor. (see #173, #176) 2015-05-14 21:06:03 +02:00
jos 7c62f5a97d Fixed #186: binding issue to `jsonlint.parse`. 2015-05-07 11:45:12 +02:00
jos 999a253803 Merge remote-tracking branch 'origin/develop' into develop 2015-04-17 10:23:39 +02:00
jos 0e192937d8 More docs on `change` 2015-04-17 10:23:32 +02:00
jos a9e86715fb Merge remote-tracking branch 'origin/master' 2015-03-22 21:14:58 +01:00
jos 671bcd3706 Added more docs on `JSONEditor.getText()` (see #171) 2015-03-22 21:14:37 +01:00
Jos de Jong dcb4b455ca Updated history 2015-03-18 21:45:08 +01:00
Jos de Jong 99c52e044d Merge pull request #170 from nfvs/custom_themes
Support for custom themes.
2015-03-18 21:43:18 +01:00
Nuno Santos 8bab1158bf Support for custom themes. 2015-03-18 10:34:51 +01:00
Jos de Jong 1078e016df Updated description of custom builds 2015-03-18 08:57:33 +01:00
Jos de Jong 94e0f0117c Extended description of custom builds 2015-03-18 08:56:54 +01:00
jos 053f4f5113 Released version 4.1.3, fixes for browserify 2015-03-17 20:25:50 +01:00
jos 6310063494 Released version 4.1.2 2015-03-15 15:31:50 +01:00
jos 45b1941f95 Released version 4.1.0 2015-03-15 15:11:36 +01:00
jos fcfac08fc3 Implemented function `focus()` for tree, view, and form mode. 2015-03-02 20:51:03 +01:00
jos a6778ddebd Ignore index.js, not relevant for bower 2015-02-28 21:19:25 +01:00
jos 3897a819f3 Released version 4.0.0 2015-02-28 21:17:03 +01:00
jos 514f015041 Some simplifications in the build file 2015-02-28 21:10:19 +01:00
jos d9939177dd Moved images also to /dist 2015-02-28 21:02:39 +01:00
jos 12214f930a Moved the distribution files from root to the ./dist folder 2015-02-28 20:47:23 +01:00
jos 75372fa3d7 More unit tests and a refinement of the regexp to remove JSONP encapsulation 2015-02-28 17:03:40 +01:00
jos b94b87c66b Fixed bugs in the JSON sanitizer, no longer manipulating comments or JSON-like structures inside strings. 2015-02-28 16:54:34 +01:00
jos 0962067ca9 Replaced some equality checks with strict equality checks 2015-02-28 15:36:56 +01:00
jos 1dea979c99 Updated readme 2015-02-28 15:30:26 +01:00
jos 68a1083a64 Updated readme 2015-02-28 15:23:19 +01:00
jos 6f5ea96d1a A bundle can be created excluding Ace editor 2015-02-28 15:21:01 +01:00
jos 95d74234d4 Added some unit tests for JSON sanitizing 2015-02-28 15:06:44 +01:00
jos 86e15f74e2 Added some unit tests 2015-02-28 15:04:46 +01:00
jos e7cfd2c05d Updated history 2015-02-27 22:53:45 +01:00
jos d948cdcd7c Fixed loading jsoneditor theme in Ace editor 2015-02-27 22:30:06 +01:00
jos a114537036 Updated built files 2015-02-27 22:21:31 +01:00
jos 2c9b7e9c7b Merge remote-tracking branch 'origin/develop' into develop
Conflicts:
	jsoneditor.js
	jsoneditor.map
	jsoneditor.min.js
	src/js/util.js
2015-02-27 22:21:06 +01:00
jos 629ed49e7d Fixed a broken require. 2015-02-27 22:16:05 +01:00
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