Skip to content
This repository was archived by the owner on Jan 22, 2018. It is now read-only.

Commit 1649e54

Browse files
author
Kamil Kisiela
committed
Merge branch 'release/v0.7.0'
2 parents 0b7b5cc + 326625d commit 1649e54

Some content is hidden

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

84 files changed

+1566
-871
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ build/Release
3535
# Dependency directory
3636
# https://docs.npmjs.com/misc/faq#should-i-check-my-node-modules-folder-into-git
3737
node_modules
38+
bower_components
39+
3840
### JetBrains template
3941
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio
4042

.npmignore

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.idea
2+
bower_components
3+
node_modules
4+
coverage
5+
tests
6+
.gitignore
7+
.travis.yml
8+
karma.conf.js
9+
webpack.config.js

.travis.yml

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,20 @@
11
language: node_js
2+
cache:
3+
directories:
4+
- node_modules
5+
notifications:
6+
email: false
27
node_js:
3-
- "0.12"
8+
- iojs
49
before_install:
5-
- "curl -L https://raw.githubusercontent.com/arunoda/travis-ci-meteor-packages/master/configure.sh | /bin/sh"
6-
- "npm install -g velocity-cli"
10+
- "npm install"
11+
- "export DISPLAY=:99.0"
12+
- "sh -e /etc/init.d/xvfb start"
713
before_script:
8-
- "export PATH=$HOME/.meteor:$PATH"
14+
- "npm prune"
915
script:
10-
- "velocity test-package ./ --ci"
16+
- "npm run test"
17+
after_success:
18+
- "npm run coverage:codecov"
19+
- "npm run coverage:coveralls"
20+
- "npm run coverage:codacy"

CHANGELOG.md

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22
All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

5+
## [0.7.0] - 2015-11-29
6+
### Added
7+
- support for npm and bower (angular-formly-material).
8+
### Changed
9+
- Unit testing using karma instead of velocity (with coverage reports)
10+
511
## [0.6.0] - 2015-11-27
612
### Added
713
- compatibility with Meteor releases lower then 1.2
@@ -74,6 +80,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
7480

7581
## 0.0.1 - 2015-11-06
7682

83+
[0.7.0]: https://github.com/wieldo/angular-formly-templates-material/compare/v0.6.0...v0.7.0
7784
[0.6.0]: https://github.com/wieldo/angular-formly-templates-material/compare/v0.5.2...v0.6.0
7885
[0.5.2]: https://github.com/wieldo/angular-formly-templates-material/compare/v0.5.1...v0.5.2
7986
[0.5.1]: https://github.com/wieldo/angular-formly-templates-material/compare/v0.5.0...v0.5.1

README.md

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,22 @@ Material Design Templates for [Angular-Formly](http://angular-formly.com). Moder
99

1010
## Install
1111

12+
```
13+
npm install angular-formly-material
14+
```
15+
16+
```
17+
bower install angular-formly-material
18+
```
19+
1220
```
1321
meteor add wieldo:angular-formly-templates-material
1422
```
1523

1624

1725
## Getting Started
1826

19-
1. Add package using `meteor add` (see above)
27+
1. Add package using one of methods above
2028
2. Add the following dependencies to your AngularJS module:
2129

2230
```javascript
@@ -25,6 +33,13 @@ angular.module('myAppName', [
2533
])
2634
```
2735

36+
## Requirements
37+
38+
- angular ~ 1.4.0
39+
- angular-messages ~ 1.4.0
40+
- angular-material ~ 0.11.0
41+
- angular-formly ~ 7.3.0
42+
2843
# Components
2944

3045
Any requests? Add issue!

bower.json

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
{
2+
"name": "angular-formly-material",
3+
"description": "Material design templates for angular-formly",
4+
"main": "dist/formly-material.js",
5+
"authors": [
6+
"Kamil Kisiela <[email protected]>"
7+
],
8+
"license": "MIT",
9+
"homepage": "https://github.com/wieldo/angular-formly-templates-material",
10+
"keywords": [
11+
"AngularJs",
12+
"form",
13+
"formly",
14+
"json",
15+
"html",
16+
"material"
17+
],
18+
"ignore": [
19+
"**/.*",
20+
"node_modules",
21+
"bower_components",
22+
"tests",
23+
"coverage",
24+
"webpack",
25+
"karma.conf.js",
26+
"webpack.config.js"
27+
],
28+
"dependencies": {
29+
"angular": "~1.4.0",
30+
"angular-messages": "~1.4.0",
31+
"angular-animate": "~1.4.0",
32+
"angular-aria": "~1.4.0",
33+
"angular-material": "~0.11.0",
34+
"angular-formly": "~7.3.0"
35+
}
36+
}

0 commit comments

Comments
 (0)