Merge branch 'develop'

pombredanne · Feb 10, 2013 · 2e24669 · 2e24669
2 parents 41d61b2 + 0bf357a
commit 2e24669
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 1 deletion.
diff --git a/README.md b/README.md
@@ -14,11 +14,13 @@ formatted plain text.
 - View and edit JSON side by side in treeview and plain text.
 - Edit, add, move, remove, and duplicate fields and values.
 - Change type of values.
+- Sort arrays and objects.
 - Colorized values, color depends of the value type.
 - Search & highlight text in the treeview.
 - Undo and redo all actions.
 - Load and save files and urls.
 - Format and compact JSON in plain text.
+- Library can be loaded as CommonJS module, AMD module, or as a regular javascript file.
 
 
 ### Getting started
@@ -30,6 +32,18 @@ formatted plain text.
 - Sourcecode: https://github.com/josdejong/jsoneditoronline/
 
 
+### Build
+
+The code of the JSON Editor is located in the folder `jsoneditor`.
+The code for the web application in `app/web`.
+To build the library from sourcecode, run
+
+    ant
+
+in the root of the project. This will generate a folder `build` containing
+generated library and web application.
+
+
 ### Screenshot
 
 <a href="http://jsoneditoronline.org">

diff --git a/misc/screenshots/actionsmenu_640x400.png b/misc/screenshots/actionsmenu_640x400.png
diff --git a/misc/screenshots/change_type_640x400.png b/misc/screenshots/change_type_640x400.png
diff --git a/misc/screenshots/description.json b/misc/screenshots/description.json
@@ -1,7 +1,7 @@
 {
     "Name": "JSON Editor Online",
     "Website": "http://jsoneditoronline.org",
-    "Version": 1.3,
+    "Version": 2.0,
     "Free": true,
     "Description": "JSON Editor Online is a web-based tool to view, edit, and format JSON. It shows your data side by side in a clear, editable treeview and in formatted plain text.",
     "Features": [

diff --git a/misc/screenshots/jsoneditoronline.png b/misc/screenshots/jsoneditoronline.png
diff --git a/misc/screenshots/jsoneditoronline_640x400.png b/misc/screenshots/jsoneditoronline_640x400.png
diff --git a/misc/screenshots/plaintext_640x400.png b/misc/screenshots/plaintext_640x400.png
diff --git a/misc/screenshots/search_640x400.png b/misc/screenshots/search_640x400.png