ExCiteS / geokey

98%

master: 90%

LAST BUILD ON BRANCH dev/0.8

branch: dev/0.8

CHANGE BRANCH

x

Reset

• dev/0.8
• 0.10
• 0.10.1
• 0.2
• 0.2.1
• 0.2.2
• 0.3
• 0.4
• 0.5
• 0.5.1
• 0.5.3
• 0.5.4
• 0.5.5
• 0.5.6
• 0.6.1
• 0.7
• 0.7.1
• 0.7.2
• 0.8
• 0.8.1
• 0.8.2
• 0.8.3
• 0.8.4
• 0.8.5
• 0.8.6
• 0.9
• 0.9.1
• 0.9.2
• 0.9.3
• 1.0
• 1.0.0
• 1.0.1
• 1.1
• 1.1.1
• 1.1.2
• 1.1.3
• 1.1.4
• 1.1.5
• 1.10.0
• 1.11.0
• 1.11.1
• 1.11.2
• 1.2
• 1.2.1
• 1.2.2
• 1.2.3
• 1.2.4
• 1.2.5
• 1.3
• 1.3.1
• 1.4
• 1.4.1
• 1.4.2
• 1.4.3
• 1.4.4
• 1.4.5
• 1.5.0
• 1.6.0
• 1.7.0
• 1.7.1
• 1.7.2
• 1.8.0
• 1.9.0
• JamesBradbury-patch-1
• JamesBradbury-patch-1-1
• accessibility-improvements
• all-auth
• alpha/0.5
• alpha/0.5-prepare-pypi-package
• alpha/0.6/ENABLE_VIDEO
• alpha/0.6/data-filtering
• alpha/0.6/kml-renderer
• alpha/0.6/parser-renderer
• amr_audio
• api-get-all-extensions
• auth_contrib_only
• auto-extension-url
• better-account-templates
• better-all-projects
• better-factories
• better-test-factories
• bug/fix-checkbox-saving
• bug/fix-subset-restriction-feature
• bugfix/allow-to-run-tests-within-container
• bugfix/correct-docker-container-configuration
• bugfix/correctly-add-and-remove-admins-when-project-locked
• bugfix/correctly-count-num-of-media-and-comments
• bugfix/correctly-handle-anonymous-comments
• bugfix/correctly-handle-anonymous-media
• bugfix/correctly-install-dependencies
• bugfix/display-site-domain-on-password-reset-email
• bugfix/install-gdal-with-docker
• bugfix/make-sure-users-are-deactivated-when-not-confirmed
• bugfix/no-communitymaps-exposure
• bugfix/remove-console-logs
• bugfix/remove-pip-installation-file
• bugfix/sync-assets-to-container
• categories-serializers
• change-only-name-fix
• changed-ignore-folder
• code_security_improvements
• comments-patch
• count_media_and_comments
• counting-media-fix
• delete_user_gdpr
• dependabot/pip/pillow-6.2.0
• dependencies-update
• dev/data-imports
• dev/edit-lookups
• dev/filters
• dev/redesign-footer
• dev/redesign-project-nav
• dev/search
• display_field
• dj111_upgrade_pt3
• django-1.10
• django-1.9
• django_111_upgrade2
• django_1_11_upgrade
• duplicate-admin-fix
• expiry-date
• feature/additional-audio-formats
• feature/regex-redirect-uris
• feature/sortable-lookup-values
• feature/upgrade-djangorestframework
• feature/upload-pdf-files
• filtering-fix
• fix_django_settings
• fix_private_projects_crash
• fix_project_views
• geokey-spelling
• gulbalasalamov-geokey-updated-documentation
• history
• ignore-tests
• including-extension-url-fix
• indexing-numbers
• js-url-check
• jsonb
• kml-with-comments
• kml-with-media
• latest_requests
• leaflet-cdn
• logger
• lookupvalue-symbology
• manage-inactive-users
• master
• material-design
• material_design
• more_audio_formats
• mstevens-0.8.6
• mstevens-audio
• mstevens-info_api
• mstevens-nullable-location
• mstevens-symbols
• mstevens83-changelog
• mstevens83-readme
• new-app-loading-system
• new-features-0.5
• new-requirements
• newer_django
• newfeatures-v0.3
• no-contact-admins
• no-daily-digest
• num-media-and-comments
• obs_by_bbox
• overview-list
• performance
• permanent-active-users
• py3_upgrade
• rename
• requirement-updates
• requirements-update
• s_interaction
• security_middleware
• social
• social-accounts
• social_interact
• spelling-patch
• stable/0.4.x
• stable/0.5.x
• stable/0.6.x
• stable/0.7.x
• staging
• test/gdal-on-python-3
• test_and_dev_updates
• title-fix
• update-drf
• update-requirements
• update_requirements
• user-profile-fix
• userform
• yotuube_bug

Merge conflicting migrations