Skip to content

Commit fcab97c

Browse files
committed
Merge branch 'release/-1.7.10'
2 parents ac29fb9 + 26f6ec6 commit fcab97c

Some content is hidden

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

43 files changed

+811
-230
lines changed

.npmignore

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
**/.*

CHANGELOG

+36
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,39 @@
1+
v0.7.10
2+
------
3+
* Accessability additions, thanks @stramel
4+
* Updates to the gulp tasks, thanks @stramel
5+
* Updated to bower, thanks @Dervisevic
6+
* Updates to documentation & README & Contributing.md, thanks @davidlgj @Dervisevic
7+
* Speed optimization, thanks @stramel
8+
* Call ngModel.$setDirty() when deleting from array, thanks @qstrahl
9+
* Don't override readonly if specified on items individually, thanks @qstrahl
10+
* Update to the examples, thanks @mike-marcacci
11+
12+
v0.7.9
13+
------
14+
* Fixed a wrongful glob in bower.json that caused files to be missing in the bower install. Thanks, @mohsen1 for reporting it.
15+
16+
v0.7.8
17+
------
18+
* Thanks to @burdiuz for finding a memory leak issue and finding a solution. And thanks to @davidlgj for implementing that solution.
19+
* Post render event, thanks @mrijken
20+
* Events documentation, thanks @Dervisevic
21+
* startEmpty documentation, thanks @davidlj
22+
* npm and bower updates, thanks @Dervisevic
23+
* x-schema-form attribute, thanks @davidlgj
24+
* htmlClass and fieldHtmlClass form options, thanks @davidlgj
25+
26+
v0.7.7
27+
------
28+
* Array ref changes in model updates form, thanks @Sandreu
29+
* Tabarray & array fixes, thanks @Sandreu, @davidlgj
30+
* Use objectpath more generically to fix requirejs issues, thanks @mike-marcacci
31+
* README and documentation updates, thanks @davidlgj, @engelfrost, @Dervisevic, @stramel, @Sandreu
32+
* Expanded documentation on custom validation messages, thanks @Dervisevic
33+
* Deep structure tests, thanks @Sandreu
34+
* SF-insert-field documentation, thanks @davidlgj
35+
* Array model watch & array defaults, thanks @Sandreu
36+
137
v0.7.6
238
------
339
* Fixed broken bower specification.

CONTRIBUTING.md

+17
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Contributing
2+
------------
3+
Contributions are welcome!
4+
5+
**Please base any merge request on the *development* branch instead of *master*.**
6+
7+
The reason for this is that we're trying to use
8+
[git flow](http://danielkummer.github.io/git-flow-cheatsheet/), and it makes merging your pull request heck of a lot easier for us.
9+
10+
Please avoid including anything from the `dist/` directory as that can make merging harder, and we always generate these files when we make a new release.
11+
12+
If its a new field type consider making it an add-on instead,
13+
especially if it has dependecies. See [extending Schema Form documentation.](docs/extending.md)
14+
15+
Also consider running any code through the code style checker [jscs](https://github.com/mdevils/node-jscs)
16+
(or even better use it in your editor) with preset set to `google`. You can also us `gulp jscs` to
17+
check your code.

README.md

+6-13
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ Angular Schema Form
44
[![Build Status](https://travis-ci.org/Textalk/angular-schema-form.svg?branch=master)](https://travis-ci.org/Textalk/angular-schema-form)
55
[![Coverage Status](https://coveralls.io/repos/Textalk/angular-schema-form/badge.png?branch=master)](https://coveralls.io/r/Textalk/angular-schema-form?branch=development)
66
[![Bower version](https://badge.fury.io/bo/angular-schema-form.svg)](http://badge.fury.io/bo/angular-schema-form)
7+
[![npm version](https://badge.fury.io/js/angular-schema-form.svg)](http://badge.fury.io/js/angular-schema-form)
78

89
Generate forms from JSON schemas using AngularJS!
910

@@ -36,7 +37,7 @@ apart from JSON Form?
3637

3738
Documentation
3839
-------------
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).
40+
There is one section of documentation covering [defaults and form types](docs/index.md). There is another section for how you [extend angular schema form with your own types](https://github.com/Textalk/angular-schema-form/blob/master/docs/extending.md).
4041

4142
Basic Usage
4243
-----------
@@ -145,28 +146,20 @@ angular.module('myModule', ['schemaForm']);
145146

146147
Add-ons
147148
------
148-
There is currently three add-ons, a date picker, a colorpicker and the wysiwyg html editor tinymce.
149+
There are a couple of add-ons, a date picker, a colorpicker and two wysiwyg editors.
149150
They have their own repos and you can find them here with usage instructions:
150151

151152
* [https://github.com/Textalk/angular-schema-form-datepicker](https://github.com/Textalk/angular-schema-form-datepicker)
152153
* [https://github.com/Textalk/angular-schema-form-colorpicker](https://github.com/Textalk/angular-schema-form-colorpicker)
153154
* [https://github.com/Textalk/angular-schema-form-tinymce](https://github.com/Textalk/angular-schema-form-tinymce)
155+
* [https://github.com/webcanvas/angular-schema-form-ckeditor](https://github.com/webcanvas/angular-schema-form-ckeditor)
156+
* [https://github.com/Textalk/angular-schema-form-fontpicker](https://github.com/Textalk/angular-schema-form-fontpicker)
154157

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

157160
Contributing
158161
------------
159-
160-
All contributions are welcome! If its a new field type consider making it an add-on instead,
161-
especially if it has dependecies. See [extending Schema Form documentation.](docs/extending.md)
162-
163-
We're trying to use
164-
[git flow](http://danielkummer.github.io/git-flow-cheatsheet/), *so please base any merge request on the **development** branch instead of **master**.*
165-
166-
Also run any code through the code style checker [jscs](https://github.com/mdevils/node-jscs)
167-
(or even better use it in your editor) with preset set to `google`. You can also us `gulp jscs` to
168-
check your code.
169-
162+
Contributions are welcome! Please see [Contributing.md](CONTRIBUTING.md) for more info.
170163

171164
Building
172165
--------

bower.json

+17-6
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
11
{
22
"name": "angular-schema-form",
33
"main": [
4-
"dist/schema-form.min.js",
5-
"dist/bootstrap-decorator.min.js"
4+
"dist/schema-form.js",
5+
"dist/bootstrap-decorator.js"
66
],
7-
"version": "0.7.6",
7+
"version": "0.7.10",
88
"authors": [
99
"Textalk",
10-
"David Jensen <[email protected]>"
10+
"David Jensen <[email protected]>",
11+
"Cameron Edwards",
12+
"Mike Marcacci",
13+
"Denis Dervisevic <[email protected]>"
1114
],
1215
"moduleType": [
1316
"globals"
@@ -23,16 +26,24 @@
2326
"license": "MIT",
2427
"ignore": [
2528
"**/.*",
29+
"*.json",
2630
"node_modules",
2731
"bower_components",
2832
"test",
29-
"coverage"
33+
"coverage",
34+
"docs",
35+
"examples",
36+
"gulp",
37+
"CHANGELOG",
38+
"LICENSE",
39+
"gulpfile.js",
40+
"karma.conf.js"
3041
],
3142
"dependencies": {
3243
"angular": ">= 1.2",
3344
"tv4": "~1.0.15",
3445
"angular-sanitize": ">= 1.2",
35-
"objectpath": "~1.0.4"
46+
"objectpath": "~1.1.0"
3647
},
3748
"devDependencies": {
3849
"angular-ui-ace": "bower",

0 commit comments

Comments
 (0)