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

Development #104

Merged
merged 15 commits into from
Mar 29, 2018
Merged

Development #104

merged 15 commits into from
Mar 29, 2018

Commits on Mar 6, 2018

  1. adding a development branch... also updated/added some pictures

    @darksinge
    darksinge committed Mar 6, 2018
    Configuration menu
    Copy the full SHA
    a5a4dc1 View commit details
    Browse the repository at this point in the history

Commits on Mar 9, 2018

  1. 'fixed' the dataparser so it will connect to mssql from a unix machin… 

    …e. Also updated a bunch of html stuff for #102
    @darksinge
    darksinge committed Mar 9, 2018
    Configuration menu
    Copy the full SHA
    1d63390 View commit details
    Browse the repository at this point in the history

Commits on Mar 12, 2018

  1. adding documentation for connecting to MSSQL

    @darksinge
    darksinge committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    89b68de View commit details
    Browse the repository at this point in the history

  2. updated templates

    @darksinge
    darksinge committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    7943cb1 View commit details
    Browse the repository at this point in the history

  3. finished updates for issue #102 minus adding links to documents that … 

    …have not been added to the repository
    @darksinge
    darksinge committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    8c0f43e View commit details
    Browse the repository at this point in the history

  4. resolved merge conflict

    @darksinge
    darksinge committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    f9d419f View commit details
    Browse the repository at this point in the history

  5. fixed issue where site images were not found if a .png or if extensio… 

    …n was all caps ('.JPG' instead of '.jpg')
    @darksinge
    darksinge committed Mar 12, 2018
    Configuration menu
    Copy the full SHA
    5e77d32 View commit details
    Browse the repository at this point in the history

Commits on Mar 13, 2018

  1. .pdf and .pptx additions

    @darksinge
    darksinge committed Mar 13, 2018
    Configuration menu
    Copy the full SHA
    c5f9602 View commit details
    Browse the repository at this point in the history

Commits on Mar 21, 2018

  1. Updated a bunch of stuff. Fixed a bunch of stuff. This project has so… 

    …me serious issues.
    @darksinge
    darksinge committed Mar 21, 2018
    Configuration menu
    Copy the full SHA
    4b5f0f4 View commit details
    Browse the repository at this point in the history

Commits on Mar 23, 2018

  1. updated views.py to filter unwanted variables; added webcam_update.py

    @darksinge
    darksinge committed Mar 23, 2018
    Configuration menu
    Copy the full SHA
    6abea66 View commit details
    Browse the repository at this point in the history

Commits on Mar 27, 2018

  1. removed .idea project folder from cache

    @darksinge
    darksinge committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    85001a4 View commit details
    Browse the repository at this point in the history

  2. Delete c:\inetpub\wwwroot\mdf\log__main__.log

    @darksinge
    darksinge authored Mar 27, 2018
    Configuration menu
    Copy the full SHA
    4de3985 View commit details
    Browse the repository at this point in the history

  3. updated DataParser.py... removed a completely unecessary logging 'tool'

    @darksinge
    darksinge committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    6a5d885 View commit details
    Browse the repository at this point in the history

  4. updated DataParser.py

    @darksinge
    darksinge committed Mar 27, 2018
    Configuration menu
    Copy the full SHA
    696bfe0 View commit details
    Browse the repository at this point in the history

Commits on Mar 29, 2018

  1. updated requirments.txt; minor template fixes

    @darksinge
    darksinge committed Mar 29, 2018
    Configuration menu
    Copy the full SHA
    7451b5e View commit details
    Browse the repository at this point in the history