Commit graph

Select branches

Hide pull requests

Aufinal/alcoolémie

Aufinal/backbone_checkout

Aufinal/es6-js

Evarin/sitecof-rewrite-urls

Kerl/mail_error_handling

Kerl/supportBDS/registration

Manet/k-fet/fix/160

Production

aureplop/core-deploy_initial

aureplop/hooks_fix-pre-commit

aureplop/install-authens

aureplop/js_basket

aureplop/kfet-auth

aureplop/kfet-auth_cms

aureplop/kpsul_js_refactor

aureplop/restructuring

bclement/autocomplete-queryset

fix-shared-session

journal-de-caisse

kerl/authens

kerl/bds_export

kerl/bds_home

kerl/bds_registration

kerl/clickable_links

kerl/dumpkfet

kerl/factor_autocompletion_views

kerl/negatifs_handle_smtp_errors

kerl/sitecof_absolute_urls

luj/adhesions

master

mdebray/ajout_recherche_petits_cours

qwann/k-fet/graphs

supportBDS

tbastian/kfet-rgpd

thubrecht/bds-tests

thubrecht/daphne

thubrecht/export-ventes

thubrecht/pause-mail-auto

v0.1

v0.10

v0.11

v0.3

v0.3.1

v0.3.2

v0.3.3

v0.4

v0.4.1

v0.4.2

v0.5

v0.6

v0.7

v0.7.1

v0.7.2

v0.8

v0.9

Mono Color

• 27464aaa93 should have been in bda_shotgun Ludovic Stephan 2016-10-25 12:44:28 -0200
• 04c75036ad commentaire plus précis Ludovic Stephan 2016-10-24 14:44:57 -0200
• b15dc6d9dc Merge remote-tracking branch 'origin/master' into Aufinal/change_shotgun Ludovic Stephan 2016-10-24 14:38:35 -0200
• a29c73cb27 Merge branch 'Aufinal/date_mail' into 'master' Martin Pepin 2016-10-13 16:28:45 +0200
• 816e395032 Merge branch 'Aufinal/bda_shotgun' into 'master' Martin Pepin 2016-10-13 16:12:02 +0200
• cf68abc789 wrong url Ludovic Stephan 2016-10-13 16:02:52 +0200
• cde83025ee change urls for 1.10 Ludovic Stephan 2016-10-13 16:01:30 +0200
• 6c5a2124c4 scrap aborted modif Ludovic Stephan 2016-10-13 15:30:59 +0200
• b7a4ece939 Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_shotgun Ludovic Stephan 2016-10-13 12:08:41 +0200
• caadbc8efa Merge branch 'Aufinal/fix_bda_admin' into 'master' Martin Pepin 2016-10-11 15:01:57 +0200
• 36cd623105 Corrections des typos Martin Pépin 2016-10-11 14:59:30 +0200
• fdf1c65de4 date au format français Ludovic Stephan 2016-10-10 17:10:45 +0200
• 6d8008ff39 migration Ludovic Stephan 2016-10-10 16:56:40 +0200
• 4c6b33ccb4 change shotgun en booleanfield Ludovic Stephan 2016-10-10 16:56:31 +0200
• f032b6c5ec Merge branch 'Aufinal/select_all' into 'master' Martin Pepin 2016-10-09 19:08:17 +0200
• 546cd92d6d Ajoute bouton select all Ludovic Stephan 2016-10-08 20:07:15 +0200
• db65799f3d does not belong here Ludovic Stephan 2016-10-08 20:00:58 +0200
• b249d61c2d fix recherche dans spectaclerevente Ludovic Stephan 2016-10-07 23:49:55 +0200
• 9e9cf3145b Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_shotgun Ludovic Stephan 2016-10-07 14:06:47 +0200
• 173c5a840b fix links Ludovic Stephan 2016-10-06 18:51:19 +0200
• e267cb91ef Merge branch 'Aufinal/fix_revente_reinit' into 'master' Martin Pepin 2016-10-06 15:25:20 +0200
• ca175fdf50 remove other work Ludovic Stephan 2016-10-06 14:41:26 +0200
• de51f9b434 Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/fix_revente_reinit Ludovic Stephan 2016-10-06 14:38:16 +0200
• 7ec6d23987 fix reinit Ludovic Stephan 2016-10-06 14:26:47 +0200
• d1456d7c68 déplacement shotgun Ludovic Stephan 2016-10-06 13:46:18 +0200
• 0a85eaa0cf Hot fix Martin Pépin 2016-10-06 10:28:13 +0200
• fbc4158de7 Merge branch 'Kerl/settings_syntax' into 'master' Martin Pepin 2016-10-04 12:10:40 +0200
• 6ecf813456 Merge branch 'master' into Kerl/settings_syntax Martin Pépin 2016-10-04 12:00:50 +0200
• 4b1cfbcf2d Merge branch 'Kerl/mail_to_bda' into 'master' Martin Pepin 2016-10-03 22:08:09 +0200
• a49bb5a799 Typos Martin Pépin 2016-10-03 20:21:42 +0200
• dff0b3ffdd Corrections dans les mails de revente Martin Pépin 2016-10-03 20:06:33 +0200
• 5e848e4442 fix date mail revente Ludovic Stephan 2016-10-03 19:37:21 +0200
• f686c99239 ajoute boutons pour tout (dé)sélectionner Ludovic Stephan 2016-10-03 18:52:09 +0200
• 5499c22b36 Merge branch 'Aufinal/bda_revente' Martin Pépin 2016-10-03 16:48:22 +0200
• 7fbf0e4809 fix manage_reventes Ludovic Stephan 2016-10-03 16:47:22 +0200
• 60a11a8ba4 Changement mineur dans le mail Martin Pépin 2016-10-03 16:08:29 +0200
• 018f493b16 fix date writing Ludovic Stephan 2016-10-03 14:47:13 +0200
• 1a6b86703a Merge branch 'master' into Kerl/settings_syntax Martin Pépin 2016-10-03 01:58:55 +0200
• 1dad85882b Ajoute le BdA dans les destinataires des rappels Martin Pépin 2016-09-30 00:35:51 +0200
• d559549c06 Fix oubli auth backend kfet_genericteam user dans settings_dev Aurélien Delobelle 2016-09-29 23:17:42 +0200
• 7fccc81cdd Merge branch 'issue84' into 'k-fet' Martin Pepin 2016-09-29 23:04:09 +0200
• 8349388ab3 Fix avaiable actions on genericteam acount Aurélien Delobelle 2016-09-29 21:47:37 +0200
• f39e1a653e Ajout account pour compte générique Aurélien Delobelle 2016-09-29 21:36:17 +0200
• 2f920536dd Merge branch 'Aufinal/bda_revente' Fix Martin Pépin 2016-09-28 16:48:51 +0200
• ad0c398292 fix error 500 shotgun Ludovic Stephan 2016-09-28 16:47:46 +0200
• ea0f7a3f0a Petites modifs de 'Aufinal/bda_revente' Martin Pépin 2016-09-28 11:49:19 +0200
• 7abdccfbdb Meilleure gestion des données mails Martin Pépin 2016-09-27 17:57:53 +0200
• 284dc12b7c success message Ludovic Stephan 2016-09-27 17:35:29 +0200
• fcad789e77 Merge branch 'Aufinal/bda_revente' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_revente Ludovic Stephan 2016-09-27 17:00:30 +0200
• 103b2880f7 BdA Ludovic Stephan 2016-09-27 16:57:39 +0200
• 421368d2c9 Correctif sur le précédent merge Martin Pépin 2016-09-27 16:20:22 +0200
• a9d44aa16e Correction des noms dans la migration Martin Pépin 2016-09-27 16:19:23 +0200
• d8eb5786a8 Merge branch 'Aufinal/bda_revente' into 'master' Martin Pepin 2016-09-27 15:46:19 +0200
• 77511d8acd more coherent names Ludovic Stephan 2016-09-27 15:44:27 +0200
• 0f01c33267 Merge branch 'Aufinal/bda_revente' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_revente Ludovic Stephan 2016-09-26 20:44:49 +0200
• 4a8d17f354 change property Ludovic Stephan 2016-09-26 20:44:22 +0200
• bc4b06fc92 fix save Ludovic Stephan 2016-09-26 20:41:59 +0200
• 37b4a178a7 Merge branch 'Aufinal/bda_revente' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/bda_revente Martin Pépin 2016-09-26 16:03:41 +0200
• 3943c3ab9f PEP8 Martin Pépin 2016-09-26 16:03:33 +0200
• 7984eb132b Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/bda_revente Ludovic Stephan 2016-09-26 15:56:35 +0200
• 59b8f406b6 fix bug shotgun Ludovic Stephan 2016-09-26 15:53:58 +0200
• 15e755334d cron Ludovic Stephan 2016-09-26 15:31:09 +0200
• 76f6f23256 Merge branch 'k-fet' into 'master' Aurélien Delobelle 2016-09-25 23:53:37 +0200
• 6108d58594 Merge branch 'issue81' into 'k-fet' Aurélien Delobelle 2016-09-25 23:44:50 +0200
• 5d05b220fd Fix touche H sur K-Psul Aurélien Delobelle 2016-09-25 23:35:29 +0200
• 8a3f4b7431 template fixes Ludovic Stephan 2016-09-25 14:39:38 +0200
• bbfce33c3f corrects bug with bda-buy Ludovic Stephan 2016-09-25 14:39:18 +0200
• a5e6a8e635 fix message liste_revente Ludovic Stephan 2016-09-25 12:12:31 +0200
• 988479dce3 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF Martin Pépin 2016-09-24 21:47:02 +0200
• 3bf4e6ae06 Modif pour la production Martin Pépin 2016-09-24 19:34:36 +0200
• fdbe3ea9db Merge branch 'Kerl/autocomplete' into 'master' Martin Pepin 2016-09-24 20:09:42 +0200
• 68153652d0 Protection de la vue autocomplete Martin Pépin 2016-09-24 19:40:16 +0200
• 48d412aca6 Merge branch 'k-fet' Aurélien Delobelle 2016-09-24 19:36:35 +0200
• 54409fb85f Modif pour la production Martin Pépin 2016-09-24 19:34:36 +0200
• efd92e9967 Fix protection autocomplete Aurélien Delobelle 2016-09-24 19:31:50 +0200
• 32a5f476a9 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF Martin Pépin 2016-09-24 19:05:21 +0200
• bd3d67dd13 Merge branch 'Kerl/prefix_urls' Martin Pépin 2016-09-24 19:04:13 +0200
• 38bb59b004 Permet l'ajout d'un préfixe dans les urls Martin Pépin 2016-09-12 22:08:39 +0200
• a60e2ae1df Merge branch 'k-fet' into 'master' Martin Pepin 2016-09-24 18:56:59 +0200
• 3a777a7045 Merge branch 'issue63' into k-fet Aurélien Delobelle 2016-09-24 18:51:41 +0200
• 59dcb72542 K-Psul - Fix erreur 500 caisse inexistante Aurélien Delobelle 2016-09-24 18:49:40 +0200
• 05e48386a1 Ajustements, fix Martin Pépin 2016-09-24 18:44:35 +0200
• 7f8c825c2a Pour la prod! Aurélien Delobelle 2016-09-24 18:44:01 +0200
• 3ead35e171 clean Aurélien Delobelle 2016-09-24 18:27:40 +0200
• d89493856f Fix: inscriptions bda Martin Pépin 2016-09-24 17:34:15 +0200
• 1ce16f48f6 Annulation transferts Aurélien Delobelle 2016-09-24 14:18:26 +0200
• cf430b5d3b Merge branch 'Kerl/production_settings' into 'master' Martin Pepin 2016-09-23 22:20:15 +0200
• fc90ab1379 Merge branch 'issue73' into 'k-fet' Aurélien Delobelle 2016-09-23 01:47:28 +0200
• 4e2ae1cb54 Fix (théorique) autocomplétion sur mobile Aurélien Delobelle 2016-09-23 01:44:36 +0200
• 0af2bff1f7 Merge branch 'issue72' into 'k-fet' Aurélien Delobelle 2016-09-22 21:20:18 +0200
• 92903cd71f Merge branch 'issue71' into 'k-fet' Aurélien Delobelle 2016-09-22 21:18:02 +0200
• 1553b9d9ff Fix affichage balance réelle gestion négatifs Aurélien Delobelle 2016-09-22 21:06:04 +0200
• 0b618fa045 K-Psul - Sélection des articles Aurélien Delobelle 2016-09-22 17:59:51 +0200
• ac3c79daca Fix petits cours Martin Pépin 2016-09-22 14:01:01 +0200
• 81d1bc2750 migration Ludovic Stephan 2016-09-21 15:40:31 +0200
• 6b63f0f30f end Ludovic Stephan 2016-09-21 15:39:01 +0200
• 051a979a9b added cron management Ludovic Stephan 2016-09-21 15:30:41 +0200
• 8bd928e4c5 Merge branch 'Kerl/descriptions_spectacles' Martin Pépin 2016-09-21 14:02:31 +0200
• e0544a42e8 Version bien mieux du redimensionnement des images Hugo Roussille 2016-09-20 23:32:42 +0200
• ecef7b3957 Go to hell encoding Martin Pépin 2016-09-20 21:46:58 +0200