AndelaOSP / art-dashboard

87%

develop: 87%

LAST BUILD ON BRANCH feat/view-office-blocks-by-super-admin

branch: feat/view-office-blocks-by-super-admin

CHANGE BRANCH

x

Reset

• feat/view-office-blocks-by-super-admin
• bg-accurate-assigned-assets-161053181
• bg-add-asset-failing-160110741
• bg-add-asset-validation-159519715
• bg-add-loading-icon-to-modals-159816854
• bg-always-display-table-159470729
• bg-asset-assignment-dropdown-selection-159958543
• bg-asset-page-refetching-data-once-accessed-160254384
• bg-assets-loading-spinner-161281468
• bg-category-and-location-cards-160140506
• bg-error-success-messages-161586888
• bg-filters-unapplied-after-pagination-162474348
• bg-filters-unapplied-after-pagination-162500589
• bg-fix-asset-assignment-162341806
• bg-fix-asset-detail-url-159958261
• bg-fix-asset-details-display-161644562
• bg-fix-asset-list-and-detail-display-159468670
• bg-fix-broken-icons-text-on-sidebar-158289377
• bg-fix-coveralls-script-#158106666
• bg-fix-failing-tests-158555645
• bg-fix-loader-component-159761352
• bg-fix-pagination-on-pages-159132708
• bg-fix-security-user-creation-163756068
• bg-fix-unresponsive-asset-assigning-buttons-GCP
• bg-irresponsive-user-page-buttons-163046252
• bg-navbar-reappears-160141349
• bg-prevent-fetching-asset-details-160253989
• bg-rename-asset-types-url-160232872
• bg-resize-buttons-163056089
• bg-subcategories-pagination-issue-158911251
• bg-use-uuid-for-asset-detail
• bg-users-should-see-errors-on-modal-159462759
• bg-validate-assign-asset-159556607
• bug-Fix-field-values-selection-for-modals-#159229841
• bug-add-model-number-#158862563
• bug/fix-filter-dropdown-issue-164040683
• ch-404-page-157997115
• ch-better-notfound-message-160505405
• ch-clean-up-pages-160192896
• ch-create-table-header-component-158697679
• ch-describe-folder-structure-160088642
• ch-firebase-auth-setting-158613660
• ch-fix-eslint-issue
• ch-implement-ci-cd-156802464
• ch-logout-inactive-user-159522791
• ch-modal-component-refactor
• ch-redirect-coverals-to-develop-#157929770
• ch-refactor-routing-160252137
• ch-remove-console-warnings-158288516
• ch-remove-login-css-file
• ch-set-production-env-159298579
• ch-table-cleanup-159467964
• ch-update-158354703
• ch-update-andela-centres-165785610
• ch-update-assets-endpoint-158820395
• ch-update-eslint-rules
• ch-user-workflow-doc-163723531
• chore-clean-up-hound-errors-159528177
• chore-indicate-active-filter
• commit-by-eunice
• develop
• feat/display-checkin-checkout-logs-163048333
• feat/edit-user-access-by-super-admin-165785568
• feat/enforce-lowercase-for-emails-162780351
• feat/list-asset-logs-163048333
• feature/get-office-sections-165343275
• feature/view-deparment-assets-165053196
• fix-allocations-pagination
• ft-166112943-admin-can-log-into-art
• ft-add-asset-category-157340063
• ft-add-asset-in-modal-158823025
• ft-add-asset-make-dropdown-157340066
• ft-add-asset-spec-groups-159022590
• ft-add-asset-type-157340065
• ft-add-centre-160507913
• ft-add-filter-users
• ft-add-security-user-157340077
• ft-add-sub-category-157340064
• ft-add_required_field_validation-157340077
• ft-admin-can-add-department
• ft-admin-can-add-office-block-##165148152
• ft-admin-can-see-all-users-158914606
• ft-admin-can-see-asset-allocation-history-159022593
• ft-admin-can-see-user-assigned-to-asset-162248110
• ft-admin-can-unassign-asset-159022597
• ft-admin-only-access-160192048
• ft-admin-only-access-v2-160192048
• ft-andela-centres-list-162374806
• ft-asset-filter-button-159521527
• ft-asset-import
• ft-asset-models-list-157340062
• ft-asset-specs-relevant-data-160197002
• ft-clear-relevant-dropdown-fields-158110055
• ft-clickable-asset-list-162248159
• ft-create-loader-158288747
• ft-display-asset-type-detail-158491245
• ft-display-asset-types-158491088
• ft-edit-location-162693818
• ft-export-asset-by-status-#164983578
• ft-filter-assets-by-model-numbers-159521695
• ft-filter-assets-by-serial-number-163556763
• ft-filter-users-160192338
• ft-filter-verified-unverified-assets-162780351
• ft-handle-edge-cases-on-file-import-163818577
• ft-hide-sidebar-on-smaller-screens-58242456
• ft-import-assets-160507913
• ft-initial-redesign-implementation-158914442
• ft-irresponsive-user-page-buttons-163046252
• ft-list-all-asset-specs-159022589
• ft-list-all-categories-157340058
• ft-mark-security-user-inactive-163018795
• ft-move-add-asset-to-page-159958736
• ft-print-asset-to-file-#163903861
• ft-react-dropzone
• ft-redesign-remaining-list-pages-159245473
• ft-redirect-on-clicking-andela-logo-159882244
• ft-refactor-analytics=page-159880517
• ft-remove-plus-icons-assets-list-159880567
• ft-restrict-admin-access-160192048
• ft-rows-per-page-159521563
• ft-token-util
• ft-update-paginated-endpoints-158767714
• ft-user-can-click-a-row-to-view-assetdetails-159469642
• ft-user-can-view-allocations-158492837
• ft-verified-unverified-assets-162078804
• ft-view-all-assets-158490475
• ft-view-asset-conditions-158492715
• ft-view-asset-makes-157340061
• ft-view-asset-notes-159022594
• ft-view-single-asset-158490835
• ft-view-sub-categories-157340059
• ft-view-user-details-160136598
• ft-view-user-feedback-158491860
• ignore-yarn-lock
• master
• release-notes
• sa-docs-chore
• sa-fix-create-asset
• sa-refactor
• sa-update-package-lock
• status-checks
• test-cache
• test-confirm
• tinker-with-headers
• tweak-release-note-generation

fix merge conflict