Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions pages/about-us.rst
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,15 @@ It's Nice To meet you
</div>
<div class="col-lg-5">
</div></div><div class="col-lg-7">
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d44743.69551272658!2d-73.6064564127952!3d45.50039571105371!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4cc9198ce22ed24d%3A0x733df471f5d54536!2sPavillons+Pierre-Lassonde+et+Claudette+McKay-Lassonde%2C+2500+Chemin+de+Polytechnique!5e0!3m2!1sen!2s!4v1402500602803" width="100%" height="350" frameborder="0" style="border:0"></iframe>
<!--iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d44743.69551272658!2d-73.6064564127952!3d45.50039571105371!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4cc9198ce22ed24d%3A0x733df471f5d54536!2sPavillons+Pierre-Lassonde+et+Claudette+McKay-Lassonde%2C+2500+Chemin+de+Polytechnique!5e0!3m2!1sen!2s!4v1402500602803" width="100%" height="350" frameborder="0" style="border:0"></iframe-->
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d699.1126309058778!2d-73.61642287137738!3d45.50100869818461!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x4cc919f308df50f9%3A0x1c5cdca60001c62e!2sUdeM%20%E2%80%93%20Andr%C3%A9-Aisenstadt%20Pavillon!5e0!3m2!1sen!2sca!4v1758227393629!5m2!1sen!2sca" width="100%" height="350" frameborder="0" style="border:0"></iframe>
</div><div class="col-lg-5"><img src="/images/poly.jpg" width="100%"/>
<img class="pull-right" src="/images/mistlogo.png" width="40%" style="margin-top: 0px;"/>
<h3>MIST Lab</h3>
<h4>Polytechnique Montreal</h4>
<p>2500 chemin de Polytechnique.<br>
Montreal, QC, Canada, H3T 1J4<br>
<p>André-Aisenstadt Pavillon<br>
2920 Chemin de la Tour<br>
Montreal, QC, Canada, H3T 1N8<br>
</p>
<p><i class="fa fa-phone"></i> <abbr title="Phone">P</abbr>: (514) 340-4711 x2370</p>
<p><i class="fa fa-envelope-o"></i> <abbr title="Email">E</abbr>: <a href="mailto:info@mistlab.ca">info@mistlab.ca</a></p>
Expand Down
1 change: 1 addition & 0 deletions people/dvielfaure/person.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Tagline=Work hard and have fun doing it
Image=/people/dvielfaure/david.jpg
Facebook=https://www.facebook.com/david.vielfaure
Linkedin=https://www.linkedin.com/in/david-vielfaure-a0106a136/
Alumnus=True
1 change: 1 addition & 0 deletions people/dwang/person.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ Occupation=Master student
Tagline=have you ever heard about otaku?
Image=/people/dwang/dong.jpg
Facebook=https://www.facebook.com/profile.php?id=100026506446879
Alumnus=True
1 change: 1 addition & 0 deletions people/dwenqiang/person.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ Occupation=PhD Student
Tagline=Robots will be part of our lives. My job is to make it comes a little faster.
Image=/people/dwenqiang/dwenqiang.jpg
Facebook=https://www.facebook.com/snow.wenqiang.du
Alumnus=True
1 change: 1 addition & 0 deletions people/emarjani/person.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ Occupation=PhD Student
Tagline=A soccer player who made soccer playing robots.
Image=/people/emarjani/ehsan.jpg
Linkedin=https://www.linkedin.com/in/seyed-ehsan-marjani-bajestani/
Alumnus=True
1 change: 1 addition & 0 deletions people/fwu/person.ini
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,4 @@ Name=Fang Wu
Occupation=Postdoctoral fellow
Tagline=I am large. I contain multitudes.
Image=/people/fwu/fang.jpg
Alumnus=True
4 changes: 2 additions & 2 deletions people/hfouad/person.ini
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
[Person]
Name=Hassan Fouad
Occupation=PhD Student
Occupation=Postdoctoral Fellow
Tagline=Exploring ...
Image=/people/hfouad/hassan.jpg
Image=/people/hfouad/hassan.jpg
1 change: 1 addition & 0 deletions people/mkaufmann/person.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,4 @@ Image=/people/mkaufmann/mkaufmann.png
Linkedin=http://www.linkedin.com/in/kaufmann-space/
Twitter=https://twitter.com/MaceSpaceNerd
Web=http://www.kaufmann.space
Alumnus=True
1 change: 1 addition & 0 deletions people/nvalench/person.ini
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ Occupation=Master student
Tagline=Real Time and Embedding Systems engineer
Image=/people/nvalench/nvalench.jpg
Linkedin=https://www.linkedin.com/in/nicolas-valenchon-254b7914a
Alumnus=True
2 changes: 1 addition & 1 deletion people/plajoie/person.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Person]
Name=Pierre-Yves Lajoie
Occupation=PhD Student
Occupation=Assistant Professor
Tagline=Social progress will be through science
Image=/people/plajoie/pierre-yves_lajoie.jpg
Linkedin=https://www.linkedin.com/in/pierre-yves-lajoie-4aaab863/
1 change: 1 addition & 0 deletions people/rdeazambuja/person.ini
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ Tagline=I am a believer and a doer ;)
Image=/people/rdeazambuja/rdeazambuja.jpg
Website=https://ricardodeazambuja.com/
Linkedin=https://www.linkedin.com/in/ricardodeazambuja/
Alumnus=True
2 changes: 1 addition & 1 deletion people/vvaradharajan/person.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Person]
Name=Vivek Shankar Varadharajan
Occupation=PhD Student
Occupation=Postdoctoral Fellow
Tagline=I trust in my hard work to achive the impossible.
Image=/people/vvaradharajan/vivek.jpg
Facebook=https://www.facebook.com/robovivek
Expand Down
2 changes: 1 addition & 1 deletion people/ybouteiller/person.ini
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[Person]
Name=Yann Bouteiller
Occupation=Master Student
Occupation=Research Associate
Tagline=Machine Learning, Computer Science and Microelectronics engineer
Image=/people/ybouteiller/yann.jpg
Facebook=https://www.facebook.com/bouteiller.yann
Expand Down