Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: daktary-team/daktary
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: multibao/site
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Apr 8, 2016

  1. Merge branch 'master' into gh-pages

    pointbar committed Apr 8, 2016
    Copy the full SHA
    04c06b0 View commit details
  2. Update retourdev.md

    Langlois committed Apr 8, 2016
    Copy the full SHA
    04b70b1 View commit details

Commits on Apr 9, 2016

  1. Copy the full SHA
    8c5c480 View commit details
  2. Merge branch 'master' of github.com:multibao/site

    pointbar committed Apr 9, 2016
    Copy the full SHA
    7378031 View commit details
  3. Copy the full SHA
    04ea06c View commit details
  4. Merge branch 'master' into gh-pages

    pointbar committed Apr 9, 2016
    Copy the full SHA
    964312d View commit details

Commits on Apr 11, 2016

  1. Copy the full SHA
    42cc102 View commit details

Commits on Apr 13, 2016

  1. Copy the full SHA
    763ac7d View commit details
  2. Copy the full SHA
    b48cff3 View commit details
  3. Create CNAME

    Langlois committed Apr 13, 2016
    Copy the full SHA
    213467c View commit details
  4. Copy the full SHA
    1fe6266 View commit details
  5. Update CNAME

    Langlois committed Apr 13, 2016
    Copy the full SHA
    fc8feda View commit details

Commits on Apr 20, 2016

  1. Merge branch 'master' of github.com:multibao/site

    pointbar committed Apr 20, 2016
    Copy the full SHA
    d2aeffe View commit details
  2. Copy the full SHA
    c7a3899 View commit details
  3. CNAME

    pointbar committed Apr 20, 2016
    Copy the full SHA
    b4ede37 View commit details
  4. Version with templater

    pointbar committed Apr 20, 2016
    Copy the full SHA
    2921717 View commit details
  5. Copy the full SHA
    a9621da View commit details
  6. Update config.js

    Langlois committed Apr 20, 2016
    Copy the full SHA
    7b5635e View commit details

Commits on Apr 23, 2016

  1. Copy the full SHA
    75bc4bc View commit details
  2. Copy the full SHA
    b0a6e29 View commit details
  3. Copy the full SHA
    14b2fdd View commit details

Commits on May 6, 2016

  1. Copy the full SHA
    305151d View commit details
  2. Optimize

    pointbar committed May 6, 2016
    Copy the full SHA
    190d74a View commit details
  3. Optimize

    pointbar committed May 6, 2016
    Copy the full SHA
    1797955 View commit details
  4. Copy the full SHA
    e1687cd View commit details
  5. Version wit metadata for repo list

    pointbar committed May 6, 2016
    Copy the full SHA
    80b91cf View commit details
  6. Merge branch 'master' into gh-pages

    pointbar committed May 6, 2016
    Copy the full SHA
    6ed6ca1 View commit details
  7. Version wit metadata for repo list

    pointbar committed May 6, 2016
    Copy the full SHA
    6f77796 View commit details
  8. Merge branch 'master' into gh-pages

    pointbar committed May 6, 2016
    Copy the full SHA
    0912950 View commit details

Commits on May 7, 2016

  1. Copy the full SHA
    29ec6dd View commit details
  2. Merge branch 'master' into gh-pages

    pointbar committed May 7, 2016
    Copy the full SHA
    5e35397 View commit details
  3. Add metas to searchlist

    pointbar committed May 7, 2016
    Copy the full SHA
    ff9592a View commit details
  4. Copy the full SHA
    6c0522f View commit details
  5. Optimize

    pointbar committed May 7, 2016
    Copy the full SHA
    da24d79 View commit details
  6. Fix optimize

    pointbar committed May 7, 2016
    Copy the full SHA
    d229776 View commit details
  7. Fix optimize

    pointbar committed May 7, 2016
    Copy the full SHA
    292ac91 View commit details

Commits on May 8, 2016

  1. Add metas to lists

    pointbar committed May 8, 2016
    Copy the full SHA
    a0aaa95 View commit details

Commits on May 9, 2016

  1. Update README.md

    ajout métadatas
    Louise Berrotte committed May 9, 2016
    Copy the full SHA
    9c9bb92 View commit details

Commits on May 10, 2016

  1. Optimize

    pointbar committed May 10, 2016
    Copy the full SHA
    5cfe920 View commit details
  2. Merge branch 'master' of github.com:multibao/site

    pointbar committed May 10, 2016
    Copy the full SHA
    00f59fb View commit details

Commits on May 26, 2016

  1. Copy the full SHA
    8fc151e View commit details

Commits on Jun 18, 2016

  1. Copy the full SHA
    a40dfe5 View commit details
  2. Merge branch 'master' into gh-pages

    pointbar committed Jun 18, 2016
    Copy the full SHA
    6dfcac8 View commit details

Commits on Jun 19, 2016

  1. Copy the full SHA
    0b8f95a View commit details
  2. Change staging to prod

    pointbar committed Jun 19, 2016
    Copy the full SHA
    5ae7c53 View commit details
  3. optimize

    pointbar committed Jun 19, 2016
    Copy the full SHA
    bdde01d View commit details

Commits on Jun 20, 2016

  1. Copy the full SHA
    ba5111e View commit details
  2. Copy the full SHA
    9c36e4b View commit details

Commits on Jun 23, 2016

  1. Add Piwik

    pointbar committed Jun 23, 2016
    Copy the full SHA
    0f70911 View commit details
  2. Add Piwik to 404 and 503

    pointbar committed Jun 23, 2016
    Copy the full SHA
    2ef178b View commit details
Showing with 112 additions and 12 deletions.
  1. +15 −0 404.html
  2. +15 −0 503.html
  3. +6 −0 README.md
  4. +2 −2 config.js
  5. +2 −2 dist/dk.js
  6. +1 −1 dist/dk.min.js
  7. +68 −0 documentation/retourdev.md
  8. +3 −7 index.html
15 changes: 15 additions & 0 deletions 404.html
Original file line number Diff line number Diff line change
@@ -22,5 +22,20 @@ <h1>PROPHET LOST</h1>
</a>
</p>
</footer>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.multibao.org/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', 1]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//piwik.multibao.org/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
</body>
</html>
15 changes: 15 additions & 0 deletions 503.html
Original file line number Diff line number Diff line change
@@ -22,5 +22,20 @@ <h1>ALONE IN THE DARK</h1>
</a>
</p>
</footer>
<!-- Piwik -->
<script type="text/javascript">
var _paq = _paq || [];
_paq.push(['trackPageView']);
_paq.push(['enableLinkTracking']);
(function() {
var u="//piwik.multibao.org/";
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', 1]);
var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<noscript><p><img src="//piwik.multibao.org/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->
</body>
</html>
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@
---
title: Code opensource de multiBàO
description: Contient le code source de multiBàO, libre à vous de le réutiliser pour d'autres usages. A consulter sur GitHub.
image_url: https://github.com/multibao/contributions/blob/master/media/daktary.jpg?raw=true
---

# Daktary

## US en cours
4 changes: 2 additions & 2 deletions config.js
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ GH.OWNER = 'multibao'
GH.CREW = 'organisations'

var MULTIBAO = {}
MULTIBAO.UVP1 = 'Partager et enrichir vos pratiques d\'équipe'
MULTIBAO.UVP2 = 'Let\'s Do It Together'
MULTIBAO.UVP1 = 'Le carnet de bord des organisations novatrices'
MULTIBAO.UVP2 = 'Rédiger et partager vos explorations collaboratives'
MULTIBAO.BUTTON1 = 'Découvrir'
MULTIBAO.BUTTON2 = 'Espace contributeurs / bloggeurs'
4 changes: 2 additions & 2 deletions dist/dk.js
Original file line number Diff line number Diff line change
@@ -583,14 +583,14 @@ window.addEventListener('load', function () {
document.querySelector('#button-gh-search').addEventListener('click', function (evt) {
if (document.querySelector('#gh-search').value.length > 2) {
var userQuery = document.querySelector('#gh-search').value;
var apiUrl = new GithubUrl(router.params).toGhApiSearch(userQuery);
var apiUrl = new GithubUrl(router.params).toGithubApiSearch(userQuery);
router.go(apiUrl.replace('https://api.github.com/', ''));
}
});
document.querySelector('#gh-search').addEventListener('keypress', function (evt) {
if (evt.key === 'Enter' && evt.target.value.length > 2) {
var userQuery = evt.target.value;
var apiUrl = new GithubUrl(router.params).toGhApiSearch(userQuery);
var apiUrl = new GithubUrl(router.params).toGithubApiSearch(userQuery);
router.go(apiUrl.replace('https://api.github.com/', ''));
}
});
Loading