summaryrefslogtreecommitdiff
path: root/templates/chimere/blocks
AgeCommit message (Collapse)Author
2016-06-04Merge branch 'saclay-v2.2' into saclay-mobile-v2.2Étienne Loks
Conflicts: static/saclay/css/saclay.css static/saclay/css/styles.css templates/chimere/main_map.html
2016-06-04Merge branch 'saclay' into saclay-mobilesaclay-mobileÉtienne Loks
Conflicts: static/saclay/css/saclay.css static/saclay/css/styles.css templates/chimere/base.html templates/chimere/detail.html templates/chimere/main_map.html
2016-06-04Version mobileÉtienne Loks
2016-04-13MAJÉtienne Loks
2016-04-13Fix page d'accueilÉtienne Loks
2016-04-09Recherche sur le message d'accueilÉtienne Loks
2015-09-28Merge branch 'saclay' into saclay-v2.2Étienne Loks
Conflicts: templates/chimere/detail.html
2015-09-28retrait du rss sur le détailÉtienne Loks
2015-09-25Merge branch 'master-v2.2' into saclay-v2.2Étienne Loks
Conflicts: static/saclay/css/styles.css templates/chimere/detail.html
2015-09-25Search: html and JS integration of search moduleÉtienne Loks
2015-08-13Afficher : en partir, y aller, etc sur la carte simpleÉtienne Loks
2015-07-30Ajout d'un JSON mettant en valeur les limitesÉtienne Loks
2015-07-13Merge branch 'master' into saclayÉtienne Loks
2015-07-13Don't hide share linksÉtienne Loks
2015-06-16Merge branch 'master-v2.2' into saclay-v2.2Étienne Loks
Conflicts: templates/chimere/blocks/map.html
2015-06-16Search: html and JS integration of search moduleÉtienne Loks
2015-05-31Merge branch 'master' into saclayÉtienne Loks
2015-05-31Corrections diverses de mise en formeÉtienne Loks
2015-05-13Merge branch 'saclay' of ↵Étienne Loks
ssh://git.proxience.com/home/proxience/git/chimere_saclay into saclay
2015-05-13Correction du scroll au chargement de la pageÉtienne Loks
2015-05-02Correction lien CC erronéValérie-Emma Leroux
2015-05-01Revert zoom levelÉtienne Loks
2015-05-01Ajustement du niveau de zoomÉtienne Loks
2015-05-01Merge branch 'master' into saclayÉtienne Loks
2015-05-01Permettre de zoomer de un niveau plus hautÉtienne Loks
2015-02-20Merge branch 'saclay' of ↵Étienne Loks
ssh://lysithea.proxience.net/home/proxience/git/chimere_saclay into saclay
2015-02-20Merge branch 'master' into saclayÉtienne Loks
2015-02-20Change JS transport and route management to be available on startupÉtienne Loks
2014-08-01Merge branch 'saclay' of ↵Étienne Loks
ssh://kubo.niadomo.net/home/etienne/git/chimere_saclay into saclay
2014-08-01Merge branch 'master' into saclayÉtienne Loks
2014-07-29Change submited message with appropriate contact_emailÉtienne Loks
2014-04-10Merge branch 'saclay' of ↵Étienne Loks
ssh://kubo.niadomo.net/home/etienne/git/chimere_saclay into saclay Conflicts: templates/chimere/blocks/map.html
2014-04-10Fix simple view layoutÉtienne Loks
2014-04-10Merge branch 'saclay' of ↵Étienne Loks
ssh://kubo.niadomo.net/home/etienne/git/chimere_saclay into saclay
2014-04-10Merge branch 'master' into saclayÉtienne Loks
2014-04-10Show a message when no news is availableÉtienne Loks
2013-11-29Template map: Fix iOS notificationsÉtienne Loks
2013-11-29Template map: iOS notificationsÉtienne Loks
2013-10-31Merge branch 'v2.1' into saclayÉtienne Loks
2013-10-31Add cluster list and enable clustering optionÉtienne Loks
2013-10-25Merge branch 'v2.1' into saclayÉtienne Loks
2013-10-25Fix template and settings for mobileÉtienne Loks
2013-09-23Re-adapt welcomeÉtienne Loks
2013-09-23Cleanup welcome messageÉtienne Loks
2013-09-16Allow manual edition of routesÉtienne Loks
2013-03-18Simplify welcome messageÉtienne Loks
2012-11-14Template: Fix share network duplicate - deactivate temporaly the helpÉtienne Loks
2012-11-14JS: visualy check default categoriesÉtienne Loks
2012-11-14Hide welcome message when GET attribute are availableÉtienne Loks
2012-11-14Template: change emailÉtienne Loks