Skip to content

Commit 9a1b936

Browse files
committed
Merge branch 'release/0.7.4'
2 parents 14b4e0e + 9a60f36 commit 9a1b936

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2846
-2349
lines changed

CHANGELOG

+13
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
v0.7.4
2+
------
3+
* bower.json fixes, thanks @mike-marcacci, @morrislaptop
4+
* Updated docs with a part on extending angular schema form.
5+
* The example now includes the tinymce add on (https://github.com/Textalk/angular-schema-form-tinymce)
6+
* @cameronprattedwards split the gulp tasks and tests into manageble files.
7+
* Fixed validation bugs with numbers and dates, this also got validation working in Angular 1.3.0
8+
* Placeholder on textarea
9+
* step="any" so a HTML5 input doesn't default to 1 and break float validation
10+
* Allow for a pre-existing layout where fields will be inserted, thanks @ebrehault
11+
Docs are missing but lock at PR #112.
12+
* Better "readonly" support, thanks @mike-marcacci!
13+
114
v0.7.3
215
------
316
* Fix for regression in enum order in selects, thanks @adamschwartz

README.md

+6-1
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,8 @@ can find them here with usage instructions:
142142
* [https://github.com/Textalk/angular-schema-form-datepicker](https://github.com/Textalk/angular-schema-form-datepicker)
143143
* [https://github.com/Textalk/angular-schema-form-colorpicker](https://github.com/Textalk/angular-schema-form-colorpicker)
144144

145+
Your can also [create your own add-ons.](docs/extending.md)
146+
145147
Building
146148
--------
147149
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/).
@@ -180,7 +182,10 @@ $ karma start karma.conf.js
180182
Contributing
181183
------------
182184

183-
All contributions are welcome! We're trying to use
185+
All contributions are welcome! If its a new field type consider making it an add-on instead,
186+
especially if it has dependecies. See [extending Schema Form documentation.](docs/extending.md)
187+
188+
We're trying to use
184189
[git flow](http://danielkummer.github.io/git-flow-cheatsheet/), so please base any merge request
185190
on the **development** branch instead of **master**.
186191

bower.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,9 @@
22
"name": "angular-schema-form",
33
"main": [
44
"dist/schema-form.min.js",
5-
"dist/bootstrap-decorator.min.js",
6-
"dist/bootstrap-datepicker.min.js"
5+
"dist/bootstrap-decorator.min.js"
76
],
8-
"version": "0.7.3",
7+
"version": "0.7.4",
98
"authors": [
109
"Textalk",
1110
"David Jensen <[email protected]>"
@@ -38,8 +37,11 @@
3837
"devDependencies": {
3938
"angular-ui-ace": "bower",
4039
"angular-schema-form-datepicker": ">= 0.1.0",
40+
"angular-schema-form-colorpicker": ">= 0.1.0",
4141
"jquery": "~2.1.1",
4242
"angular-mocks": ">= 1.2",
43-
"angular-schema-form-colorpicker": "~0.1.0"
43+
"tx-tinymce": ">= 0.0.5",
44+
"angular-ui-sortable": "~0.12.11",
45+
"bootstrap-vertical-tabs": "~1.2.0"
4446
}
4547
}

dist/bootstrap-decorator.min.js

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)