Skip to content

118/Resolver conflitos e erros dos merge requests de refatoração

Douglas Castro requested to merge sige-2021-2/smi-front:development into development

Descrição

Foi realizado o merge das branchs de refatoração e a sincronização com a branch development.

Closes https://gitlab.com/lappis-unb/projects/SMI/smi-front/-/issues/118

MRs associados

  • 121: 43/refactor component barchart
  • 125: 63/refactor total cost filter
  • 127: 46/refactor dash event
  • 128: 66/Refactor dash bottom bar
  • 129: 67/Refactor dash campus tab
  • 130: 57/refactor-group-dialog
  • 131: fix-45/RefactorDashLast72hCard
  • 132: 44/refactDashLastMeasurementCard
  • 133: 111/refactor-ActiveBox
  • 134: 114/Refactor Header Component
  • 135: 44/refact-DashLastMeasurementCard
  • 136: 62/refactor-component-dash-charge-bar
  • 137: 59/refactor-component-dash-general-event-bar
Edited by Douglas Castro

Merge request reports