Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Pull request for v1.6.1 #51

Merged
merged 61 commits into from
Jul 11, 2015
Merged

Pull request for v1.6.1 #51

merged 61 commits into from
Jul 11, 2015

Commits on Apr 21, 2015

  1. Add basic appveyor.yml file, ignore in R build

    @tomschenkjr
    tomschenkjr committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    86e9692 View commit details
    Browse the repository at this point in the history

  2. Added unit testing to build scripts

    @tomschenkjr
    tomschenkjr committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    3486709 View commit details
    Browse the repository at this point in the history

  3. Added unit testing to build scripts

    @tomschenkjr
    tomschenkjr committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    d470ad0 View commit details
    Browse the repository at this point in the history

  4. Clean-up extraneous comments

    @tomschenkjr
    tomschenkjr committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    b915ce8 View commit details
    Browse the repository at this point in the history

  5. Fixed merge conficts

    @tomschenkjr
    tomschenkjr committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    f8f6cd5 View commit details
    Browse the repository at this point in the history

  6. Potential fix to run Rscript on test_script

    @tomschenkjr
    tomschenkjr committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    81d7cca View commit details
    Browse the repository at this point in the history

  7. Added warnings_are_errors for appveyor and travis-ci

    @tomschenkjr
    tomschenkjr committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    1715d8d View commit details
    Browse the repository at this point in the history

  8. Testing directory for Appveyor

    @tomschenkjr
    tomschenkjr committed Apr 21, 2015
    Configuration menu
    Copy the full SHA
    8a74f52 View commit details
    Browse the repository at this point in the history

Commits on Apr 22, 2015

  1. Turn off WARNINGS_ARE_ERRORS to test unit testing capabilities

    @tomschenkjr
    tomschenkjr committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    95fda86 View commit details
    Browse the repository at this point in the history

  2. Hard-removed WARNINGS_ARE_ERRORS for unit testing

    @tomschenkjr
    tomschenkjr committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    b341597 View commit details
    Browse the repository at this point in the history

  3. Using double-quotes instead of single for Appveyor

    @tomschenkjr
    tomschenkjr committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    56ac9cf View commit details
    Browse the repository at this point in the history

  4. roxygen2 now builds NAMESPACE, .Rd and collate files

    @tomschenkjr
    tomschenkjr committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    346b56f View commit details
    Browse the repository at this point in the history

  5. Add roxygen2 to CI build scripts

    @tomschenkjr
    tomschenkjr committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    01c7352 View commit details
    Browse the repository at this point in the history

  6. Added CRAN repo; fixed quote marks

    @tomschenkjr
    tomschenkjr committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    dc18695 View commit details
    Browse the repository at this point in the history

  7. Added AppVeyor badges, added warnings_as_errors, closes #39

    @tomschenkjr
    tomschenkjr committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    016a776 View commit details
    Browse the repository at this point in the history

  8. Bump build number

    @tomschenkjr
    tomschenkjr committed Apr 22, 2015
    Configuration menu
    Copy the full SHA
    f4880c0 View commit details
    Browse the repository at this point in the history

Commits on May 26, 2015

  1. Updated badges layout to Shields.io

    Tom Schenk Jr committed May 26, 2015
    Configuration menu
    Copy the full SHA
    35d4d4a View commit details
    Browse the repository at this point in the history

Commits on May 28, 2015

  1. Merge branch 'iss39' of https://github.com/Chicago/RSocrata into dev

    Tom Schenk Jr committed May 28, 2015
    Configuration menu
    Copy the full SHA
    dd1add6 View commit details
    Browse the repository at this point in the history

  2. Build number bump

    Tom Schenk Jr committed May 28, 2015
    Configuration menu
    Copy the full SHA
    2550178 View commit details
    Browse the repository at this point in the history

  3. Fixed AppVeyor icons

    Tom Schenk Jr committed May 28, 2015
    Configuration menu
    Copy the full SHA
    3b70692 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2015

  1. Moved most 'Depends' packages to 'Imports' in DESCRIPTION. Added 'Imp… 

    …ortFrom' in NAMESPACE. Strangely, had to comment out fieldNames examplein the documentation.
    @geneorama
    geneorama committed Jun 5, 2015
    1 Configuration menu
    Copy the full SHA
    632ef04 View commit details
    Browse the repository at this point in the history

  2. testing adding httr:: to parse_url to explicitly reference the proper… 

    … namespace
    @geneorama
    geneorama committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    f060f92 View commit details
    Browse the repository at this point in the history

  3. using :: to reference all namespaces

    @geneorama
    geneorama committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    e497cbe View commit details
    Browse the repository at this point in the history

  4. using :: to reference all namespaces

    @geneorama
    geneorama committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    577a48f View commit details
    Browse the repository at this point in the history

  5. increasing build number

    @geneorama
    geneorama committed Jun 5, 2015
    Configuration menu
    Copy the full SHA
    49cb9a9 View commit details
    Browse the repository at this point in the history

Commits on Jun 6, 2015

  1. Version bump to 1.6.1

    Tom Schenk Jr committed Jun 6, 2015
    1 Configuration menu
    Copy the full SHA
    7749221 View commit details
    Browse the repository at this point in the history

  2. Documentation clean-up, fixes #40

    @tomschenkjr
    tomschenkjr committed Jun 6, 2015
    Configuration menu
    Copy the full SHA
    16c58e9 View commit details
    Browse the repository at this point in the history

  3. Contributing docs, closes #23 fix #28

    @tomschenkjr
    tomschenkjr committed Jun 6, 2015
    Configuration menu
    Copy the full SHA
    69ae6fd View commit details
    Browse the repository at this point in the history

  4. Updated release notes

    @tomschenkjr
    tomschenkjr committed Jun 6, 2015
    Configuration menu
    Copy the full SHA
    994ffa2 View commit details
    Browse the repository at this point in the history

Commits on Jul 4, 2015

  1. Removed \url{...}. *Now* closes #40 

    Erroneously mentioned as closed in 16c58e9
    Tom Schenk Jr committed Jul 4, 2015
    Configuration menu
    Copy the full SHA
    f624af5 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2015

  1. update travis to a new version, i.e. proper "r" instead of old "c"

    @dmpe
    dmpe committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    d506619 View commit details
    Browse the repository at this point in the history

  2. divide in two steps

    @dmpe
    dmpe committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    81e049f View commit details
    Browse the repository at this point in the history

  3. revert to the old inline style

    @dmpe
    dmpe committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    d763803 View commit details
    Browse the repository at this point in the history

  4. again

    @dmpe
    dmpe committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    98a655c View commit details
    Browse the repository at this point in the history

  5. upgrade packages to newer versions and remove pck1::

    @dmpe
    dmpe committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    23db73c View commit details
    Browse the repository at this point in the history

  6. upgrade description for the seocnd time

    @dmpe
    dmpe committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    6b13eeb View commit details
    Browse the repository at this point in the history

  7. import all, not just specific functions

    @dmpe
    dmpe committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    2916b7a View commit details
    Browse the repository at this point in the history

  8. Merge pull request #46 from dmpe/dev 

    update travis to a new version, i.e. proper "r" instead of old "c"
    Tom Schenk Jr committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    1b92240 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2015

  1. I have no idea what is being merge in what, and where is what being (… 

    …newly) developed.
    @dmpe
    dmpe committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    ce84fd7 View commit details
    Browse the repository at this point in the history

  2. delete curl dependency, unnecessary

    @dmpe
    dmpe committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    b377cc7 View commit details
    Browse the repository at this point in the history

  3. smaller changes

    @dmpe
    dmpe committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    0fe2457 View commit details
    Browse the repository at this point in the history

  4. add @dmpe as an contributor

    @dmpe
    dmpe committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    04bb245 View commit details
    Browse the repository at this point in the history

  5. 6 test will still fail, without bigger changes to the code 

    udpate description
    @dmpe
    dmpe committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    0134c71 View commit details
    Browse the repository at this point in the history

  6. delete tests based on RUnit

    @dmpe
    dmpe committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    57a3295 View commit details
    Browse the repository at this point in the history

  7. add coveralls badge to readme. 

    #48

#48 (comment)
    @dmpe
    dmpe committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    d83530a View commit details
    Browse the repository at this point in the history

  8. https://github.com/Chicago/RSocrata/pull/47#discussion-diff-34170071

    @dmpe
    dmpe committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    4b124e2 View commit details
    Browse the repository at this point in the history

  9. @param a xxx -> should be @param a - xxx

    @dmpe
    dmpe committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    cc1ba9f View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2015

  1. Changed to square badges, inline placement

    @tomschenkjr
    tomschenkjr committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    835e978 View commit details
    Browse the repository at this point in the history

  2. All tests now working appropriately

    @tomschenkjr
    tomschenkjr committed Jul 10, 2015
    1 Configuration menu
    Copy the full SHA
    ddb8fbb View commit details
    Browse the repository at this point in the history

  3. Removed AppVeyor reference to RUnit tests

    @tomschenkjr
    tomschenkjr committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    6d90340 View commit details
    Browse the repository at this point in the history

  4. Build number bump

    @tomschenkjr
    tomschenkjr committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    42b46ee View commit details
    Browse the repository at this point in the history

  5. update travis and add back ::s 

    update description to delete maintainer
merge all necessary commits
    @dmpe
    dmpe committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    f4f7beb View commit details
    Browse the repository at this point in the history

  6. update travis, and add 2 exported methods

    @dmpe
    dmpe committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    bb8123c View commit details
    Browse the repository at this point in the history

  7. do include man dir

    @dmpe
    dmpe committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    2da69f1 View commit details
    Browse the repository at this point in the history

  8. no need for curl lib

    @dmpe
    dmpe committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    4ebbaf6 View commit details
    Browse the repository at this point in the history

  9. update readme (#48); split news/chagelog to its own file (better user… 

    … UX) and delete it from rbuild.
    @dmpe
    dmpe committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    8c5a9be View commit details
    Browse the repository at this point in the history

  10. update contributing.md to reflect the change to testthat

    @dmpe
    dmpe committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    5403fdb View commit details
    Browse the repository at this point in the history

  11. resolving conflicts with pull request

    @geneorama
    geneorama committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    41854e0 View commit details
    Browse the repository at this point in the history

  12. Merge branch 'dmpe-import' into dev

    @geneorama
    geneorama committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    e8fc7e4 View commit details
    Browse the repository at this point in the history

  13. deleted blank line

    @geneorama
    geneorama committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    1e9e055 View commit details
    Browse the repository at this point in the history

  14. Updated documentation; re-added build number

    Tom Schenk Jr committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    6e118d4 View commit details
    Browse the repository at this point in the history