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

Preparing for release 0.7, merging development to master #142

Merged
merged 73 commits into from
Jan 19, 2018
Merged

Preparing for release 0.7, merging development to master #142

merged 73 commits into from
Jan 19, 2018

Commits on Nov 6, 2017

  1. initial commit for sampling feature dataset query

    sreeder committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    0783a07 View commit details
    Browse the repository at this point in the history

  2. remove extra info

    sreeder committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    959ba64 View commit details
    Browse the repository at this point in the history

  3. cleanup models comments

    sreeder committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    d91ddc7 View commit details
    Browse the repository at this point in the history

  4. update inline documentation

    sreeder committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    9419af8 View commit details
    Browse the repository at this point in the history

  5. cleanup documentation url

    sreeder committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    01b1933 View commit details
    Browse the repository at this point in the history

  6. bold required element in documentation

    sreeder committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    e4de3e4 View commit details
    Browse the repository at this point in the history

  7. rename type to dstype

    sreeder committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    60ebf3f View commit details
    Browse the repository at this point in the history

  8. fix bold documentations

    sreeder committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    53e9631 View commit details
    Browse the repository at this point in the history

  9. all ready for merging

    sreeder committed Nov 6, 2017
    Configuration menu
    Copy the full SHA
    4df7799 View commit details
    Browse the repository at this point in the history

  10. Merge pull request #121 from ODM2/sfdataset 

    add getSamplingFeatureDatasets
    @sreeder
    sreeder authored Nov 6, 2017
    Configuration menu
    Copy the full SHA
    4f11a28 View commit details
    Browse the repository at this point in the history

Commits on Nov 9, 2017

  1. update getDatasets and create getDatasetsResults functions

    sreeder committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    2a22676 View commit details
    Browse the repository at this point in the history

  2. add condition to getDatasetREsults function

    sreeder committed Nov 9, 2017
    Configuration menu
    Copy the full SHA
    1ce6c37 View commit details
    Browse the repository at this point in the history

Commits on Nov 13, 2017

  1. fix typo in get from ids

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    4ea9395 View commit details
    Browse the repository at this point in the history

  2. update Sample.py

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    11b0c36 View commit details
    Browse the repository at this point in the history

  3. update tests, update DateTime data type to be compatible with sqlite,… 

    … some BigInteger values in models.py were the incorrect type
    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    8a8ffe7 View commit details
    Browse the repository at this point in the history

  4. fix sample.py file

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    120008d View commit details
    Browse the repository at this point in the history

  5. accidentally duplicated code

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    a88c8ae View commit details
    Browse the repository at this point in the history

  6. remvoe unused imports in models.py

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    9624cc5 View commit details
    Browse the repository at this point in the history

  7. fix issue with getSamplingFeatureDatasets

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    a4febb4 View commit details
    Browse the repository at this point in the history

  8. fix issue with sf in datasets

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    9401656 View commit details
    Browse the repository at this point in the history

  9. undo changes made to test sql query

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    91ee0c3 View commit details
    Browse the repository at this point in the history

  10. add datasetsvalues docstrings

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    f33c2cb View commit details
    Browse the repository at this point in the history

  11. update doc strings

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    644cb6f View commit details
    Browse the repository at this point in the history

  12. add sfids, sfcodes and sfuuids to getResults

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    00834dd View commit details
    Browse the repository at this point in the history

  13. test sfresult function

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    69656fa View commit details
    Browse the repository at this point in the history

  14. add todo comment

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    1559213 View commit details
    Browse the repository at this point in the history

  15. update warning message

    sreeder committed Nov 13, 2017
    Configuration menu
    Copy the full SHA
    5ec7eb6 View commit details
    Browse the repository at this point in the history

Commits on Nov 14, 2017

  1. Merge pull request #122 from ODM2/dsresults 

    Dsresults
    @sreeder
    sreeder authored Nov 14, 2017
    Configuration menu
    Copy the full SHA
    ab50ca8 View commit details
    Browse the repository at this point in the history

  2. add restype to result function

    sreeder committed Nov 14, 2017
    Configuration menu
    Copy the full SHA
    be1a758 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into sfresults

    @sreeder
    sreeder authored Nov 14, 2017
    Configuration menu
    Copy the full SHA
    817a78e View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2017

  1. Merge pull request #123 from ODM2/sfresults 

    Sfresults
    @sreeder
    sreeder authored Nov 15, 2017
    Configuration menu
    Copy the full SHA
    2d3e4ab View commit details
    Browse the repository at this point in the history

Commits on Nov 17, 2017

  1. update get samplingfeatureds to have new sf structur

    sreeder committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    7e7a34c View commit details
    Browse the repository at this point in the history

  2. update assign datasets

    sreeder committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    3ff16c1 View commit details
    Browse the repository at this point in the history

  3. update sfdataset test

    sreeder committed Nov 17, 2017
    Configuration menu
    Copy the full SHA
    d84c252 View commit details
    Browse the repository at this point in the history

  4. Merge pull request #125 from ODM2/sfdataset 

    Sfdataset
    @sreeder
    sreeder authored Nov 17, 2017
    Configuration menu
    Copy the full SHA
    dd1ec35 View commit details
    Browse the repository at this point in the history

Commits on Nov 22, 2017

  1. Fix Processing Levels code and docstring

    @lsetiawan
    lsetiawan committed Nov 22, 2017
    Configuration menu
    Copy the full SHA
    89a7b95 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #129 from lsetiawan/proc_lvl 

    Fix Processing Levels code and docstring
    @lsetiawan
    lsetiawan authored Nov 22, 2017
    Configuration menu
    Copy the full SHA
    5bf911c View commit details
    Browse the repository at this point in the history

Commits on Dec 8, 2017

  1. Fixed getSamplingFeatureDatasets issue #130

    @Elijahwalkerwest
    Elijahwalkerwest committed Dec 8, 2017
    Configuration menu
    Copy the full SHA
    2b08624 View commit details
    Browse the repository at this point in the history

Commits on Dec 13, 2017

  1. Fix getSamplingFeatureDataset

    @lsetiawan
    lsetiawan committed Dec 13, 2017
    Configuration menu
    Copy the full SHA
    9592471 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #131 from ODM2/samplingfeaturedataset_dev 

    Fixed getSamplingFeatureDatasets issue #130
    @lsetiawan
    lsetiawan authored Dec 13, 2017
    Configuration menu
    Copy the full SHA
    4acdf62 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2017

  1. fix issue #132 by Miguel C Leon

    @lsetiawan
    lsetiawan committed Dec 20, 2017
    Configuration menu
    Copy the full SHA
    fcef187 View commit details
    Browse the repository at this point in the history

  2. Merge pull request #134 from lsetiawan/update_dl 

    Error in DataLoggerFiles and DataLoggerFileColumns #132
    @lsetiawan
    lsetiawan authored Dec 20, 2017
    Configuration menu
    Copy the full SHA
    ae0bdfd View commit details
    Browse the repository at this point in the history

Commits on Jan 5, 2018

  1. Fix dataframe column names

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    baee8b5 View commit details
    Browse the repository at this point in the history

  2. Update docstrings

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    32519f6 View commit details
    Browse the repository at this point in the history

  3. fix builtins in annotations and results

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    3c132a3 View commit details
    Browse the repository at this point in the history

  4. change ResultType to ResultValues

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    b87dab2 View commit details
    Browse the repository at this point in the history

  5. Merge pull request #136 from lsetiawan/fix_getresultvalues 

    Fix getresultvalues
    @emiliom
    emiliom authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    cb30fbe View commit details
    Browse the repository at this point in the history

  6. Fix the rest of the builtins, added warnings

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    edb02fa View commit details
    Browse the repository at this point in the history

  7. Fix mistype

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    c493d61 View commit details
    Browse the repository at this point in the history

  8. fix builtins in annotations and results

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    2d92edd View commit details
    Browse the repository at this point in the history

  9. Fix the rest of the builtins, added warnings

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    b822481 View commit details
    Browse the repository at this point in the history

  10. Fix mistype

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    005f423 View commit details
    Browse the repository at this point in the history

  11. Add kwargs checking, show warnings for unexpected

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    3352541 View commit details
    Browse the repository at this point in the history

  12. Rebased

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    acd3ffa View commit details
    Browse the repository at this point in the history

  13. Merge pull request #137 from lsetiawan/fix_builtins 

    Fix builtins
    @emiliom
    emiliom authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    65da961 View commit details
    Browse the repository at this point in the history

  14. Missed builtin, should be last one

    @lsetiawan
    lsetiawan committed Jan 5, 2018
    Configuration menu
    Copy the full SHA
    9ca7459 View commit details
    Browse the repository at this point in the history

  15. Merge pull request #138 from lsetiawan/fix_getcv 

    Missed builtin, should be last one
    @emiliom
    emiliom authored Jan 5, 2018
    Configuration menu
    Copy the full SHA
    b572e29 View commit details
    Browse the repository at this point in the history

Commits on Jan 8, 2018

  1. Allow sfid to be None to work with older code

    @lsetiawan
    lsetiawan committed Jan 8, 2018
    Configuration menu
    Copy the full SHA
    fcc9286 View commit details
    Browse the repository at this point in the history

  2. Cleanup readServices and base

    @lsetiawan
    lsetiawan committed Jan 8, 2018
    Configuration menu
    Copy the full SHA
    fba24a5 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2018

  1. Merge pull request #139 from lsetiawan/fix_gr 

    Allow sfid to be None to work with older code
    @emiliom
    emiliom authored Jan 9, 2018
    Configuration menu
    Copy the full SHA
    292dc84 View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. Make lowercase columns default, add option to make them same as model

    @lsetiawan
    lsetiawan committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    42d9840 View commit details
    Browse the repository at this point in the history

  2. Clean up updateService

    @lsetiawan
    lsetiawan committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    007550f View commit details
    Browse the repository at this point in the history

  3. Cleanup model

    @lsetiawan
    lsetiawan committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    26099a0 View commit details
    Browse the repository at this point in the history

  4. Update Travis to exclude python code in forms, since this was auto cr… 

    …eated.
    @lsetiawan
    lsetiawan committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    b751673 View commit details
    Browse the repository at this point in the history

  5. Clean up tests

    @lsetiawan
    lsetiawan committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    7b59e77 View commit details
    Browse the repository at this point in the history

  6. Ingore Sample.py

    @lsetiawan
    lsetiawan committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    27cf30b View commit details
    Browse the repository at this point in the history

Commits on Jan 11, 2018

  1. Merge pull request #141 from lsetiawan/flake8 

    Flake8
    @emiliom
    emiliom authored Jan 11, 2018
    Configuration menu
    Copy the full SHA
    ccb9cd1 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'development' into fix_grv

    @lsetiawan
    lsetiawan authored Jan 11, 2018
    Configuration menu
    Copy the full SHA
    4b48b3e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'development' into fix_grv

    @lsetiawan
    lsetiawan authored Jan 11, 2018
    Configuration menu
    Copy the full SHA
    dbca706 View commit details
    Browse the repository at this point in the history

Commits on Jan 16, 2018

  1. Add warning message for lowercols parameter

    @lsetiawan
    lsetiawan committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    badb498 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'fix_grv' of https://github.com/lsetiawan/ODM2PythonAPI … 

    …into fix_grv
    @lsetiawan
    lsetiawan committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    5164ebe View commit details
    Browse the repository at this point in the history

  3. Add warning doc in getDataSetsValues

    @lsetiawan
    lsetiawan committed Jan 16, 2018
    Configuration menu
    Copy the full SHA
    58a3616 View commit details
    Browse the repository at this point in the history

Commits on Jan 17, 2018

  1. Merge pull request #140 from lsetiawan/fix_grv 

    Make lowercase columns default, add option to make them same as model
    @lsetiawan
    lsetiawan authored Jan 17, 2018
    Configuration menu
    Copy the full SHA
    f634574 View commit details
    Browse the repository at this point in the history