Skip to content

Commit

Permalink
Merge branch 'release/0.7.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
davidlgj committed Oct 17, 2014
2 parents 14b4e0e + 9a60f36 commit 9a1b936
Show file tree
Hide file tree
Showing 49 changed files with 2,846 additions and 2,349 deletions.
13 changes: 13 additions & 0 deletions CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,3 +1,16 @@
v0.7.4
------
* bower.json fixes, thanks @mike-marcacci, @morrislaptop
* Updated docs with a part on extending angular schema form.
* The example now includes the tinymce add on (https://github.com/Textalk/angular-schema-form-tinymce)
* @cameronprattedwards split the gulp tasks and tests into manageble files.
* Fixed validation bugs with numbers and dates, this also got validation working in Angular 1.3.0
* Placeholder on textarea
* step="any" so a HTML5 input doesn't default to 1 and break float validation
* Allow for a pre-existing layout where fields will be inserted, thanks @ebrehault
Docs are missing but lock at PR #112.
* Better "readonly" support, thanks @mike-marcacci!

v0.7.3
------
* Fix for regression in enum order in selects, thanks @adamschwartz
Expand Down
7 changes: 6 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,8 @@ can find them here with usage instructions:
* [https://github.com/Textalk/angular-schema-form-datepicker](https://github.com/Textalk/angular-schema-form-datepicker)
* [https://github.com/Textalk/angular-schema-form-colorpicker](https://github.com/Textalk/angular-schema-form-colorpicker)

Your can also [create your own add-ons.](docs/extending.md)

Building
--------
The files in the `dist/` folder, plus dependencies, are all you need to use Schema Form. But if you'd like to build it yourself, we use [gulp](http://gulpjs.com/).
Expand Down Expand Up @@ -180,7 +182,10 @@ $ karma start karma.conf.js
Contributing
------------

All contributions are welcome! We're trying to use
All contributions are welcome! If its a new field type consider making it an add-on instead,
especially if it has dependecies. See [extending Schema Form documentation.](docs/extending.md)

We're trying to use
[git flow](http://danielkummer.github.io/git-flow-cheatsheet/), so please base any merge request
on the **development** branch instead of **master**.

Expand Down
10 changes: 6 additions & 4 deletions bower.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,9 @@
"name": "angular-schema-form",
"main": [
"dist/schema-form.min.js",
"dist/bootstrap-decorator.min.js",
"dist/bootstrap-datepicker.min.js"
"dist/bootstrap-decorator.min.js"
],
"version": "0.7.3",
"version": "0.7.4",
"authors": [
"Textalk",
"David Jensen <david.lgj@gmail.com>"
Expand Down Expand Up @@ -38,8 +37,11 @@
"devDependencies": {
"angular-ui-ace": "bower",
"angular-schema-form-datepicker": ">= 0.1.0",
"angular-schema-form-colorpicker": ">= 0.1.0",
"jquery": "~2.1.1",
"angular-mocks": ">= 1.2",
"angular-schema-form-colorpicker": "~0.1.0"
"tx-tinymce": ">= 0.0.5",
"angular-ui-sortable": "~0.12.11",
"bootstrap-vertical-tabs": "~1.2.0"
}
}
2 changes: 1 addition & 1 deletion dist/bootstrap-decorator.min.js

Large diffs are not rendered by default.

Loading

0 comments on commit 9a1b936

Please sign in to comment.