Skip to content

Commit bc26b84

Browse files
AnthropicAnthropic
committed
Merge pull request #4 from Textalk/development
Update from Textalk
2 parents 91aa366 + 862feee commit bc26b84

Some content is hidden

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

54 files changed

+4921
-912
lines changed

‎.jscs.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
{
22
"preset": "google",
3-
"maximumLineLength": 100
3+
"maximumLineLength": 100,
4+
"disallowMultipleLineBreaks": false
45
}

‎.jshintrc

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,15 @@
22
"undef": true,
33
"unused": true,
44
"browser": true,
5-
"globals": {
5+
"globals": {
6+
"ObjectPath": false,
67
"console":false,
78
"jQuery": false,
89
"$":false,
910
"assertEquals": false,
1011
"jstestdriver": false,
1112
"assertTrue": false,
12-
"assertFalse": false,
13+
"assertFalse": false,
1314
"describe": false,
1415
"it":false,
1516
"expect": false,
@@ -24,4 +25,4 @@
2425
"Jed": false,
2526
"tws": false
2627
}
27-
}
28+
}

‎CHANGELOG

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,58 @@
1+
v0.8.2
2+
-------
3+
* Fix embarrassing typo in package.json
4+
5+
v0.8.1
6+
------
7+
* Fixed order of error messages, thanks @davidlgj
8+
* Added `modelValue` to variables available in a condition, thanks @dben
9+
* UMD wrapping, thanks @dwikle
10+
* disableErrorState, disableSuccessState options, thanks @domasx2
11+
* Awesome gist integration to example page, thanks @dervisevic
12+
* Global option to disable tv4 validation, thanks @maff
13+
* Option: labelHtmlClass, thanks @AlexAlbala
14+
* Doc fixes and updates, thanks @Minisai, @jdcaballerov, @cjroth, @dervisevic
15+
* Bugfixes, thanks @engelfrost, @mqamhieh, @carchrae
16+
17+
18+
v0.8.0
19+
Loads of stuff happened this release, so we're bumping version to 0.8.0.
20+
Note as well that there is a small change to `tabsarray` type regarding its title, the title is now
21+
interpolated instead of eval'd. So if you have any problems slap on a `{{ }}` around the tab title.
22+
See the docs on `tabarray` for an more info.
23+
24+
* Custom validation via ngModel.$validators and ngModel.$asyncValidators, thanks @davidlgj
25+
* Inject errors from backend directly to a field with events, thanks @davidlgj, @burdiuz, @jdgblinq
26+
* Icons to `button` type, thanks @maff
27+
* Fixed spoiled comment, thanks @mchapman
28+
* A new `template` field type, insert a angular template, like a mini add-on.
29+
* Support for schema type that allows null, thanks @ulion
30+
* Option groups in selects, thanks @DennisHalmstad
31+
* input group addons, thanks @quietlyconfident
32+
* validationMessages overhaul, nicer validationMessages with interpolation and a new sf-messages
33+
directive for add-on to use. thanks @davidlgj
34+
* interpolation instead of eval'ing in tabarray title, thanks @coridyn
35+
* Lots of bugfixes, most notable checkboxes validation now works, thanks @davidlgj, @coridyn,
36+
@ulion, @adamcbuckley
37+
38+
v0.7.13
39+
-------
40+
* Bugfix for condition, it depended on jQuery
41+
42+
v0.7.12
43+
-------
44+
* Error on deleteFromArray task, thanks @bygiro
45+
* Fix for copyValueTo on numeric fields, thanks @Anthropic
46+
* "condition" option on every form type, thanks @davidlgj
47+
* Force redraw "schemaFormRedraw", thanks @davidlgj
48+
* Possible fix for "updateOn exception", thanks @plong0
49+
50+
v0.7.11
51+
-------
52+
* New front page with a list of add-on:s based on a bower search! Thanks @unicornforce @Dervisevic @davidlgj
53+
* Twitter account, @ngSchemaForm, new releases will be announced here. Thanks @Dervisevic
54+
* copyValueTo form option. Thanks @Dervisevic
55+
156
v0.7.10
257
------
358
* Accessability additions, thanks @stramel

‎CONTRIBUTING.md

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,21 @@
11
Contributing
22
------------
3-
Contributions are welcome!
3+
We love contributions!
44

55
**Please base any merge request on the *development* branch instead of *master*.**
66

77
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.
8+
[git flow](http://danielkummer.github.io/git-flow-cheatsheet/), and it makes merging your pull
9+
request heck of a lot easier for us.
910

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+
Please avoid including anything from the `dist/` directory as that can make merging harder, and we
12+
always generate these files when we make a new release.
1113

1214
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)
15+
especially if it has external dependencies. See [extending Schema Form documentation.](docs/extending.md)
16+
17+
With new features we love to see updates to the docs as well as tests, that makes it super
18+
easy and fast for us to merge it!
1419

1520
Also consider running any code through the code style checker [jscs](https://github.com/mdevils/node-jscs)
1621
(or even better use it in your editor) with preset set to `google`. You can also us `gulp jscs` to

‎README.md

Lines changed: 29 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,29 @@
11
Angular Schema Form
22
===================
3+
[![bower version](https://img.shields.io/bower/v/angular-schema-form.svg?style=flat-square)](#bower)
4+
[![npm version](https://img.shields.io/npm/v/angular-schema-form.svg?style=flat-square)](https://www.npmjs.org/package/angular-schema-form)
5+
[![npm downloads](https://img.shields.io/npm/dm/angular-schema-form.svg?style=flat-square)](http://npm-stat.com/charts.html?package=angular-schema-form&from=2015-01-01)
6+
[![Gitter](https://img.shields.io/badge/GITTER-JOIN%20CHAT%20%E2%86%92-ff69b4.svg?style=flat-square)](https://gitter.im/Textalk/angular-schema-form?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
7+
[![Build Status](https://img.shields.io/travis/Textalk/angular-schema-form.svg?style=flat-square)](https://travis-ci.org/Textalk/angular-schema-form)
8+
[![Build Status](https://img.shields.io/coveralls/jekyll/jekyll.svg?style=flat-square)](https://coveralls.io/r/Textalk/angular-schema-form?branch=development)
9+
10+
11+
312

4-
[![Build Status](https://travis-ci.org/Textalk/angular-schema-form.svg?branch=master)](https://travis-ci.org/Textalk/angular-schema-form)
5-
[![Coverage Status](https://coveralls.io/repos/Textalk/angular-schema-form/badge.png?branch=master)](https://coveralls.io/r/Textalk/angular-schema-form?branch=development)
6-
[![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)
813

914
Generate forms from JSON schemas using AngularJS!
1015

16+
The Web Site / The Twitter / The Movie
17+
--------
18+
[schemaform.io](http://schemaform.io) / [@SchemaFormIO](http://twitter.com/SchemaFormIO) / [Movie](https://www.youtube.com/watch?v=duBFMipRq2o)
19+
20+
If you use ASF in your project/company please let us know! We'd love to feature you on the site.
21+
1122
Demo Time!
1223
----------
13-
[Try out the example page](http://textalk.github.io/angular-schema-form/examples/bootstrap-example.html).
14-
Try editing the schema or form definition and see what comes out!
24+
[Try out the example page](http://schemaform.io/examples/bootstrap-example.html). Try editing the schema or form definition and see what comes out!
25+
26+
Now you can save your code and share it!
1527

1628
What is it?
1729
----------
@@ -37,7 +49,10 @@ apart from JSON Form?
3749

3850
Documentation
3951
-------------
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).
52+
You can find [all documentation here](docs/index.md), it covers all the different field types
53+
and their options.
54+
55+
It also covers how to [extend angular schema form with your own field types](https://github.com/Textalk/angular-schema-form/blob/master/docs/extending.md).
4156

4257
Basic Usage
4358
-----------
@@ -92,6 +107,8 @@ bower install angular-schema-form
92107
This will install the latest release and basic dependencies. See
93108
[dependecies section below](#dependencies).
94109

110+
You can also load the files via [cdnjs.com](https://cdnjs.com/libraries/angular-schema-form).
111+
95112
### Manual
96113

97114
You can also just download the contents of the `dist/` folder and add dependencies manually.
@@ -123,7 +140,7 @@ The minified files include templates - no need to load additional HTML files.
123140
### Script Loading
124141

125142
Schema form is split into two main files, `dist/schema-form.min.js` and
126-
`dist/boostrap-decorator.min.js` and they need be loaded in that order. AngularJ,
143+
`dist/boostrap-decorator.min.js` and they need be loaded in that order. AngularJS,
127144
[tv4](https://github.com/geraintluff/tv4) and [objectpath](https://github.com/mike-marcacci/objectpath)
128145
also needs to be loaded *before* Schema Form.
129146

@@ -146,15 +163,7 @@ angular.module('myModule', ['schemaForm']);
146163

147164
Add-ons
148165
------
149-
There are a couple of add-ons, a date picker, a colorpicker and two wysiwyg editors.
150-
They have their own repos and you can find them here with usage instructions:
151-
152-
* [https://github.com/Textalk/angular-schema-form-datepicker](https://github.com/Textalk/angular-schema-form-datepicker)
153-
* [https://github.com/Textalk/angular-schema-form-colorpicker](https://github.com/Textalk/angular-schema-form-colorpicker)
154-
* [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)
157-
166+
There are several add-ons available, for a full list see the [web page](http://textalk.github.io/angular-schema-form/#third-party-addons).
158167
Your can also [create your own add-ons!](docs/extending.md)
159168

160169
Contributing
@@ -190,10 +199,10 @@ Unit tests are run with [karma](http://karma-runner.github.io) and written using
190199

191200
To run the tests:
192201

193-
1. Install all dependencies via NPM
202+
1. Install all dependencies via NPM.
194203
2. Install dev dependencies with bower.
195-
3. Install the Karma CLI
196-
4. Run the tests
204+
3. Install the Karma CLI.
205+
4. Run the tests.
197206

198207
```bash
199208
$ npm install

‎bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"dist/schema-form.js",
55
"dist/bootstrap-decorator.js"
66
],
7-
"version": "0.7.10",
7+
"version": "0.8.2",
88
"authors": [
99
"Textalk",
1010
"David Jensen <david.lgj@gmail.com>",

0 commit comments

Comments
 (0)