Skip to content

Commit ac29fb9

Browse files
committed
Merge branch 'release/0.7.6'
2 parents 186f23c + c8c6000 commit ac29fb9

File tree

5 files changed

+14
-11
lines changed

5 files changed

+14
-11
lines changed

CHANGELOG

+5
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
v0.7.6
2+
------
3+
* Fixed broken bower specification.
4+
* Updated README and documentation.
5+
16
v0.7.5
27
------
38
* Bracket notation for reserved words to make IE8 happier,thanks @jibwa

README.md

+5-8
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,9 @@ apart from JSON Form?
3434
with version 4 of the JSON schema standard.
3535
3. By default, Schema Form generates Bootstrap 3-friendly HTML.
3636

37+
Documentation
38+
-------------
39+
Documentation covering defaults and form types [can be found here](docs/index.md). And you can find the documentation for how you extend angular schema form with your own types [here](https://github.com/Textalk/angular-schema-form/blob/master/docs/extending.md).
3740

3841
Basic Usage
3942
-----------
@@ -74,12 +77,6 @@ Then load them into Schema Form using the `sfSchema`, `sfForm`, and `sfModel` di
7477
</div>
7578
```
7679

77-
78-
Documentation
79-
-------------
80-
Documentation covering defaults and form types [can be found here.](docs/index.md)
81-
82-
8380
Installation
8481
------------
8582

@@ -131,8 +128,8 @@ also needs to be loaded *before* Schema Form.
131128

132129

133130
```html
134-
<script type="text/javascript" src="../bower_components/angular/angular.min.js"></script>
135-
<script type="text/javascript" src="../bower_components/angular-sanitize/angular-sanitize.min.js"></script>
131+
<script type="text/javascript" src="bower_components/angular/angular.min.js"></script>
132+
<script type="text/javascript" src="bower_components/angular-sanitize/angular-sanitize.min.js"></script>
136133
<script type="text/javascript" src="bower_components/tv4/tv4.js"></script>
137134
<script type="text/javascript" src="bower_components/objectpath/lib/ObjectPath.js"></script>
138135
<script type="text/javascript" src="bower_components/angular-schema-form/dist/schema-form.min.js"></script>

bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dist/schema-form.min.js",
55
"dist/bootstrap-decorator.min.js"
66
],
7-
"version": "0.7.5",
7+
"version": "0.7.6",
88
"authors": [
99
"Textalk",
1010
"David Jensen <[email protected]>"
@@ -41,7 +41,7 @@
4141
"jquery": "~2.1.1",
4242
"angular-mocks": ">= 1.2",
4343
"tx-tinymce": ">= 0.0.5",
44-
"angular-ui-sortable": "~0.12.11",
44+
"angular-ui-sortable": ">=0.12.11",
4545
"bootstrap-vertical-tabs": "~1.2.0"
4646
}
4747
}

docs/index.md

+1
Original file line numberDiff line numberDiff line change
@@ -187,6 +187,7 @@ Schema Form currently supports the following form field types out of the box:
187187
| text | input with type text |
188188
| textarea | a textarea |
189189
| number | input type number |
190+
| password | input type password |
190191
| checkbox | a checkbox |
191192
| checkboxes | list of checkboxes |
192193
| select | a select (single value)|

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "angular-schema-form",
3-
"version": "0.7.5",
3+
"version": "0.7.6",
44
"description": "Create forms from a JSON schema",
55
"scripts": {
66
"test": "rm -fr coverage && ./node_modules/karma/bin/karma start --single-run --browsers PhantomJS karma.conf.js && find coverage/ -name lcov.info -print0 | xargs -0 cat | ./node_modules/coveralls/bin/coveralls.js"

0 commit comments

Comments
 (0)