Switched to the 'rogue' branch instead of 'salamati'
Merge branch 'rogue' of https://github.com/ROGUE-JCTD/geonode into rogue
Merge branch 'rogue' of https://github.com/ROGUE-JCTD/geonode into rogue
Merge branch 'rogue' of https://github.com/ROGUE-JCTD/geonode into rogue
Just ignore file types in shapefile set that are extraneous
Set ACCOUNT_NOTIFY_ON_PASSWORD_CHANGE=False by default
Set ACCOUNT_EMAIL_CONFIRMATION_REQUIRED = False by default
Merge branch 'rogue' of https://github.com/ROGUE-JCTD/geonode into rogue
Implement doDelete for Importer
Wire up doDelete in the Import Template
Remove references to geonetwork and reload the session one last time
Return a json dict from upload delete view
uncomment start/stop geoserver
Merge branch 'rogue' of github.com:ROGUE-JCTD/geonode into rogue
Initial work on doResume