Develop (!34) · Merge requests · cephil / CQHMWebApp · GitLab

Snippets Groups Projects

Merged Garrett Hansen requested to merge develop into develop_peter 7 years ago

Aug 20, 2017
- Merge branch 'develop_garrett' into 'develop' · 3e9b7d03
  Garrett Hansen authored 7 years ago
  
  Develop garrett See merge request !31
  3e9b7d03
- Added more space to the Model View for presentation · 446b3af3
  Garrett Hansen authored 7 years ago
  
  446b3af3
- Connected the size event listeners with the backend model · d03ed7e2
  Garrett Hansen authored 7 years ago
  
  d03ed7e2
- The width and height fields now change the jointjs cell, but not the realtime backend · 105b8924
  Garrett Hansen authored 7 years ago
  
  105b8924
- Refactored and simplified element details _updateSettingsPanel logic · d00f3a9b
  Garrett Hansen authored 7 years ago
  
  d00f3a9b
- Minor renamings · 977d4456
  Garrett Hansen authored 7 years ago
  
  977d4456
- Merge branch 'develop' into 'develop_garrett' · 1648f484
  Garrett Hansen authored 7 years ago
  
  Develop See merge request !30
  1648f484
- Merge branch 'develop_peter' into 'develop' · d53411bb
  Garrett Hansen authored 7 years ago
  
  Develop peter See merge request !29
  d53411bb
- Merge branch 'develop_garrett' into 'develop' · 907f7b6f
  Garrett Hansen authored 7 years ago
  
  Develop garrett See merge request !28
  907f7b6f
- Completely reworked the Flow model element · 232d80e6
  Garrett Hansen authored 7 years ago
  
  232d80e6
- Fixed a bug caused by StateTransitionFalse not being in one of the event handlers · 7c4d0405
  Garrett Hansen authored 7 years ago
  
  7c4d0405
- Merge branch 'develop' into 'develop_garrett' · 133ba461
  Garrett Hansen authored 7 years ago
  
  Develop See merge request !26
  133ba461