merge with master

.gitignore

@@ -12,11 +12,11 @@ REVISION
 /.idea
 lib-cov
 node_modules/
+reports/
 /npm-debug.log
 /coverage
 /.npm
 
-
 # meteor specific
 .build*
-versions.json
+versions.json

.npmignore

@@ -1,5 +1,8 @@
 .npm/
-build/
+build/*
+build/build/*
+!build/build/faker.js
+!build/build/faker.min.js
 doc/
 examples/
 meteor/

.travis.yml

@@ -2,6 +2,10 @@
 sudo: false
 language: node_js
 node_js:
+  - "10"
+  - "9"
+  - "8"
+  - "7"
   - "6"
   - "6.1"
   - "5"

CODE_OF_MERIT.MD

@@ -0,0 +1,52 @@
+# Code of Merit
+
+1. The project creators, lead developers, core team, constitute
+the managing members of the project and have final say in every decision
+of the project, technical or otherwise, including overruling previous decisions.
+There are no limitations to this decisional power.
+
+2. Contributions are an expected result of your membership on the project.
+Don't expect others to do your work or help you with your work forever. 
+
+3. All members have the same opportunities to seek any challenge they want
+within the project. 
+
+4. Authority or position in the project will be proportional
+to the accrued contribution. Seniority must be earned.
+
+5. Software is evolutive: the better implementations must supersede lesser
+implementations. Technical advantage is the primary evaluation metric.
+
+6. This is a space for technical prowess; topics outside of the project
+will not be tolerated.
+
+7. Non technical conflicts will be discussed in a separate space. Disruption
+of the project will not be allowed.
+
+8. Individual characteristics, including but not limited to,
+body, sex, sexual preference, race, language, religion, nationality,
+or political preferences are irrelevant in the scope of the project and
+will not be taken into account concerning your value or that of your contribution
+to the project.
+
+9. Discuss or debate the idea, not the person.
+
+10. There is no room for ambiguity: Ambiguity will be met with questioning;
+further ambiguity will be met with silence. It is the responsibility
+of the originator to provide requested context.
+
+11. If something is illegal outside the scope of the project, it is illegal
+in the scope of the project. This Code of Merit does not take precedence over
+governing law.
+
+12. This Code of Merit governs the technical procedures of the project not the 
+activities outside of it. 
+
+13. Participation on the project equates to agreement of this Code of Merit.
+
+14. No objectives beyond the stated objectives of this project are relevant
+to the project. Any intent to deviate the project from its original purpose
+of existence will constitute grounds for remedial action which may include
+expulsion from the project.
+
+This document is the Code of Merit (http://code-of-merit.org), version 1.0.

Readme.md

@@ -6,7 +6,7 @@
 
 [![npm version](https://badge.fury.io/js/faker.svg)](http://badge.fury.io/js/faker)
 
-[![OpenCollective](https://opencollective.com/fakerjs/backers/badge.svg)](#backers) 
+[![OpenCollective](https://opencollective.com/fakerjs/backers/badge.svg)](#backers)
 [![OpenCollective](https://opencollective.com/fakerjs/sponsors/badge.svg)](#sponsors)
 
 ## Demo
@@ -208,6 +208,7 @@ This will interpolate the format string with the value of methods `name.lastName
   * phoneFormats
 * random
   * number
+  * float
   * arrayElement
   * objectElement
   * uuid
@@ -259,6 +260,7 @@ faker.locale = "de";
  * en_IE
  * en_IND
  * en_US
+ * en_ZA
  * en_au_ocker
  * es
  * es_MX
@@ -275,6 +277,7 @@ faker.locale = "de";
  * nl
  * pl
  * pt_BR
+ * pt_PT
  * ru
  * sk
  * sv
@@ -287,7 +290,7 @@ faker.locale = "de";
 
 ### Individual Localization Packages
 
-As of vesion `v3.0.0` faker.js supports incremental loading of locales. 
+As of vesion `v3.0.0` faker.js supports incremental loading of locales.
 
 By default, requiring `faker` will include *all* locale data.
 
@@ -475,4 +478,3 @@ Become a sponsor and get your logo on our README on Github with a link to your s
 <a href="https://opencollective.com/fakerjs/sponsor/27/website" target="_blank"><img src="https://opencollective.com/fakerjs/sponsor/27/avatar.svg"></a>
 <a href="https://opencollective.com/fakerjs/sponsor/28/website" target="_blank"><img src="https://opencollective.com/fakerjs/sponsor/28/avatar.svg"></a>
 <a href="https://opencollective.com/fakerjs/sponsor/29/website" target="_blank"><img src="https://opencollective.com/fakerjs/sponsor/29/avatar.svg"></a>
-

build/src/docs.md

@@ -24,22 +24,22 @@ curl http://faker.hook.io?property=name.findName&locale=de
 ## Usage
 
 ### Browser
-
+```html
     <script src = "faker.js" type = "text/javascript"></script>
     <script>
       var randomName = faker.name.findName(); // Caitlyn Kerluke
       var randomEmail = faker.internet.email(); // [email protected]
       var randomCard = faker.helpers.createCard(); // random contact card containing many properties
     </script>
-
+```
 ### Node.js
-
+```js
     var faker = require('faker');
 
     var randomName = faker.name.findName(); // Rowan Nikolaus
     var randomEmail = faker.internet.email(); // [email protected]
     var randomCard = faker.helpers.createCard(); // random contact card containing many properties
-
+```
 ## API