Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: terranodo/eventkit
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: terranodo/eventkit
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: docker
Choose a head ref
Checking mergeability… Don’t worry, you can still create the pull request.
  • 20 commits
  • 13 files changed
  • 2 contributors

Commits on Sep 1, 2016

  1. Initial Docker setup

    @jj0hns0n
    jj0hns0n committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    f117499 View commit details
    Browse the repository at this point in the history

  2. Dockerize - full geonode settings - no local_settings.py

    @ingenieroariel
    ingenieroariel committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    fc794bc View commit details
    Browse the repository at this point in the history

  3. eventkit cannot use geonode/django because it needs native libraries … 

    …before pip install
    @ingenieroariel
    ingenieroariel committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    c4d341b View commit details
    Browse the repository at this point in the history

  4. Do not use wait-for-postgres

    @ingenieroariel
    ingenieroariel committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    1418c5c View commit details
    Browse the repository at this point in the history

  5. dont wait-for-postgres or use str2bool

    @jj0hns0n
    jj0hns0n committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    93c6c4b View commit details
    Browse the repository at this point in the history

  6. Merge branch 'docker' of https://github.com/terranodo/eventkit into d… 

    …ocker

# Conflicts:
#	Dockerfile
    @jj0hns0n
    jj0hns0n committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    7111c73 View commit details
    Browse the repository at this point in the history

  7. Some fixes for Docker

    @jj0hns0n
    jj0hns0n committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    2c2fe16 View commit details
    Browse the repository at this point in the history

  8. add importer urls

    @jj0hns0n
    jj0hns0n committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    c42432f View commit details
    Browse the repository at this point in the history

  9. remove geoserver from settings.py

    @jj0hns0n
    jj0hns0n committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    d9be5e5 View commit details
    Browse the repository at this point in the history

  10. more changes for docker

    @jj0hns0n
    jj0hns0n committed Sep 1, 2016
    Configuration menu
    Copy the full SHA
    d18481b View commit details
    Browse the repository at this point in the history

Commits on Sep 2, 2016

  1. use eventkit geonode

    @jj0hns0n
    jj0hns0n committed Sep 2, 2016
    Configuration menu
    Copy the full SHA
    0c5f3a1 View commit details
    Browse the repository at this point in the history

  2. more work for docker

    @jj0hns0n
    jj0hns0n committed Sep 2, 2016
    Configuration menu
    Copy the full SHA
    ef29940 View commit details
    Browse the repository at this point in the history

Commits on Sep 6, 2016

  1. Merge branch 'master' of https://github.com/terranodo/eventkit into d… 

    …ocker
    @jj0hns0n
    jj0hns0n committed Sep 6, 2016
    Configuration menu
    Copy the full SHA
    d052144 View commit details
    Browse the repository at this point in the history

Commits on Sep 8, 2016

  1. Merge branch 'master' of https://github.com/terranodo/eventkit into d… 

    …ocker
    @jj0hns0n
    jj0hns0n committed Sep 8, 2016
    Configuration menu
    Copy the full SHA
    b989d09 View commit details
    Browse the repository at this point in the history

Commits on Sep 9, 2016

  1. in progress

    @jj0hns0n
    jj0hns0n committed Sep 9, 2016
    Configuration menu
    Copy the full SHA
    3794cd3 View commit details
    Browse the repository at this point in the history

Commits on Sep 14, 2016

  1. switch to osgeo-importer eventkit branch

    @jj0hns0n
    jj0hns0n committed Sep 14, 2016
    Configuration menu
    Copy the full SHA
    7caead7 View commit details
    Browse the repository at this point in the history

Commits on Oct 7, 2016

  1. ...

    @jj0hns0n
    jj0hns0n committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    4c62a04 View commit details
    Browse the repository at this point in the history

  2. in progress work

    @jj0hns0n
    jj0hns0n committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    28916f5 View commit details
    Browse the repository at this point in the history

  3. in progress

    @jj0hns0n
    jj0hns0n committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    74dd458 View commit details
    Browse the repository at this point in the history

  4. add eventkit-entrypoint.sh

    @jj0hns0n
    jj0hns0n committed Oct 7, 2016
    Configuration menu
    Copy the full SHA
    54256e8 View commit details
    Browse the repository at this point in the history
Loading