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

Django2 #194

Merged
merged 38 commits into from
Jan 26, 2018
Merged

Django2 #194

merged 38 commits into from
Jan 26, 2018

Commits on Nov 16, 2017

  1. hydroshare integration, not complete yet.

    Miguel Leon committed Nov 16, 2017
    Configuration menu
    Copy the full SHA
    bda2f7c View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2018

  1. test uploading to hydroshare

    Miguel Leon committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    11ea601 View commit details
    Browse the repository at this point in the history

  2. command to create an sqlite db export.

    Miguel Leon committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    2e8dd88 View commit details
    Browse the repository at this point in the history

  3. remove unused imports

    Miguel Leon committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    daf5880 View commit details
    Browse the repository at this point in the history

  4. social settings for hydroshare linkage

    Miguel Leon committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    553ac84 View commit details
    Browse the repository at this point in the history

  5. add url and social settings

    Miguel Leon committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    9fdc3a9 View commit details
    Browse the repository at this point in the history

  6. don't need oauth2_provider app removed. add url for exporting to hydr… 

    …oshare
    Miguel Leon committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    5404bab View commit details
    Browse the repository at this point in the history

  7. need fixture_magic as installed app

    Miguel Leon committed Jan 10, 2018
    Configuration menu
    Copy the full SHA
    c461221 View commit details
    Browse the repository at this point in the history

Commits on Jan 12, 2018

  1. update for exporting to hydroshare

    Miguel Leon committed Jan 12, 2018
    Configuration menu
    Copy the full SHA
    9d0cd7c View commit details
    Browse the repository at this point in the history

Commits on Jan 23, 2018

  1. Updates for django 2.0 and python 3.6 compatability.

    Miguel Leon committed Jan 23, 2018
    Configuration menu
    Copy the full SHA
    b8ae62e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into django2

    Miguel Leon authored Jan 23, 2018
    Configuration menu
    Copy the full SHA
    1bee819 View commit details
    Browse the repository at this point in the history

  3. Update .travis.yml 

    move hs_restclient to install via pip not on conda
    Miguel Leon authored Jan 23, 2018
    Configuration menu
    Copy the full SHA
    7c3b0ba View commit details
    Browse the repository at this point in the history

  4. Update requirements.txt 

    hs_restclient not on a conda channel
    Miguel Leon authored Jan 23, 2018
    Configuration menu
    Copy the full SHA
    e2a4999 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2018

  1. Update .travis.yml 

    changes for travis
    Miguel Leon authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    2642970 View commit details
    Browse the repository at this point in the history

  2. Update requirements.txt 

    update to requirements
    Miguel Leon authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    675bf03 View commit details
    Browse the repository at this point in the history

  3. Update requirements.txt 

    requirements change for travis
    Miguel Leon authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    da83ad6 View commit details
    Browse the repository at this point in the history

  4. Update .travis.yml 

    update for travis
    Miguel Leon authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    4e0281d View commit details
    Browse the repository at this point in the history

  5. base import in development settings needs relative path

    Miguel Leon committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    3ceb414 View commit details
    Browse the repository at this point in the history

  6. settings file for SQLite ODM2 Admin instances 

    This is a settings file for instances of ODM2 Admin which are generated when uploading data to Hydroshare. To create a ODM2 SQLite file another instance of ODM2 Admin is needed.
    Miguel Leon authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    7e492a7 View commit details
    Browse the repository at this point in the history

  7. use conda packages

    @ocefpaf
    ocefpaf committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    dd8ae05 View commit details
    Browse the repository at this point in the history

  8. force conda-forge's gdal

    @ocefpaf
    ocefpaf committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    c093fb9 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #195 from ocefpaf/use_conda_pkgs 

    Use conda pkgs
    Miguel Leon authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    09e9bac View commit details
    Browse the repository at this point in the history

  10. Update development.py 

    add a missing setting to settings  - EXPORTDB flag used - if set to true this will use Camel case table names for SQLite
    Miguel Leon authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    0e3c61d View commit details
    Browse the repository at this point in the history

  11. blank ODM2 Admin db 

    blank ODM2 Admin db
    Miguel Leon authored Jan 24, 2018
    Configuration menu
    Copy the full SHA
    07ab681 View commit details
    Browse the repository at this point in the history

  12. Adds a settings file for an export instance of ODM2 Admin. In order t… 

    …o export data to a SQLite file for upload to Hydroshare a new instance of ODM2 Admin is created. This is the settings file for those instances.
    Miguel Leon committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    0a75677 View commit details
    Browse the repository at this point in the history

  13. add test file from testing branch.

    Miguel Leon committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    a69488e View commit details
    Browse the repository at this point in the history

  14. changes previously made under miguelcleon/ODM2-Admin for setup.py 

    removes fake test
    Miguel Leon committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    0abeec4 View commit details
    Browse the repository at this point in the history

  15. update for tests

    Miguel Leon committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    a01445d View commit details
    Browse the repository at this point in the history

  16. django 2.0 test update

    Miguel Leon committed Jan 24, 2018
    Configuration menu
    Copy the full SHA
    44b91a4 View commit details
    Browse the repository at this point in the history

Commits on Jan 25, 2018

  1. Add time interval to map pop up.

    Miguel Leon committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    534dee8 View commit details
    Browse the repository at this point in the history

  2. process data logger file add another date format

    Miguel Leon committed Jan 25, 2018
    Configuration menu
    Copy the full SHA
    4fb3bcd View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2018

  1. base import in development settings needs relative path

    Miguel Leon committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    201e56a View commit details
    Browse the repository at this point in the history

  2. create sql db for travis and testing

    Miguel Leon committed Jan 26, 2018
    1 Configuration menu
    Copy the full SHA
    b7aa6f6 View commit details
    Browse the repository at this point in the history

  3. add absolute path to odm2admin package in tests.

    Miguel Leon committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    db7a336 View commit details
    Browse the repository at this point in the history

  4. fix bug in .travis.yml

    Miguel Leon committed Jan 26, 2018
    1 Configuration menu
    Copy the full SHA
    aa9dff1 View commit details
    Browse the repository at this point in the history

  5. add libgdal boost back in

    Miguel Leon committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    77da0b6 View commit details
    Browse the repository at this point in the history

  6. add exportdb file back in

    Miguel Leon committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    c000fda View commit details
    Browse the repository at this point in the history

  7. change database engine for travis.

    Miguel Leon committed Jan 26, 2018
    Configuration menu
    Copy the full SHA
    b2b131c View commit details
    Browse the repository at this point in the history