Skip to content

Commit 012a311

Browse files
AnthropicAnthropic
committed
Merge branch 'development' of https://github.com/json-schema-form/angular-schema-form into development
2 parents bc26b84 + 197aa47 commit 012a311

Some content is hidden

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

68 files changed

+3106
-3350
lines changed

‎.travis.yml

+2
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,5 @@ node_js:
55
before_script:
66
- npm install -g bower
77
- bower install
8+
9+
sudo: false

‎CHANGELOG

+64-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,69 @@
1+
v0.8.12
2+
-------
3+
* Bugfix for `condition` builder. It had a typo that broke it.
4+
* Bugfix for `transclusion` builder.
5+
6+
7+
v0.8.11
8+
-------
9+
* Bugfix for checkboxes validation in the new builder.
10+
11+
v0.8.10
12+
-------
13+
* Bugfix for checkboxes when model array is undefined.
14+
15+
v0.8.9
16+
------
17+
* Bugfix for radios and radios-inline. Validation should now work.
18+
* Bugfix so model changes from outside the form trigger validation.
19+
* New global option `pristine`. Sets if errors and success states
20+
should be visible when form field are `$pristine`. Default is `{errors: true, success: true}`
21+
22+
v0.8.8
23+
------
24+
* Don't rely on documentFragment.children @davidlgj
25+
* Restored "template" type support with the builder. @davidlgj
26+
* Fixed defaults in array items. @davidlgj
27+
28+
v0.8.7
29+
------
30+
* Moved common builder functions from angular-schema-form-bootstrap decorator. @davidlgj
31+
* Bugfx for the new builder. @davidlgj
32+
33+
v0.8.6
34+
------
35+
* Removed left over console.timeEnd @davidlgj
36+
37+
v0.8.5
38+
------
39+
* UMD wrapping for bootstrap-decorator, thanks @angelaharalson
40+
* label instead of h3 in array title, whic is more consistent. Thanks @prettymuchbryce
41+
* doc typos, thanks @zerofifteen
42+
* multipleOf validation message fix, thanks @leipert
43+
* infinite digest bugfix, thanks @israelshirk
44+
* minLength validation message bugfix, thanks @iamdarrenhall
45+
* bugfix for Angular 1.2 and arrays watching, thanks @davidlgj
46+
47+
v0.8.4
48+
------
49+
* Reverted `trackBy`. Fixes #458, #462, #471
50+
51+
52+
v0.8.3
53+
------
54+
* "destroyStrategy" support, thanks @jbsaff! This means that `condition` can now remove values
55+
from the model when their fields are hidden.
56+
* Bugfix for global option propagation, thanks @golfmat1
57+
* `notitle` now works on fieldset as well, thanks @stramel
58+
* `trackBy` on selects, thanks @Fridus
59+
* update list variable when watching for array changes, thanks @lukebennet
60+
* doc changes for the "save to gist" feature, thanks @niklasb
61+
* validation error message mixups, thanks @leipert
62+
* ObjectPath, deps and browserify fixes, thanks @saller, @LoicMahieu, @thardyman, @davidlgj
63+
164
v0.8.2
265
-------
3-
* Fix embarrassing typo in package.json
66+
* Fix embarrassing typo in package.json
467

568
v0.8.1
669
------

‎CONTRIBUTING.md

+4
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ request heck of a lot easier for us.
1111
Please avoid including anything from the `dist/` directory as that can make merging harder, and we
1212
always generate these files when we make a new release.
1313

14+
**We're currently in transitioning where a large part of the code, i.e. the bootstrap decorator, has been moved to it's own repo. It's here [github.com/Textalk/angular-schema-form-bootstrap](https://github.com/Textalk/angular-schema-form-bootstrap)**
15+
16+
Feel free to submit issues on the main repo anyway though.
17+
1418
If its a new field type consider making it an add-on instead,
1519
especially if it has external dependencies. See [extending Schema Form documentation.](docs/extending.md)
1620

‎README.md

+62-6
Original file line numberDiff line numberDiff line change
@@ -7,26 +7,82 @@ Angular Schema Form
77
[![Build Status](https://img.shields.io/travis/Textalk/angular-schema-form.svg?style=flat-square)](https://travis-ci.org/Textalk/angular-schema-form)
88
[![Build Status](https://img.shields.io/coveralls/jekyll/jekyll.svg?style=flat-square)](https://coveralls.io/r/Textalk/angular-schema-form?branch=development)
99

10+
Generate forms from JSON schemas using AngularJS!
1011

12+
Recent developments
13+
===================
14+
First, as there has been a rather intensive period of planning and change for this project, there have been important new developments for the project.
15+
Lets get into those first(the normal front page continues below):
1116

17+
The json-schema-form standard
18+
-----------------------------
19+
A standard, json-schema-form, is being created.
1220

21+
The reason is that the concept of combining data, JSON Schema and a form definition is something that isn't just usable in a javascript angular web application, but in any framework, on any platform.
22+
Currently, there ports are [angular-schema-form](https://github.com/json-schema-form/angular-schema-form) and [react-schema-form](https://github.com/networknt/react-schema-form), but delphi-schema-form and laravel-schema-form are planned as well.
23+
To make these ports easier to do, and for everything to work in harmony, a common ground has to be established, a [standard](https://github.com/json-schema-form/json-schema-form).
1324

14-
Generate forms from JSON schemas using AngularJS!
25+
Organisational
26+
--------------
1527

16-
The Web Site / The Twitter / The Movie
28+
1. ASF has changed into using a more open governance model. This basically means that ASF is now governed by more people.
29+
2. An umbrella organisaton, json-schema-form, has been formed. As you can see, this repo is now a part of that Github organisation, not Textalk.
30+
31+
Projects
1732
--------
18-
[schemaform.io](http://schemaform.io) / [@SchemaFormIO](http://twitter.com/SchemaFormIO) / [Movie](https://www.youtube.com/watch?v=duBFMipRq2o)
33+
After a phase of planning, the following list of projects has been decided upon:
34+
https://github.com/json-schema-form/json-schema-form/wiki/Current-projects
35+
36+
Release 1.0
37+
-----------
38+
The next major release of ASF will be 1.0.
39+
40+
The goal for that version is to include the breaking changes that is needed for future developents, like *Of and local $refs:
41+
42+
* Break out the non-framework specific parts of ASF into a vanilla ES6 module
43+
* Remove the built-in bootstrap decorator, and in doing that require that users wanting to use that load that separately. The reason obviously being the material decorator.
44+
45+
The reason for the core break out is for all javascript-based ports of the json-schema-form concept to be able to share the same central code base.
46+
Work in that direction is being done in the [json-schema-form-core](https://github.com/json-schema-form/json-schema-form-core) repository.
47+
48+
Schema builder UI
49+
-----------------
50+
There is now a UI for building schemas and forms being developed at [json-schema-builder repository](https://github.com/json-schema-form/json-schema-builder).
51+
52+
Ralphael Owino (main author), has a [demo up already](http://ralphowino.github.io/schema-form-builder/#/builder).
53+
54+
Schema and form repository
55+
--------------------------
56+
This is now a [repository with template schemas and forms](https://github.com/json-schema-form/json-schema-form-repository).
57+
So far all the [schema.org types](http://schema.org/docs/full.html) has been converted to JSON schema approximations, and also some has been further resolved and had (huge) forms generated. Schema.org is *big*.
58+
59+
Documentation
60+
-------------
61+
The documentation is evolving, and it is happening mostly on the wiki:
62+
* [The ASF wiki](https://github.com/json-schema-form/angular-schema-form/wiki)
63+
* [The wiki of the json-schema-form organisation](https://github.com/json-schema-form/json-schema-form/wiki)
64+
65+
New gitter rooms
66+
----------------
67+
These are just started.
68+
* Discussions on the [general json-schema-form projects being carried out](https://gitter.im/json-schema-form/json-schema-form-projects)
69+
* Discussions on the [angular-specific ASF projects](https://gitter.im/json-schema-form/angular-schema-form-projects)
70+
71+
72+
The Blog / The Web Site / The Twitter / The Movie
73+
=================================================
74+
[medium.com/@SchemaFormIO](https://medium.com/@SchemaFormIO) / [schemaform.io](http://schemaform.io) / [@SchemaFormIO](http://twitter.com/SchemaFormIO) / [Movie](https://www.youtube.com/watch?v=duBFMipRq2o)
1975

2076
If you use ASF in your project/company please let us know! We'd love to feature you on the site.
2177

2278
Demo Time!
23-
----------
79+
==========
2480
[Try out the example page](http://schemaform.io/examples/bootstrap-example.html). Try editing the schema or form definition and see what comes out!
2581

26-
Now you can save your code and share it!
82+
Hint: By pressing the 'Save to gist' button (top left), you can save your example into a shareable link.
2783

2884
What is it?
29-
----------
85+
===========
3086

3187
Schema Form is a set of AngularJS directives (and a couple of services). It can do two things to
3288
make life easier:

‎bower.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"dist/schema-form.js",
55
"dist/bootstrap-decorator.js"
66
],
7-
"version": "0.8.2",
87
"authors": [
98
"Textalk",
109
"David Jensen <[email protected]>",
@@ -53,6 +52,7 @@
5352
"angular-mocks": ">= 1.2",
5453
"tx-tinymce": ">= 0.0.5",
5554
"angular-ui-sortable": ">=0.12.11",
56-
"bootstrap-vertical-tabs": "~1.2.0"
55+
"bootstrap-vertical-tabs": "~1.2.0",
56+
"angular-schema-form-bootstrap": "~0.1.1"
5757
}
5858
}

‎dist/WHERE_IS_BOOTSTRAP_DECORATOR.md

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Hello,
2+
3+
the `bootstrap-decorator.js` and `bootstrap-decorator.min.js` files has moved
4+
to their project repo, https://github.com/Textalk/angular-schema-form-bootstrap
5+
6+
You can install it via bower and npm as well.
7+
8+
```sh
9+
bower install angular-schema-form-bootstrap
10+
```
11+
or
12+
13+
```sh
14+
npm install angular-schema-form-bootstrap
15+
```

0 commit comments

Comments
 (0)