SEED-platform / seed

77%

develop: 79%

LAST BUILD ON BRANCH revert-2130-chore/merge-bricr-dev

branch: revert-2130-chore/merge-bricr-dev

CHANGE BRANCH

x

Reset

• revert-2130-chore/merge-bricr-dev
• HEAD
• develop
• parser_update
• update-versions
• 1833-ulid-footprints
• 1833-footprint-import
• 1815-label_export
• dockerfile-fix
• master
• v2.5.0
• meters
• footprint-preview
• v2.5.1
• 2.6.0-Beta
• ft-unique-test-org
• 1861-rename-columns
• year-over-year
• meters-update
• meters_timescale_osx_install
• 1861-rename-columns-fe
• tmp-alex2
• 1861-rename-columns-typecasting
• performance
• 1867-bldg-parsing
• v2.5.2
• 1871-redis-pw-upgrade-celery
• pairing-hotfix
• labels-to-views
• 1879-profile_id
• dependency-update
• pairing-hotfix-label-hooks
• buildingsync-xlsx-export
• dependabot/pip/requirements/djangorestframework-3.9.1
• backup-files-30-days
• meters-merge-update
• dependabot/pip/requirements/django-1.11.21
• 1879-profile_id_v21
• 2.5.2-patch0
• 1901-remove-column-mappings
• 2.5.2-patch1
• 1903-column-renaming
• 2.5.2-patch0-hotfix0
• 2.5.2-patch0-hotfix
• meters-pm-format
• matching-update
• dependabot/pip/requirements/django-1.11.22
• ft-GBR-create-state-certificates
• gb-meter-import-fix
• bricr-export
• meter-display-settings-updates
• improvement/add-max-file-for-logs
• sticky-headers
• meter-feature-improvements
• 2.6.0-rc1
• bricr-dev
• dependabot/pip/requirements/django-1.11.23
• upgrade-ubid
• move-bsync-tests
• prepare-2.6.0
• v2.6.0
• v2.5.2-patch0
• v2.5.2-patch1
• linking
• update-test-files
• dependabot/npm_and_yarn/eslint-utils-1.4.2
• api-error-handling
• python3-super
• sticky-inventory-detail
• taxlot-geocoding-update
• master-patch00
• migration-performance
• 2.6.0-patch00
• update-maintenance-scripts
• document-timescaledb-version
• prep-2.6.1
• 1571_matching_changes_verbiage
• v2.6.1
• 1970_initial_matching_criteria_refresh
• column-list-settings-duplicates
• column_mapping_doc
• geocoding_fields
• 1979-edit-record-fail
• 1990-fixed-invalid-view-responses
• 1989_unmerge_pairing_persistence
• relax-constraint-on-postgis
• dq_labels_refresh
• list_labels_refresh
• filter_indicator
• merged-indicator
• 1992-historical-col-map
• ubid
• 1873-dq-type-error
• 2005-docker-dependency
• postal
• zip
• criteria_tweak
• 1759-mapping-presets
• 1759-mapping-presets-FE-tests
• post-import-summary-cleanup
• 2010_group_matching_fields_by_table
• equivalence-partitioner-comparator
• 2015-protected-column-names
• 2.6.1-patch0
• button_√_7864
• column_sort_1991
• 1982_show_map
• 1715_inv_detail_pop_cols_only
• update-contrib
• 709_dup_import_file_headers
• button_√_786
• 1945_geocode_perms_error
• 1592-disallow-duplicate-org-names
• 417_cache_report_settings
• 1024-new-user-must-have-org
• 1998_lat_long_initial_edit
• 994-delete-orphaned-users
• 2052_col_settings_errors
• 1713-return-result
• 1913_export_notes
• v2.7.0-Beta
• 2060_new_col_map_bug
• 2059_geo_order_update_preview
• 2009_django_2_upgrade
• hardcoded_date_in_test
• 2020-copyright
• 2072_inv_detail_ed_highlighting
• 2.6.1-patch1
• 2076-espm-endpoints
• 2018_merging_geocoded
• 2069_default_cycle
• 2013_edit_delete_notes
• 1819_dq_results_labels
• more-verbose-logging
• 1759_presets_bug_fix
• 1614
• best-practices
• 2017_column_settings
• 1760_export_reports
• 2027_column_settings
• 1614_1615
• 2023_data_import
• 2066_sidebar
• refactor/BSync-tsdata
• 2080_historical_mapping
• 1591_extra_data_highlight_bug
• 2096_meter_import_bug
• dependabot/pip/requirements/django-2.2.10
• fix/update-bsync
• revert-2107-dependabot/pip/requirements/django-2.2.10
• 2102_freeze_column
• chore/bsync-scenario-savings
• 2114
• kube_test
• 2095_upgrade_django
• feat/scenario-meter-and-savings
• 2.6.1-patch2
• update-bsync-fix-travis
• fix-travis
• feat/bsync-parser
• 2127_resize_cols
• chore/merge-bricr-dev
• fix/bsync-meterreading-import
• 1675_mapping_units
• dq_null_check
• 2134_blank_col_setting_261
• 2134_blank_col_setting_dev
• 2.6.1-patch3
• revert-2136-2134_blank_col_setting_dev
• revert-2140-revert-2136-2134_blank_col_setting_dev
• 1946_pm_meter_import_fix
• wip/bsync-upload-flow
• bricr-dev-old
• bricr-prod
• 2119_created_updated
• 1882_filter_operators
• 2139_reset_password_fix
• 1975_merge_check_fix
• 2105_edit_record_warning_update
• cleanup-0119-migration
• espm_and_tests_270
• 2.7.0
• recognize_empty_270
• created_updated_270
• prep-2.7.1
• prep-2.7.0
• django_2.2upgrade_migration
• v2.7.1
• 1298-import-date-field
• patch/data_importer
• deploy-docker-compose
• WIP_api_research
• bricr-dev-update-deploy
• fix/bsync-tasks
• fixed-urls
• none_data_type_min
• drf-yasg
• refactor/bsync-tasks
• 1716_hand_edit_notes
• 2180_apiv3_dataset
• wava_updates
• patch/mapping_controller
• 1369_dq_rule_#_badge
• 1369_dq_tab_badge
• patch/bsync-import
• 1231-notes-field
• disable-directory-listing
• feat/bsync-mapping-presets
• refactor/bsync-bricr-parsing
• patch/bsync-update-scenarios
• patch/buildingfile-scenario-link
• 2178_apiv3_labels
• patch/meters-util-param
• 2176_apiv3_users
• 2181_apiv3_cycles
• 2216-python3.7
• 2.7.0-patch1
• chore/bsync-bricr-parsing
• flake8_upgrade_and_pin
• swagger_page_load_time
• k8
• 2177_api_v3_columns
• feat/bsync-selection-tool-validation
• 2226_lost_data_on_import
• 2202_deleted_dq_rules
• 2.7.1
• 2238_taxlots_text_rule_data_type
• wava
• feat/bsync-selection-tool-validation-develop
• 2.7.1-patch1
• comstock-support
• feat/api-v3-import-files
• refactor/api-v3-swagger-decorator
• dependabot/pip/requirements/django-2.2.13
• 2250-refactor/api-v3-properties
• 2249-refactor/api-v3-organizations
• 2179_api_v3_dq
• 2251-refactor/api-v3-taxlots
• 2252-refactor/api-v3-meters
• 2183_api_v3_column_mapping_profile
• 2259-refactor/api-v3-label-inventory
• 2253-refactor/api-v3-mbu
• resolve-bricr-merge
• 2182_api_v3_column_list_profiles
• fix/validate_use_cases-org-id
• fix/validate_use_cases-org-id-2
• 2250-refactor/api-v3-properties-v21
• 2254_api_v3_geocode_ubid
• 2253-refactor/api-v3-building-file
• 2254_api_v3_misc
• 2232_swagger_page_errors
• refactor/properties-v21
• 2263_api_v3_gbr
• 2232_swagger_page_errors_2
• v2.7.0-patch1
• v2.7.1-patch1
• api_v3_cleanup_rd_1
• api_v3_cleanup_rd_2
• 2281_dq_rule_auto_set_condition
• 2290_dq_valid_label_results_fix
• 2289_dq_admin_save_button_fix
• 2293_dq_extra_data_bug
• migration-fix
• 2286_dq_indicate_mapped_fields
• 2263_api_v3_add_property_views
• 2164_label_is_applied
• change_log_notes_for_api_272
• 2324_col_display_name_save
• 2047_taxlot_dedicated_map
• prep-2.7.2-release
• 2306_api_v3_columns_fe
• 2309-apiv3-frontend-ColumnMappings
• v2.7.2
• postgres-12
• refactor/building-files-transition
• 2312-apiv3-frontend-ColumnListProfiles
• refactor/v3-meters-transition
• 2314-apiv3-frontend-ColumnMappingProfiles
• 2311-apiv3-frontend-cycles
• 2318-apiv3-frontend-UploadProgress
• 2333_hand_edit_bug
• api3_ubid_pm_import
• fix/bsync-use-case-name
• fix/bricr-bsync-use-case-name
• 2305/refactor/v3-users-transition
• 2304/refactor/v3-import-files-transition
• 2307/refactor/v3-labels-transition
• 2302/refactor/v3-organiations-transition
• 2319_api_ubid_pm_import
• test
• 2303/refactor/v3-taxlots-transition
• fix/fe-update-with-bsync
• 2344_unit_aware_mapping_bug
• 2301/refactor/v3-properties-transition
• refactor/update_with_buildingsync
• 2321/refactor/v3-report-data-transition
• 2345/fix/manual-edit-saving
• 2322/refactor/v3-taxlot-notes-transition
• 2323/refactor/v3-misc-properties-transition
• 2330/fix/unitted-mapping-results
• 2316_geocode
• 2320-apiv3-frontend-VSTLPE
• deployment
• doesitbuildbranches
• refactor/rename-column-mapping-profile
• 2371_dup_mapping_develop
• 2308_dq_v3_transition
• aviveiros11-patch-1
• fix-500-errors
• fix-swagger-validation
• 2335-refactor/rename-column-list-profiles
• 2384_single_property_pm
• 2310_datasets_v3_transition
• api_v3_transition_cleanups
• data-quality-race-condition
• 1647_add_cycle_to_view
• 2374-feat/handle-missing-raw-headers
• 1978_mapquest_api_key_error
• col_list_profile_migration_cleanup
• consistent-git-sha
• 2397_dq_dup_rules_deletion
• 2203_dq_duplicate_rules
• 2370-fix/bsync-excel-export
• 1978_mapquest
• 2.7.2
• 2.7.2.1
• 1904_delete_extra_data
• 2371_dup_mapping-272
• prep-2.8-release
• revert-2407-1904_delete_extra_data
• fix_col_list_profile_commstock_bug
• v2.8.0
• lbnl_deploy
• fix/rename-column-list-profiles
• 2.7.3
• v2.7.3
• docs/git-naming-conventions
• pg12_image_274
• 2.7.4
• v2.7.4
• 2374-fix/xlsx-missing-header
• test_db_travis_delete_me_20201015
• feat/docker-dev-env
• docs/add-k8s-deployment
• feat/precommit-hook
• fix/docker
• 2395-feat/inventory-list-tooltips
• fix/upgrade-to-lokalise2
• docs/restore-site-settings
• 2437-feat/analysis-model
• feat/column-mapping-sort
• build/improve-gh-actions-build
• build/update-gh-actions
• docs/master-to-main
• feat/analyses-endpoints
• fix/publish-workflow
• fix/intermittent-test-failure
• 2483-fix/export-properties-and-taxlots
• feat/analyses-frontend
• chore/feature-issue-templates
• chore/new-url-for-espm-check
• 2455-feat/analysis-front-end
• 2490-fix/pip-packages
• chore/ci-check-for-coveralls
• feat/analyses-view-frontend
• feat/analysis-init
• 2496-fix/duplicate-states
• 2477-feat/run-bsyncr-analysis
• feat/analyses-create-view
• feat/analyses-page
• feat/start-analysis-frontend
• feat/analysis-run-page
• 2505-fix/org-analyses-list
• fix/property-state-factory
• release/2.9.0-prep
• main
• build/publish-on-release
• fix/publish-workflow-tag
• 2478-feat/stop-analysis
• feat/bsyncr-server
• 2476-feat/delete-analysis-view
• dependabot/pip/requirements/lxml-4.6.2
• 2533-feat/modify-analyses-payload-config
• refactor/update-bsyncr-pipeline
• 2542-feat/maintenance-page
• 2541-fix/open-links-in-new-tabs
• 1753-feat/add-filter-header
• feat/misc-analysis-tweaks
• feat/bsyncr-and-sentry-deployment
• alex-merge
• 2558-fix/drf-html
• feat/analysis-stats
• feat/track-progress-data
• 2.9.1
• 2512-feat/add-property-display-setting
• 2519-fix/long-notes-in-csv
• 2565-fix/upload-empty-file
• feat/ui-delete-cycle
• 2548-fix/500-errors
• refactor/ci-publish
• fix-Dockerfile
• 2574-fix/unit-column-filter
• 2.9.2
• 2577-fix/related-note-counts
• refactor/authorization
• 2104-feat/configure-new-user-email
• 2596-docs/views-states-warnings
• build/allow-disabling-v2-apis
• 2538-feat/self-registration
• feat/docs-page
• feat/populate_sample_data
• releasev2.9.3
• v2.9.3
• 2507-fix/dq-sort
• 2603-fix/column-delete-memory
• 2592-refactor/landing-page-revamp
• fix/self-registration-security
• docs/update-charts-and-docs
• alex-test
• feat/notes-sort
• misc-fixes
• feat/disable-merge-option
• feat/delete-org
• chore/rename-to-main
• 2538-feat/own-org
• feat/pg13
• fix/validation-client-exception
• fix/cycle-deletion
• dependabot/pip/requirements/djangorestframework-3.11.2
• dependabot/pip/requirements/lxml-4.6.3
• fix/ses-sig-v4
• 2626-feat/authorize-media-access
• 2627-feat/terms-of-service
• 2634-fix/import-xlsx
• 2626-alex
• 2611-feature/force-password-reset
• feat/toggle-self-reg
• fix/user-reg-toggle
• v2.10.0
• angularjs-components
• 2662-feat/add-stale-bot
• 2666-fix/bsync-measures
• dependabot/pip/requirements/django-2.2.20
• fix/viewer-perms
• fix/perm-conditions
• feat/BETTER-integration
• 1643-feat/add-label-column
• feat/sample_data_update
• feat/derived-columns
• feat/derived-columns-list-view
• bug/2689-recommend-measure
• feat/derived-columns-editor
• 2536-fix/add-import-debug
• 2690-feat/add-annual-peak-electricity-reduction
• 2692-feat/add-additional-measure-fields
• dependabot/pip/requirements/django-2.2.21
• 1643-fix/remove-scrollbars
• dependabot/pip/requirements/django-2.2.24
• refactor/data-request-meters
• feat/derived-column-inventory-list
• feat/derived-columns-data-quality-checks
• 2691-feat/parse-meter-units
• feat/derived-columns-export
• fix/BETTER-integration
• 869-feat/pm-file-single-import
• 2695-fix/ignore-non-monthly-timeseries
• 2695-fix/ignore-non-monthly-timeseries-2
• chore/email-template-develop
• v2.10.1
• 2728-chore/docker-post-office-config
• ol-update
• build/multistage-build
• fix/BETTER-bsync-file
• chore/helm-celery-env
• build/django-3.0
• refactor/selection-tool-url
• 2693-feature/bsync_support_v2
• refactor/better-property-types
• 2755-feat/add_better_link
• 2764-fix/bsync-file-creation
• feat/better-batch-analysis
• 2759-feat/render-better-html
• 2757-refactor/make-error-messages-user-readable
• feat/better-update-property-results
• feat/2753-allow-all-meter-types
• 2.9.5-oep
• 2777-docs/update-meter-reading-model
• feat/better-portfolio-analysis
• 2696-fix/resourceuse_with_no_energyresource
• feat/org-better-token
• 2786-fix/sqft-encoding
• feat/2511-notes-modal
• refactor/better-saved-results
• chore/fix-ci-chrome
• fix/content-disposition
• 2696-fix/resourceuse_with_no_energyresource_2
• feat/column_settings
• 1962-refactor/add_icons_to_upload_modal
• feat/general-better-integration-tweaks
• refactor/bsync-skipped-meters
• fix/check-meters-tab
• fix/better-edge-cases
• 2739-feat/add_eui_analysis
• 2818-fix/bad-display
• 2790-fix/inventory-list-col-profile
• fix/placeholder
• refactor/bsync-AT-meter-import
• refactor/building-meter-link
• refactor/round-better-results
• refactor/auto-start-analysis-param
• feat/auto-poll-analyses
• refactor/BETTER-IP-units
• 2740-feat/property_analyes_results
• 2794-fix/derived-col-request
• develop-revert
• 179d-endpoint-test-fix
• AH/develop

Build # 8006

Build Type

Pull #2141

travis-ci

Committed by web-flow

Commit Message

Revert "Chore/merge bricr dev"

Pull Request Pull Request #2141: Revert "Chore/merge bricr dev"

Run Details

17 of 17 new or added lines in 4 files covered. (100.0%)

10146 of 13095 relevant lines covered (77.48%)

0.77 hits per line