Commits · 6eb69273fc979fdc9459502abb1c9f155bce1dc2 · Water / dataRetrieval

23 Feb, 2017 3 commits
- Merge pull request #331 from USGS-R/NGWMN · 6eb69273
  Laura A DeCicco authored Feb 23, 2017
```
Ngwmn
```
  6eb69273
- Merge branch 'master' into NGWMN · 5703d84a
  Laura A DeCicco authored Feb 23, 2017
  
  5703d84a
- Merge pull request #289 from wdwatkins/NGWMN · c0090b34
  Laura A DeCicco authored Feb 23, 2017
```
NGWMN branch
```
  c0090b34
22 Feb, 2017 14 commits
- warnings, and several tests commented for req limit · e3499d90
  David Watkins authored Feb 22, 2017
  
  e3499d90
- Merge pull request #327 from lindsaycarr/countyCdLookup · 3efa6601
  Laura A DeCicco authored Feb 22, 2017
```
add countyCdLookup to readWQPdata and readNWISdata
```
  3efa6601
- Merge pull request #328 from ldecicco-USGS/samplingActivity · f94a25ef
  Laura A DeCicco authored Feb 22, 2017
```
Sampling activity
```
  f94a25ef
- semicolons were missing · 5345d4eb
  Lindsay R Carr authored Feb 22, 2017
  
  5345d4eb
- Label · a0dc7162
  Laura A DeCicco authored Feb 22, 2017
  
  a0dc7162
- uncomplicate readWQPdots county lookup code · 39d9b0f9
  Lindsay R Carr authored Feb 22, 2017
  
  39d9b0f9
- need to compare all lower case · 8cd3d74b
  Lindsay R Carr authored Feb 22, 2017
  
  8cd3d74b
- county look up is more flexible, helpful error msgs for state and county look ups · 4364a639
  Lindsay R Carr authored Feb 22, 2017
  
  4364a639
- accidentally deleted county stuff from readWQPdots · 0f60993d
  Lindsay R Carr authored Feb 22, 2017
  
  0f60993d
- smaller example for WQP county query · 0c4a5ca7
  Lindsay R Carr authored Feb 22, 2017
  
  0c4a5ca7
- flip url back to prod · 662ccfc1
  David Watkins authored Feb 22, 2017
  
  662ccfc1
- url handling working · 3d46679f
  David Watkins authored Feb 22, 2017
  
  3d46679f
- merge conflicts · ee84f145
  Lindsay R Carr authored Feb 22, 2017
```
Merge remote-tracking branch 'upstream/master' into countyCdLookup

Conflicts:
	R/readNWISdata.r
	R/readWQPdata.R
	man/readNWISdata.Rd
	man/readWQPdata.Rd
```
  ee84f145
- better != syntax · a0c6420d
  Lindsay R Carr authored Feb 22, 2017
  
  a0c6420d
21 Feb, 2017 23 commits
- sampling activity tests · e4ccbedb
  Laura A DeCicco authored Feb 21, 2017
  
  e4ccbedb
- Merge branch 'master' of github.com:USGS-R/dataRetrieval into samplingActivity · 33b04a52
  Laura A DeCicco authored Feb 21, 2017
  
  33b04a52
- Merge pull request #325 from lindsaycarr/urlBuildingLogic · a36f1816
  Laura A DeCicco authored Feb 21, 2017
```
readWQPdots
```
  a36f1816
- setAccess for levels · 8f92df03
  David Watkins authored Feb 21, 2017
  
  8f92df03
- remove tz from list and add as arg in test · 668d8cbe
  Lindsay R Carr authored Feb 21, 2017
  
  668d8cbe
- zip logic not needed in whatWQPsites anymore · 3e489c99
  Lindsay R Carr authored Feb 21, 2017
  
  3e489c99
- zip logic in readWQPdots w/ updated tests · 65beb98c
  Lindsay R Carr authored Feb 21, 2017
  
  65beb98c
- upstream merge · e3348ab7
  David Watkins authored Feb 21, 2017
```
Merge branch 'master' of github.com:USGS-R/dataRetrieval into NGWMN

# Conflicts:
#	DESCRIPTION
#	NAMESPACE
#	R/importNGWMN_wml2.R
#	R/readNGWMNdata.R
#	man/importNGWMN_wml2.Rd
#	man/readNGWMNdata.Rd
#	man/readNGWMNlevels.Rd
#	man/readNGWMNsites.Rd
#	man/readWQPdata.Rd
#	man/whatWQPsites.Rd
#	tests/testthat/tests_userFriendly_fxns.R
```
  e3348ab7
- cleaned up TODOs · f9182029
  David Watkins authored Feb 17, 2017
  
  f9182029
- tz as argument to readNWISdata and readWQPdata, remove tz logic · 7802305a
  Lindsay R Carr authored Feb 21, 2017
  
  7802305a
- merge conflicts · 81659179
  Lindsay R Carr authored Feb 21, 2017
```
Merge remote-tracking branch 'upstream/master' into urlBuildingLogic

Conflicts:
	R/readWQPdata.R
	R/whatWQPsites.R
	tests/testthat/tests_general.R
```
  81659179
- Merge pull request #301 from ldecicco-USGS/master · 12536052
  Laura A DeCicco authored Feb 21, 2017
```
Allow lists in readXdata
```
  12536052
- Add in Sampling service · 50a4f4c0
  Laura A DeCicco authored Feb 21, 2017
  
  50a4f4c0
- fixing tests · 37ae906a
  Lindsay R Carr authored Feb 21, 2017
  
  37ae906a
- using OlsonNames() for timezone options · 6dcae638
  Lindsay R Carr authored Feb 21, 2017
  
  6dcae638
- readWQPdots line ending · ecb75ef3
  Lindsay R Carr authored Feb 21, 2017
  
  ecb75ef3
- readWQPdots tests · e1a645ac
  Lindsay R Carr authored Feb 21, 2017
  
  e1a645ac
- use readWQPdots in whatWQPsites · 89f740ed
  Lindsay R Carr authored Feb 21, 2017
  
  89f740ed
- new function readWQPdots · 2c1419af
  Lindsay R Carr authored Feb 21, 2017
  
  2c1419af
- Merge branch 'master' of github.com:ldecicco-USGS/dataRetrieval into samplingActivity · 61087b23
  Laura A DeCicco authored Feb 21, 2017
  
  61087b23
- countyCdLookup used for WQP + example added (returning more than one county right now) · bb5dcd07
  Lindsay R Carr authored Feb 21, 2017
  
  bb5dcd07
- Fixing some of ya'lls notes · d1d4f1a0
  Laura A DeCicco authored Feb 21, 2017
  
  d1d4f1a0
- countyCdLookup used for NWIS + example added · 9901ce2a
  Lindsay R Carr authored Feb 21, 2017
  
  9901ce2a