Master (!43) · Merge requests · cephil / CQHMWebApp · GitLab

Snippets Groups Projects

Merged Peter Zhai requested to merge master into release 7 years ago

Aug 21, 2017
- Merge branch 'develop' into 'master' · 3b541127
  Peter Zhai authored 7 years ago
  
  Develop See merge request !42
  3b541127
- Merge branch 'develop_peter' into 'develop' · 1fb03fb0
  Peter Zhai authored 7 years ago
  
  Develop peter See merge request !41
  1fb03fb0
- Added Causal Connection Negative element in the System Dynamic Palette · 04d78359
  Peter Zhai authored 7 years ago
  
  04d78359
- Refined the Statechart Entry Point element and ajusted element layout on the palette · 9fad1554
  Peter Zhai authored 7 years ago
  
  9fad1554
Aug 20, 2017
- Merge branch 'develop' into 'develop_peter' · 9d5444f5
  Peter Zhai authored 7 years ago
  
  Develop See merge request !40
  9d5444f5
- Merge branch 'develop_garrett' into 'develop' · 2ea9a9c5
  Peter Zhai authored 7 years ago
  
  Develop garrett See merge request !39
  2ea9a9c5
- Reverted the 'shift clicked link' fix due to other bugs caused by the behaviour · 8e264897
  Garrett Hansen authored 7 years ago
  
  8e264897
- Created a StatechartEntryPoint2 element, using a link instead of a cell · 0d4f8976
  Garrett Hansen authored 7 years ago
  
  0d4f8976
- Merge branch 'develop' into 'develop_peter' · c8da4e40
  Peter Zhai authored 7 years ago
  
  Develop See merge request !38
  c8da4e40
- Merge branch 'develop' into 'develop_garrett' · 94773f74
  Peter Zhai authored 7 years ago
  
  Develop See merge request !37
  94773f74
- Merge branch 'develop_garrett' into 'develop' · d908a4ba
  Peter Zhai authored 7 years ago
  
  Fixed inability to move clicked link bug, also whitespace reformatting due to vim See merge request !36
  d908a4ba
- Merge branch 'develop_peter' into 'develop' · e57cceba
  Peter Zhai authored 7 years ago
  
  Develop peter See merge request !35
  e57cceba
- Added Agent element and mede it display at a larger scale · 0557b974
  Peter Zhai authored 7 years ago
  
  0557b974
- Fixed inability to move clicked link bug, also whitespace reformatting due to vim · 1e8b293f
  Garrett Hansen authored 7 years ago
  
  1e8b293f
- Set element's default label as their name and added a Agent element as a copy of State · 3580dc35
  Peter Zhai authored 7 years ago
  
  3580dc35
- Merge branch 'develop' into 'develop_peter' · fad6c996
  Garrett Hansen authored 7 years ago
  
  Develop See merge request !34
  fad6c996