Commits on Jan 21, 2015

  1. initial add geonode.contrib.datatables

    @jj0hns0n
    jj0hns0n committed Jan 21, 2015
    Configuration menu
    Copy the full SHA
    a06edb1 View commit details
    Browse the repository at this point in the history

  2. Make geonode.layers.models.Attribute work with any geonode.base.model… 

    …s.ResourceBase (for use in geonode.contrib.datatables.models.DataTable)
    @jj0hns0n
    jj0hns0n committed Jan 21, 2015
    Configuration menu
    Copy the full SHA
    233c3a7 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:GeoNode/geonode into table-join 

    Conflicts:
	geonode/geoserver/helpers.py
    @jj0hns0n
    jj0hns0n committed Jan 21, 2015
    Configuration menu
    Copy the full SHA
    5f5db65 View commit details
    Browse the repository at this point in the history

  4. Move join config to function

    @jj0hns0n
    jj0hns0n committed Jan 21, 2015
    Configuration menu
    Copy the full SHA
    3f3e6d6 View commit details
    Browse the repository at this point in the history

Commits on Jan 26, 2015

  1. Merge branch 'master' of github.com:GeoNode/geonode into table-join

    @jj0hns0n
    jj0hns0n committed Jan 26, 2015
    Configuration menu
    Copy the full SHA
    bbf6b08 View commit details
    Browse the repository at this point in the history

  2. Interim commit

    @jj0hns0n
    jj0hns0n committed Jan 26, 2015
    Configuration menu
    Copy the full SHA
    d120798 View commit details
    Browse the repository at this point in the history

  3. Interim Commit

    @jj0hns0n
    jj0hns0n committed Jan 26, 2015
    Configuration menu
    Copy the full SHA
    cccd8bc View commit details
    Browse the repository at this point in the history

  4. Interim Commit

    @jj0hns0n
    jj0hns0n committed Jan 26, 2015
    Configuration menu
    Copy the full SHA
    2f13bc2 View commit details
    Browse the repository at this point in the history

  5. Use database and geoserver catalog settings from settings.py

    @jj0hns0n
    jj0hns0n committed Jan 26, 2015
    Configuration menu
    Copy the full SHA
    5c4565d View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2015

  1. in progress

    @jj0hns0n
    jj0hns0n committed Feb 2, 2015
    Configuration menu
    Copy the full SHA
    31d8d7d View commit details
    Browse the repository at this point in the history

Commits on Feb 5, 2015

  1. Merge branch 'master' of github.com:GeoNode/geonode into table-join

    @jj0hns0n
    jj0hns0n committed Feb 5, 2015
    Configuration menu
    Copy the full SHA
    a73ff1d View commit details
    Browse the repository at this point in the history

  2. Work to migrate to strictly http requests

    @jj0hns0n
    jj0hns0n committed Feb 5, 2015
    Configuration menu
    Copy the full SHA
    3b38ab7 View commit details
    Browse the repository at this point in the history

  3. in progress work

    Ubuntu committed Feb 5, 2015
    Configuration menu
    Copy the full SHA
    4dd0e4d View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/jj0hns0n/geonode into tab… 

    …le-join
    @jj0hns0n
    jj0hns0n committed Feb 5, 2015
    Configuration menu
    Copy the full SHA
    201dc10 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2015

  1. in progress commit

    @jj0hns0n
    jj0hns0n committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    e991ca0 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'table-join' of github.com:jj0hns0n/geonode into table-join

    @jj0hns0n
    jj0hns0n committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    679f6ab View commit details
    Browse the repository at this point in the history

  3. Merge branch 'table-join' of https://github.com/jj0hns0n/geonode into… 

    … table-join
    @jj0hns0n
    jj0hns0n committed Feb 6, 2015
    Configuration menu
    Copy the full SHA
    2f8e70d View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2015

  1. Merge branch 'master' of github.com:GeoNode/geonode into table-join

    @jj0hns0n
    jj0hns0n committed Feb 8, 2015
    Configuration menu
    Copy the full SHA
    a313691 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2015

  1. Merge branch 'master' of github.com:GeoNode/geonode into table-join

    @jj0hns0n
    jj0hns0n committed Feb 11, 2015
    Configuration menu
    Copy the full SHA
    5a15d4d View commit details
    Browse the repository at this point in the history

  2. Merge branch 'table-join' of https://github.com/jj0hns0n/geonode into… 

    … table-join
    @jj0hns0n
    jj0hns0n committed Feb 11, 2015
    Configuration menu
    Copy the full SHA
    4e1b98a View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2015

  1. Change some error messages

    @jj0hns0n
    jj0hns0n committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    ed058f7 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:GeoNode/geonode into table-join

    @jj0hns0n
    jj0hns0n committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    08c4c1c View commit details
    Browse the repository at this point in the history

  3. Let the title be longer

    @jj0hns0n
    jj0hns0n committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    1b1d9e1 View commit details
    Browse the repository at this point in the history

  4. Add a little more error handling, closes #35

    @jj0hns0n
    jj0hns0n committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    1481580 View commit details
    Browse the repository at this point in the history

  5. More error handling

    @jj0hns0n
    jj0hns0n committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    8b4da55 View commit details
    Browse the repository at this point in the history

  6. More error handling

    @jj0hns0n
    jj0hns0n committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    6e35654 View commit details
    Browse the repository at this point in the history

  7. update DataTableAdmin

    @jj0hns0n
    jj0hns0n committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    a9fb88e View commit details
    Browse the repository at this point in the history

  8. add view to serialize datatable

    @jj0hns0n
    jj0hns0n committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    6b95041 View commit details
    Browse the repository at this point in the history

  9. Add a category to the JoinTarget and add an endpoint to get the JoinT… 

    …argets
    @jj0hns0n
    jj0hns0n committed Feb 12, 2015
    Configuration menu
    Copy the full SHA
    5144811 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2015

  1. Add some more test scripts

    @jj0hns0n
    jj0hns0n committed Feb 13, 2015
    Configuration menu
    Copy the full SHA
    132a0a8 View commit details
    Browse the repository at this point in the history

Commits on Feb 17, 2015

  1. Add delimiter_type and no_header_row per #41

    @jj0hns0n
    jj0hns0n committed Feb 17, 2015
    Configuration menu
    Copy the full SHA
    0858fb1 View commit details
    Browse the repository at this point in the history

  2. Add error handling to the join api endpoint

    @jj0hns0n
    jj0hns0n committed Feb 17, 2015
    Configuration menu
    Copy the full SHA
    3506893 View commit details
    Browse the repository at this point in the history

  3. Only use geom field from layer and fix error handling for failed joins.

    @jj0hns0n
    jj0hns0n committed Feb 17, 2015
    Configuration menu
    Copy the full SHA
    4753662 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2015

  1. Merge branch 'master' of github.com:GeoNode/geonode into table-join

    @jj0hns0n
    jj0hns0n committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    ee7b5d7 View commit details
    Browse the repository at this point in the history

  2. Add datatable_upload_and_join_api closes #46

    @jj0hns0n
    jj0hns0n committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    0584d78 View commit details
    Browse the repository at this point in the history

  3. Add join stats to TableJoin Model (refs #48)

    @jj0hns0n
    jj0hns0n committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    2c7e8ab View commit details
    Browse the repository at this point in the history

  4. Return the counts with the initial join

    @jj0hns0n
    jj0hns0n committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    28ee4fe View commit details
    Browse the repository at this point in the history

  5. More in progress work

    @jj0hns0n
    jj0hns0n committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    25da890 View commit details
    Browse the repository at this point in the history

  6. Add remove endpoints refs #47

    @jj0hns0n
    jj0hns0n committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    9aef650 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2015

  1. Merge branch 'master' of github.com:GeoNode/geonode into table-join

    @jj0hns0n
    jj0hns0n committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    72131ef View commit details
    Browse the repository at this point in the history

  2. in progress work

    @jj0hns0n
    jj0hns0n committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    25f852d View commit details
    Browse the repository at this point in the history

  3. Add title filtering for jointargets

    @jj0hns0n
    jj0hns0n committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    38528ec View commit details
    Browse the repository at this point in the history

  4. Allow for filtering of the attributes in the JoinTargetAdmin

    @jj0hns0n
    jj0hns0n committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    380158c View commit details
    Browse the repository at this point in the history

  5. Add endpoint to upload a csv with lat/lon columns

    @jj0hns0n
    jj0hns0n committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    7af4161 View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2015

  1. In progress

    @jj0hns0n
    jj0hns0n committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    dd5203a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:GeoNode/geonode into table-join

    @jj0hns0n
    jj0hns0n committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    af6e075 View commit details
    Browse the repository at this point in the history

  3. move tests around

    @jj0hns0n
    jj0hns0n committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    d6def64 View commit details
    Browse the repository at this point in the history

Commits on May 13, 2015

  1. Merge branch 'master' of github.com:GeoNode/geonode into table-join

    @jj0hns0n
    jj0hns0n committed May 13, 2015
    Configuration menu
    Copy the full SHA
    fd7845b View commit details
    Browse the repository at this point in the history

  2. change accounts url (why?)

    @jj0hns0n
    jj0hns0n committed May 13, 2015
    Configuration menu
    Copy the full SHA
    e8ea4d2 View commit details
    Browse the repository at this point in the history

  3. let name be non-unique

    @jj0hns0n
    jj0hns0n committed May 13, 2015
    Configuration menu
    Copy the full SHA
    82b6144 View commit details
    Browse the repository at this point in the history