chore: fix merge conflicts #1851
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
profnandaa
force-pushed
the
chore/fix-merge-conflicts
branch
from
1c56d5b
to
a6819c1
Compare
Codecov Report
@@ Coverage Diff @@
## master #1851 +/- ##
=========================================
Coverage 100.00% 100.00%
=========================================
Files 102 102
Lines 2054 2054
Branches 464 464
=========================================
Hits 2054 2054
Continue to review full report at Codecov.
|
3 tasks
profnandaa
force-pushed
the
chore/fix-merge-conflicts
branch
from
a6819c1
to
3f1eb3d
Compare
3 tasks
profnandaa
force-pushed
the
chore/fix-merge-conflicts
branch
2 times, most recently
from
6f55dd1
to
f79d045
Compare
3 tasks
profnandaa
force-pushed
the
chore/fix-merge-conflicts
branch
from
f79d045
to
6cd4783
Compare
3 tasks
profnandaa
force-pushed
the
chore/fix-merge-conflicts
branch
from
6cd4783
to
250339c
Compare
3 tasks
profnandaa
force-pushed
the
chore/fix-merge-conflicts
branch
2 times, most recently
from
553e401
to
3c077d4
Compare
3 tasks
profnandaa
force-pushed
the
chore/fix-merge-conflicts
branch
from
3c077d4
to
a6c787a
Compare
3 tasks
profnandaa
force-pushed
the
chore/fix-merge-conflicts
branch
from
a6c787a
to
c496341
Compare
3 tasks
…ocales chore: squashed commits from #1834 feat(isMobilePhone): regex for Namibia locale fix(isMobilePhone): removing telephone validation fix(isMobliePhone): regex now validates as intended fix(isMobilePhone): requiring phone number prefixes in validation feat(isMobilePhone): regex for Burkina Faso locale fix(isMobilePhone): removing code intended for a different branch fix(isMobilePhone): Making plus sign optional feat(isMobilePhone): regex for Burkina Faso locale
chore: squashed #1829 Add locale for Maldives in mobile phone validator Add tests for mobile numbers validation of maldives locale i.e. dv-MV Update readme to add Maldives locale (dv-MV) in isMobilePhone documentation
[chore] squashed from #1820 Clean up validator and add trailing comma
Create validation for frech polynesia mobile phones according to wikipedia: https://en.wikipedia.org/wiki/Telephone_numbers_in_French_Polynesia#Mobile
[chore] fixed merge conflicts in #1784 feat: (isMobilePhone) Add Guyana mobile phone validation Fix linter errors
squashed commits and resolved merge conflict for #1780 Add Turkmenistan validation regax Update README.md to include Turkmenistan (tk-Tm) Add test cases for tk-TM add missing comma for isMobilePhone.js add missing commas for test/validators.js
Added new condition for Botswana New regex for Botswana numbers Phone number information was found from the following sources: - https://www.howtocallabroad.com/botswana/ - https://countrycode.org/botswana Updated README.md to include en-BW Included the new case for Botswana (en-BW) Added test cases for isMobilePhone en-BW Added some test cases to check length for the phone number & area code pattern. Changed regex for BW Fixed the pattern for Botswana mobile phone numbers and edited the test cases. I followed the convention from Table 8 of the national numbering plan document and the mobile number pattern on the Wiki page. Update validators.js Oops! Looks like the file didn't update with some of my modified test cases - my apologies!
Add isMobilePhone test for ar-PS Add ar-PS to isMobilePhone readme Correct ar-PS validation Update ar-PS isMobible tests
* Solve issue with wrong validation on El Salvador mobile phones * update tests accordingly in order to define the right regEx, the following site was consulted. https://www.siget.gob.sv/guia-de-servicios/consulta-el-plan-de-numeracion/numeros-moviles/
profnandaa
force-pushed
the
chore/fix-merge-conflicts
branch
from
c496341
to
f17e220
Compare
3 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.