summaryrefslogtreecommitdiff
path: root/templates/chimere/blocks
AgeCommit message (Collapse)Author
2017-03-27Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
Conflicts: static/saclay/css/styles.css templates/chimere/blocks/categories.html
2017-03-27JS: add check all subategory of a categoryÉtienne Loks
2017-03-20Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2017-03-20JS: fix current feature selectionÉtienne Loks
2017-03-16Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2017-03-16Minor: commentÉtienne Loks
2017-03-16Fix permalink when default categories are checkedÉtienne Loks
2017-02-15Triangles et couleur de fond des catégories maintenant en JSÉtienne Loks
Conflicts: static/saclay/css/saclay.css
2017-02-12Desactivation du welcomeÉtienne Loks
2017-02-12Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
Conflicts: static/saclay/css/styles.css static/saclay/js/interface.js templates/chimere/blocks/map.html
2017-02-12New layoutÉtienne Loks
2016-11-21Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
Conflicts: templates/chimere/blocks/share_bar.html
2016-11-20Improve share linksÉtienne Loks
2016-11-18Forcer le zoom minimum à 12Étienne Loks
2016-11-18Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2016-11-18Map template: cleaning old stuffÉtienne Loks
2016-11-18Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2016-11-18ol3: add extra map definition to templateÉtienne Loks
2016-11-18Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
Conflicts: templates/chimere/blocks/map.html
2016-11-18External JSON loadingÉtienne Loks
2016-11-17Rétablissement du message d'accueilÉtienne Loks
2016-11-14Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
Conflicts: templates/chimere/blocks/map.html
2016-11-14Update to new permalink managementÉtienne Loks
2016-11-09Adapt to new permalink managementÉtienne Loks
2016-10-18Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
Conflicts: static/saclay/js/interface.js
2016-10-18Edit: many improvments on style and layoutÉtienne Loks
2016-10-10CSS fixÉtienne Loks
2016-10-10CSS fixÉtienne Loks
2016-10-10Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
Conflicts: static/saclay/css/styles.css static/saclay/js/interface.js
2016-10-10Improve routing layout and managementÉtienne Loks
2016-10-03Mise en forme - on cache (temporairement) le message d'accueilÉtienne Loks
2016-10-03Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
Conflicts: saclay_static/saclay/css/styles.css saclay_static/saclay/js/interface.js settings.py templates/chimere/base.html templates/chimere/blocks/map.html templates/chimere/blocks/share_bar.html templates/chimere/blocks/welcome.html
2016-10-03Manage new popupÉtienne Loks
2016-10-03Django 1.8 / python 3 migration. Move static to a right path.Étienne Loks
2016-10-02Many adptation for the new versionmaster-v2.9Étienne Loks
2016-09-21Idem avec autres couleursValérie-Emma Leroux
2016-09-21CSS sale dans message d'accueil pour modif urgente et temporaireValérie-Emma Leroux
2016-09-19Bidouille message d'accueil pour éviter bidouille css risquéeValérie-Emma Leroux
2016-09-19Modification message d'accueil (hauteur fenêtre + url)Valérie-Emma Leroux
2016-09-19Modification hauteur fenêtre d'accueilValérie-Emma Leroux
2016-09-19Modification du message d'accueilValérie-Emma Leroux
2016-08-30Merge branch 'master-v2.2' into saclay-v2.2Étienne Loks
2016-08-30Default name value ' ' for multimedia filesmaster-v2.2É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
generated by cgit v1.2.3 (git 2.39.1) at 2025-11-22 14:50:00 +0000