manos/WWW
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of gitlab.com:delkappa/delkappa

Browse Source
This commit is contained in:
Manos Katsomallos 2017-11-04 18:10:36 +01:00
commit efae7f5aa7
2 changed files with 362 additions and 317 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
index.html
View File

@ -248,20 +248,7 @@
</div> <!-- End Education -->
<!-- Work
=============================================== -->
<div class="row work">
<div class="three columns header-col">
<h1><span>Experience</span></h1>
</div>
<div class="nine columns main-col">
<div class="row item">
<div class="twelve columns">
<<<<<<< HEAD
<h3>University of Paris-Seine</h3>
<p class="info">
Research &amp; Teaching Assistant<span>&bull;</span>
@ -275,6 +262,43 @@
<li>- Data Integration &amp; Warehouses</li>
</ul>
</p>
=======
<!-- Work
=============================================== -->
<div class="row work">
>>>>>>> e5205e9c7c96c05d23c73d325b12d82ed0d9973d
<div class="three columns header-col">
<h1><span>Experience</span></h1>
</div>
<div class="nine columns main-col">
<div class="row item">
<div class="twelve columns">
<<<<<<< HEAD
<h3>LET'S GO travel net</h3>
<p class="info">
IT Consultant<span>&bull;</span>
<em class="date">Oct 2015 - Sep 2016</em>
</p>
=======
<h3>University of Paris-Seine</h3>
<p class="info">
Research &amp; Teaching Assistant<span>&bull;</span>
<em class="date">Oct. 2016 - Present</em>
</p>
<p style="text-align: justify;">
<ul>
<li>Developing Applications for Mobile Devices</li>
<li>Advanced Databases</li>
<li>Web Services &amp; Service Oriented Architectures</li>
<li>Data Integration &amp; Warehouses</li>
</ul>
</p>
>>>>>>> e5205e9c7c96c05d23c73d325b12d82ed0d9973d
</div>
@ -287,12 +311,20 @@
<h3>LET'S GO travel net</h3>
<p class="info">
IT Consultant<span>&bull;</span>
<em class="date">Oct 2015 - Sep 2016</em>
<em class="date">Oct. 2015 - Sep. 2016</em>
</p>
<<<<<<< HEAD
<h3>CERN</h3>
<p class="info">
Intern<span>&bull;</span>
<em class="date">Jul - Sep 2015</em>
</p>
=======
<p style="text-align: justify;">
Design "Live Like Local", a collaborative cross-platform framework that facilitates the communication of citizens with local authorities. Let visitors discover how the locals live and allow businesses to offer unique experiences and maximize their profits.
</p>
>>>>>>> e5205e9c7c96c05d23c73d325b12d82ed0d9973d
</div>
@ -305,12 +337,26 @@
<h3>CERN</h3>
<p class="info">
Intern<span>&bull;</span>
<em class="date">Jul - Sep 2015</em>
<em class="date">Jul. - Sep. 2015</em>
</p>
<<<<<<< HEAD
<h3>University of Thessaly</h3>
<p class="info">
Graduate Assistant<span>&bull;</span>
<em class="date">Sep 2014 - Jun 2015</em>
</p>
<p style="text-align: justify;">
<ul>
<li>- Concurrent Programming</li>
<li>- System Programming</li>
</ul>
</p>
=======
<p style="text-align: justify;">
Assert with Google Test and further develop CernVM WebAPI, an infrastructure in C++ that enables launching computational jobs on volunteer, cluster and cloud nodes. Support with this technology "Virtual Atom Smasher", a CERN interactive educational game in JavaScript, and upgrade its UI.
</p>
>>>>>>> e5205e9c7c96c05d23c73d325b12d82ed0d9973d
</div>
@ -323,12 +369,12 @@
<h3>University of Thessaly</h3>
<p class="info">
Graduate Assistant<span>&bull;</span>
<em class="date">Sep 2014 - Jun 2015</em>
<em class="date">Sep. 2014 - May 2015</em>
</p>
<p style="text-align: justify;">
<ul>
<li>- Concurrent Programming</li>
<li>- System Programming</li>
<li>Concurrent Programming</li>
<li>System Programming</li>
</ul>
</p>

3
js/init.js
View File

@ -171,12 +171,11 @@ jQuery(document).ready(function($) {
$('#image-loader').fadeOut();
$('#message-warning').html(msg);
$('#message-warning').fadeIn();
}
grecaptcha.reset();
$('form#contactForm button.submit').prop('disabled', false);
}
}
});
return false;
});