Skip to content

GitLab

Commit bfb64003 authored by Artemiy's avatar Artemiy
Browse files

Merge remote-tracking branch 'ocp/master' into article-tags

parents a5b85c5d 674aeb6e
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2205 additions and 20 deletions
src/content/assets/css/style.css
View file @ bfb64003
This diff is collapsed.
src/content/assets/img/LearnOCaml_MOOC.png 0 → 100644
View file @ bfb64003
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
src/content/assets/img/logo_altergo.jpg 0 → 100644
View file @ bfb64003
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
src/content/assets/img/logo_dune_gimp.png 0 → 100644
View file @ bfb64003
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
src/content/assets/img/logo_love_gimp.png 0 → 100644
View file @ bfb64003
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
src/content/assets/img/logo_tzscan.jpg 0 → 100644
View file @ bfb64003
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
src/content/assets/img/logo_tzscan_gimp.jpg 0 → 100644
View file @ bfb64003
File suppressed by a .gitattributes entry or the file's encoding is unsupported.
src/content/index.md
View file @ bfb64003
......@@ -39,46 +39,46 @@ We cater to very specific needs. For example, we can translate a “black box”
<br />
<div class="row">
<div class="col-lg-3">
<p><img src="assets/img/logo_opam.png"/></p>
<p><img class="img_products" src="assets/img/logo_opam.png"/></p>
<h3 align="center"><a href="https://opam.ocaml.org">opam</a></h3>
<p>A highly scalable package manager</p>
<p class="p_index_center">A highly scalable package manager</p>
</div>
<div class="col-lg-3">
<p><img src="assets/img/logo_ocaml.svg" width="150"/></p>
<p><img class="img_products" src="assets/img/logo_ocaml.svg" /></p>
<h3 align="center"><a href="https://ocaml-sf.org/learn-ocaml-public/#">Learn OCaml</a></h3>
<p>Exercise platform for teachers and learners around the world aiming to discover OCaml</p>
<p class="p_index_center">Exercise platform for teachers and learners around the world aiming to discover OCaml</p>
</div>
<div class="col-lg-3">
<p><img src="assets/img/logo_altergo.png" width="150"/></p>
<p><img class="img_products" src="assets/img/logo_altergo.png" /></p>
<h3 align="center"><a href="https://alt-ergo.ocamlpro.com/">Alt-Ergo</a></h3>
<p>An SMT solver for software verification</p>
<p class="p_index_center">An SMT solver for software verification</p>
</div>
<div class="col-lg-3">
<p><img src="assets/img/logo_dune.png"/></p>
<p><img class="img_products" src="assets/img/logo_dune_gimp.png"/></p>
<h3 align="center"><a href="https://dunscan.io/">DunScan</a></h3>
<p>The Dune network explorer</p>
<p class="p_index_center">The Dune network explorer</p>
</div>
</div>
<div class="row">
<div class="col-lg-3">
<p><img src="assets/img/logo_love.png"/></p>
<p><img class="img_products" src="assets/img/logo_love_gimp.png"/></p>
<h3 align="center"><a href="https://dune.network/docs/dune-node-next/love-doc/reference/love.htmlo/">LOVE</a></h3>
<p>A smart-contract language for the Dune Network blockchain</p>
<p class="p_index_center">A smart-contract language for the Dune Network blockchain</p>
</div>
<div class="col-lg-3">
<p><img src="assets/img/logo_tezos.svg" width="150"/></p>
<p><img class="img_products" src="assets/img/logo_tezos.svg" /></p>
<h3 align="center"><a href="https://en.wikipedia.org/wiki/Tezos">Tezos</a></h3>
<p>A blockchain with integrated governance</p>
<p class="p_index_center">A blockchain with integrated governance</p>
</div>
<div class="col-lg-3">
<p><img src="assets/img/logo_solidity.png" width="200"/></p>
<p><img class="img_products" src="assets/img/logo_solidity.png" /></p>
<h3 align="center"><a href="https://gitlab.com/o-labs/solidity-parser-ocaml">Solidity parser</a></h3>
<p>A Solidity Parser in OCaml with Menhir</p>
<p class="p_index_center">A Solidity Parser in OCaml with Menhir</p>
</div>
<div class="col-lg-3">
<p><img src="assets/img/logo_tzscan.png"/></p>
<p><img class="img_products" src="assets/img/logo_tzscan_gimp.jpg"/></p>
<h3 align="center"><a href="https://tzscan.io/">TZScan</a></h3>
<p>The Tezos network explorer</p>
<p class="p_index_center">The Tezos network explorer</p>
</div>
</div>
<br />
......@@ -189,7 +189,280 @@ We cater to very specific needs. For example, we can translate a “black box”
<br />
<br />
<!-- All the code for the timeline below has been taken from the following: https://www.bootdey.com/snippets/view/timeline-steps -->
<div class="container-fluid">
<div class="row">
<div id="timeline">
<div class="row timeline-movement timeline-movement-top">
<div class="timeline-badge timeline-future-movement">
<p>2011</p>
</div>
</div>
<div class="row timeline-movement">
<div class="timeline-badge center-left">
</div>
<div class="col-sm-6 timeline-item">
<div class="row">
<div class="col-sm-11">
<div class="timeline-panel credits anim animate fadeInLeft">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<li class="img-wraping"><a href="#"><img src="assets/img/logo_ocp_icon.svg"/></a></li>
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">April 1, 2011</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">OcamlPro is founded </span> </li>
<li><span class="causale">OCamlPro is founded to help spread the OCaml language in the industry. <br>
Fabrice le Fessant, a researcher and member of the French Inria Institute, founds OCamlPro to boost the development of OCaml and promote it in the industry.</span> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="row timeline-movement">
<div class="timeline-badge center-right">
</div>
<div class="offset-sm-6 col-sm-6 timeline-item">
<div class="row">
<div class="offset-sm-1 col-sm-11">
<div class="timeline-panel debits anim animate fadeInRight">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<li class="img-wraping"><a href="#"><img src="assets/img/logo_janestreet.svg"/></a></li>
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">May 1, 2011</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">Long-term collaboration with Jane Street on Ocaml tooling </span> </li>
<li><span class="causale">Jane Street supports the diffusion of Ocaml, and becomes OcamlPro's most important client.</span> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="row timeline-movement">
<div class="timeline-badge center-left">
</div>
<div class="col-sm-6 timeline-item">
<div class="row">
<div class="col-sm-11">
<div class="timeline-panel credits anim animate fadeInLeft">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<li class="img-wraping"><a href="#"><img src="assets/img/logo_typerex.png" class="img-responsive" alt="user-image" /></a></li>
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">February 28, 2012</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">OcamlPro contributes Open Source developer tools under the codename TypeRex! </span> </li>
<li><span class="causale">The TypeRex programming studio is a set of open source tools for developing applications in Ocaml.</span> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
<!--<div class="row timeline-movement timeline-movement-top">
<div class="timeline-badge timeline-future-movement">
<p>2017</p>
</div>
</div>-->
<div class="row timeline-movement">
<div class="timeline-badge center-right">
</div>
<div class="offset-sm-6 col-sm-6 timeline-item">
<div class="row">
<div class="offset-sm-1 col-sm-11">
<div class="timeline-panel debits anim animate fadeInRight">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<li class="img-wraping"><a href="#"><img src="assets/img/logo_opam.png" alt="user-image" /></a></li>
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">March 1, 2013</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">First official release of OPAM 1.0 </span> </li>
<li><span class="causale">The Ocaml Package Manager is officially released as OPAM 1.0. </span> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="row timeline-movement">
<div class="timeline-badge center-left">
</div>
<div class="col-sm-6 timeline-item">
<div class="row">
<div class="col-sm-11">
<div class="timeline-panel credits anim animate fadeInLeft">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<!--<li class="img-wraping"><a href="#"><img src="http://via.placeholder.com/250/000000" class="img-responsive" alt="user-image" /></a></li>-->
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">December 1, 2014</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">Release of the Flambda optimizing compiler </span> </li>
<li><span class="causale">The first Flambda is proposed into Ocaml by Pierre Chambart and Mark Shinwell in PR #132 - work funded by Jane Street. </span> </li>
<li><p><small class="text-muted"><i class="glyphicon glyphicon-time"></i> 11/01/2018, 13:05"</small></p> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="row timeline-movement">
<div class="timeline-badge center-right">
</div>
<div class="offset-sm-6 col-sm-6 timeline-item">
<div class="row">
<div class="offset-sm-1 col-sm-11">
<div class="timeline-panel debits anim animate fadeInRight">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<li class="img-wraping"><a href="#"><img src="assets/img/LearnOCaml_MOOC.png" alt="user-image" /></a></li>
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">July 1, 2015</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">Université Paris 7 appoints OcamlPro to implement the exercise platform of the Ocaml MOOC on France Université Numérique</span> </li>
<li><span class="causale">OCamlPro implements the first version of the exercise autocorrecting platform of the OCaml MOOC on France Université Numérique for Université Paris 7, based on TryOCaml, integrates to the OpenEDX/FUN and designs some of the exercices of the course, in close collaboration with Roberto Di Cosmo and Yann-Régis Gianas at Irill.</span> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="row timeline-movement">
<div class="timeline-badge center-left">
</div>
<div class="col-sm-6 timeline-item">
<div class="row">
<div class="col-sm-11">
<div class="timeline-panel credits anim animate fadeInLeft">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<li class="img-wraping"><a href="#"><img src="assets/img/logo_altergo.png" alt="user-image" /></a></li>
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">November 1, 2016</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">Alt-Ergo 1.30 release with experimental support for model generation </span> </li>
<li><span class="causale">Alt-Ergo is an automatic prover of mathematical formulas used behind software verification tools such as Frama-C, SPARK, Why3, Atelier-B and Caveat. </span> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="row timeline-movement">
<div class="timeline-badge center-right">
</div>
<div class="offset-sm-6 col-sm-6 timeline-item">
<div class="row">
<div class="offset-sm-1 col-sm-11">
<div class="timeline-panel debits anim animate fadeInRight">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<li class="img-wraping"><a href="#"><img src="assets/img/logo_tezos.svg" alt="user-image" /></a></li>
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">2017</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">OCamlPro successfully implements the Tezos crowdfunding platform</span> </li>
<li><span class="causale">OCamlPro delivers Tezos and its crowdfunding platform, complete with the TZscan and Liquidity tools.</span> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="row timeline-movement">
<div class="timeline-badge center-left">
</div>
<div class="col-sm-6 timeline-item">
<div class="row">
<div class="col-sm-11">
<div class="timeline-panel credits anim animate fadeInLeft">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<li class="img-wraping"><a href="#"><img src="assets/img/logo_fondation_ocaml.svg" alt="user-image" /></a></li>
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">April 1, 2018</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">OCamlPro supports Inria's Ocaml Software Foundation creation</span> </li>
<li><span class="causale">The OCaml Software Foundation is born at Inria !</span> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="row timeline-movement">
<div class="timeline-badge center-right">
</div>
<div class="offset-sm-6 col-sm-6 timeline-item">
<div class="row">
<div class="offset-sm-1 col-sm-11">
<div class="timeline-panel debits anim animate fadeInRight">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<li class="img-wraping"><a href="#"><img src="assets/img/logo_origin_labs.svg" alt="user-image" /></a></li>
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">May 27, 2019</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">New Company Origin Labs is created to lauch and maintain the Dune Network</span> </li>
<li><span class="causale">The Blockchain team at OCamlPro want to find new opportunities for their expertise and creates a new company, </span> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
<div class="row timeline-movement">
<div class="timeline-badge center-left">
</div>
<div class="col-sm-6 timeline-item">
<div class="row">
<div class="col-sm-11">
<div class="timeline-panel credits anim animate fadeInLeft">
<ul class="timeline-panel-ul">
<div class="lefting-wrap">
<li class="img-wraping"><a href="#"><img src="assets/img/logo_altergo.png" alt="user-image" /></a></li>
</div>
<div class="righting-wrap">
<li><a href="#" class="importo">February 14, 2020</a></li>
<li><span class="causale" style="color:#000; font-weight: 600;">Alt-Ergo Users' Club: MERCE (Mitsubishi Electric Research Centre in Europe) and Why3 join the Club</span> </li>
<li><span class="causale">The second annual meeting of the Alt-Ergo Users' Club was held in mid-February. These meetings are the perfect place to review each partner's needs regarding Alt-Ergo, discuss the roadmap for future Alt-Ergo developments and enhancements.</span> </li>
</div>
<div class="clear"></div>
</ul>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<!--
All the code for the timeline below has been taken from the following: https://www.bootdey.com/snippets/view/timeline-steps
<div class="row">
<div class="col">
<div class="timeline-steps aos-init aos-animate" data-aos="fade-up">
......@@ -266,5 +539,55 @@ We cater to very specific needs. For example, we can translate a “black box”
</div>
</div>
</div>
<!-- All the code for the timeline above has been taken from the following: https://www.bootdey.com/snippets/view/timeline-steps -->
All the code for the timeline above has been taken from the following: https://www.bootdey.com/snippets/view/timeline-steps -->
<script> /*Timeline Animation*/
/**********************Scroll Animation "START"************************************/
$(document).ready(function(){
var $animation_elements = $('.anim');
var $window = $(window);
function check_if_in_view() {
var window_height = $window.height();
var window_top_position = $window.scrollTop();
var window_bottom_position = (window_top_position + window_height);
$.each($animation_elements, function() {
var $element = $(this);
var element_height = $element.outerHeight();
var element_top_position = $element.offset().top;
var element_bottom_position = (element_top_position + element_height);
//check to see if this current container is within viewport
if ((element_bottom_position >= window_top_position) &&
(element_top_position <= window_bottom_position)) {
$element.addClass('animated');
} else {
$element.removeClass('animated');
}
});
}
$window.on('scroll resize', check_if_in_view);
$window.trigger('scroll');
});
/**********************Scroll Animation "END"************************************/
/**********************Change color of center aligned animated content small Circle "START"************************************/
$(document).ready(function(){
$(" .debits").hover(function(){
$(" .center-right").css("background-color", "#4997cd");
}, function(){
$(" .center-right").css("background-color", "#fff");
});
});
$(document).ready(function(){
$(".credits").hover(function(){
$(".center-left").css("background-color", "#4997cd");
}, function(){
$(".center-left").css("background-color", "#fff");
});
});
/**********************Change color of center aligned animated content small Circle "END"************************************/
</script>
src/content/template.html
View file @ bfb64003
......@@ -9,6 +9,7 @@
<link href="/assets/css/bootstrap.min.css" rel="stylesheet" />
<link href="/assets/css/prism.css" rel="stylesheet" />
<link href="/assets/css/style.css" rel="stylesheet">
<script src="//cdnjs.cloudflare.com/ajax/libs/jquery/3.2.1/jquery.min.js"></script>
</head>
<body>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment