summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-17Adapt forms to new APIÉtienne Loks
2016-10-17Manage new version of tinyMCEÉtienne Loks
2016-10-11Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2016-10-11Change locale file headerÉtienne Loks
2016-10-11Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2016-10-11Update french translationÉtienne Loks
2016-10-11Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2016-10-11Add step available in popupÉtienne Loks
2016-10-11Minor CSS fixÉtienne Loks
2016-10-11Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2016-10-11Add missing fontÉtienne Loks
2016-10-10Minor CSS fixÉtienne Loks
2016-10-10CSS fixÉtienne Loks
2016-10-10CSS fixÉtienne Loks
2016-10-10Small CSS 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-10Update french translationÉtienne Loks
2016-10-10Change default styleÉtienne Loks
2016-10-10Change default styleÉtienne Loks
2016-10-10Déplacement des images au bon endroitÉtienne Loks
2016-10-07Fix search layoutÉtienne Loks
2016-10-07CSS: fix searchÉtienne Loks
Conflicts: static/saclay/css/styles.css
2016-10-07CSS: fix searchÉtienne Loks
2016-10-05Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2016-10-05De-activate (temporary?) prettyPhotoÉtienne Loks
2016-10-04Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2016-10-04Simplify project layoutÉtienne Loks
2016-10-04Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
2016-10-04Fix imports for wsgiÉtienne Loks
2016-10-04Merge branch 'master-v3.0' into saclay-v3.0Étienne Loks
Conflicts: settings.py
2016-10-04Remove all specific configuration already managed by chimere mainÉtienne Loks
2016-10-04settings: add a simple LOGFILE_NAME parameterÉtienne Loks
2016-10-04settings: add a simple LOGFILE_NAME parameterÉtienne Loks
2016-10-03Adaptation CSS - déplacement de dossierÉ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-26Changement de logo du CG Essone (refs #3318)É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-09-19Merge branch 'saclay-v2.2' of git.iggdrasil.net:/srv/git/chimere_saclay into ↵Valérie-Emma Leroux
saclay-v2.2