Skip to content

Commit 40ea48c

Browse files
committed
Merge remote-tracking branch 'refs/remotes/victorjonsson/master' into patch-1
# Conflicts: # form-validator/security.js this was the compiled version, need it to overwrite my local compiled version.
2 parents d1484f5 + 8cc79cf commit 40ea48c

Some content is hidden

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

57 files changed

+1431
-953
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
language: node_js
22
node_js:
3-
- "0.12"
3+
- "4.2.4"
44
before_script:
55
- npm install -g grunt-cli

README.md

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,6 +105,22 @@ Read the documentation for the location module at [http://formvalidator.net/#loc
105105

106106
Read the documentation for the file module at [http://formvalidator.net/#file-validators](http://formvalidator.net/#file-validators)
107107

108+
### Module: logic
109+
110+
* **Dependent validation**
111+
* **Require "one-of"**
112+
113+
Read the documentation for this module at [http://formvalidator.net/#logic](http://www.formvalidator.net/#logic)
114+
115+
### Module: sepa
116+
117+
* **IBAN**
118+
* **BIC**
119+
* **Sepa**
120+
121+
Read the documentation for this module at [http://formvalidator.net/#sepa](http://www.formvalidator.net/#sepa)
122+
123+
108124
### Module: sweden
109125
* **swemob***validate that the value is a swedish mobile telephone number*
110126
* **swesec***validate swedish social security number*
@@ -117,8 +133,8 @@ Read the documentation for the Swedish module at [http://formvalidator.net/#swed
117133

118134
### Module: uk
119135
* **ukvatnumber**
120-
* **uknin** - *validate UK National Insurance number* **not yet released...**
121-
* **ukutr** - *validate UK Unique Taxpayer Reference number* **not yet released...**
136+
* **uknin**
137+
* **ukutr**
122138

123139
Read the documentation for the UK module at [http://formvalidator.net/#uk-validators](http://www.formvalidator.net/#country-specific-validators_uk)
124140

form-validator/brazil.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

form-validator/date.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

form-validator/file.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

form-validator/html5.js

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)