Commits · develop · cephil / CQHMWebApp · GitLab

07 Nov, 2017 4 commits
- Merge branch 'develop_peter' into 'develop' · 08f9fe1b
  Peter Zhai authored Nov 07, 2017
```
Changed embedding limit

See merge request !68
```
  08f9fe1b
- Changed embedding limit · fff729e5
  Peter Zhai authored Nov 07, 2017
  
  fff729e5
- Merge branch 'develop_peter' into 'develop' · 3d142d35
  Peter Zhai authored Nov 07, 2017
```
Develop peter

See merge request !65
```
  3d142d35
- Fixed merge conflict · 14e2d86e
  Peter Zhai authored Nov 07, 2017
  
  14e2d86e
22 Oct, 2017 1 commit
- Fixed element not having a initial Z index of 0 · 579ef5fa
  Peter Zhai authored Oct 22, 2017
  
  579ef5fa
23 Sep, 2017 3 commits
- Merge branch 'develop_peter' into 'develop' · b41832dc
  Garrett Hansen authored Sep 23, 2017
```
Develop peter

See merge request !61
```
  b41832dc
- Merge branch 'develop' into 'develop_peter' · 76af741e
  Garrett Hansen authored Sep 23, 2017
```
# Conflicts:
#   html/js/dataHandler.js
```
  76af741e
- Added the allowPopups image · 14def40a
  Garrett Hansen authored Sep 23, 2017
  
  14def40a
20 Sep, 2017 3 commits
- Reworked the authentication process · d57f70b2
  Garrett Hansen authored Sep 20, 2017
  
  d57f70b2
- *WIP* Adding authentication Page · f13e6fc5
  Peter Zhai authored Sep 20, 2017
  
  f13e6fc5
- Fixed issue causing the fly element to be calculated as off screen, and thus does not get added · 18c815b7
  Garrett Hansen authored Sep 20, 2017
  
  18c815b7
10 Sep, 2017 11 commits
- Merge branch 'develop_garrett' into 'develop' · bc5a9e05
  Garrett Hansen authored Sep 10, 2017
```
Develop garrett

See merge request !56
```
  bc5a9e05
- Added a 'getSupportedLanguages' function to the dataHandler.realTime · 0c4375a4
  Garrett Hansen authored Sep 10, 2017
  
  0c4375a4
- Bug Fix: The Variable type is now added to the addEventListener type handler · 7768dbcf
  Garrett Hansen authored Sep 10, 2017
  
  7768dbcf
- Updated devTools.js (again) · 1464e174
  Garrett Hansen authored Sep 10, 2017
  
  1464e174
- Updated devTools.js · 18f5fb4a
  Garrett Hansen authored Sep 10, 2017
  
  18f5fb4a
- Modified modelSelection to be able to handle multiple selection sets (for multi user) · b0f20dd6
  Garrett Hansen authored Sep 10, 2017
  
  b0f20dd6
- Cleaned up old commented code · 359deff2
  Garrett Hansen authored Sep 10, 2017
  
  359deff2
- Bug Fix: The DynamicVariable type is now added to the addEventListener type handler · aedc1c33
  Garrett Hansen authored Sep 10, 2017
  
  aedc1c33
- Merge branch 'develop' into 'develop_garrett' · 972a5e73
  Garrett Hansen authored Sep 10, 2017
```
Develop

See merge request !55
```
  972a5e73
- Merge branch 'develop_peter' into 'develop' · 34a650c3
  Garrett Hansen authored Sep 10, 2017
```
Develop peter

See merge request !54
```
  34a650c3
- Added variable element in agent palette · 13f9934f
  Peter Zhai authored Sep 10, 2017
  
  13f9934f
09 Sep, 2017 1 commit
- Allow multi line comment · b4ddaa22
  Peter Zhai authored Sep 09, 2017
  
  b4ddaa22
08 Sep, 2017 1 commit
- Added Comment Element · fdc38a6f
  Peter Zhai authored Sep 08, 2017
  
  fdc38a6f
03 Sep, 2017 9 commits
- Minor debug code cleanup · b9e452f8
  Peter Zhai authored Sep 03, 2017
  
  b9e452f8
- Migrated model to version 2 * Added a collaboratorSelections feild · 8f18979d
  Peter Zhai authored Sep 03, 2017
  
  8f18979d
- Migrated model to version 1 * Added a model version number to the model · c44c6a85
  Peter Zhai authored Sep 03, 2017
  
  c44c6a85
- Modified migration functionality to be synchronized (ensure correct migration order) · 5b8f2c7c
  Peter Zhai authored Sep 03, 2017
  
  5b8f2c7c
- Added functionality to migrate model versions · d1eda73c
  Peter Zhai authored Sep 03, 2017
  
  d1eda73c
- Added a function to the data handler to get the loaded model version number · babd8feb
  Garrett Hansen authored Sep 03, 2017
  
  babd8feb
- Fixed a bug caused by not checking if a model is loaded before trying to unload · c32d02af
  Garrett Hansen authored Sep 03, 2017
  
  c32d02af
- Fixed bug causing elements to become unembeded when reloading the model · cea5c3ab
  Garrett Hansen authored Sep 03, 2017
  
  cea5c3ab
- Cleaned up debug loggings · e89ab103
  Garrett Hansen authored Sep 03, 2017
  
  e89ab103
29 Aug, 2017 1 commit
- WIP * Added embed on load functionality, currently broken due to how jointjs unloads the model · a7cc6f5d
  Garrett Hansen authored Aug 29, 2017
  
  a7cc6f5d
28 Aug, 2017 6 commits
- Added logic for imageUrl storage and collaboration · 5255322b
  Garrett Hansen authored Aug 28, 2017
  
  5255322b
- Whitespace refactor · ef5911fa
  Garrett Hansen authored Aug 28, 2017
  
  ef5911fa
- Added a 'imageUrl' feild to the realtime model element structure · 5ea60ca7
  Garrett Hansen authored Aug 28, 2017
  
  5ea60ca7
- Added logic to disable/enable the image url input · 3beb56c2
  Garrett Hansen authored Aug 28, 2017
  
  3beb56c2
- Renamed the image link input to image url input · 87b719a1
  Garrett Hansen authored Aug 28, 2017
  
  87b719a1
- WIP * Working on functionality to change image · 5921ddaf
  Peter Zhai authored Aug 28, 2017
  
  5921ddaf