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

• cc94785fdf Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf Ludovic Stephan 2016-12-09 01:25:02 -0200
• 21cf783144 add special character encoding Ludovic Stephan 2016-12-09 01:05:30 -0200
• d05ed86c17 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/F2_invert Ludovic Stephan 2016-12-09 00:44:39 -0200
• 4453b504da Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/search_icon Ludovic Stephan 2016-12-09 00:44:07 -0200
• 3a68c6c9f1 add search button Ludovic Stephan 2016-12-09 00:43:23 -0200
• d972af6854 update help Ludovic Stephan 2016-12-09 00:33:18 -0200
• e725a10026 invert F2 and Shift+F2 Ludovic Stephan 2016-12-09 00:32:44 -0200
• 36edc334d4 add transfer information Ludovic Stephan 2016-12-09 00:26:25 -0200
• ac0356386a add css for transfers Ludovic Stephan 2016-12-09 00:26:07 -0200
• 92ec85dbbd Ajout d'un .distinct() dans la selection des articles liés à un supplier Hugo Manet 2016-12-07 21:35:27 +0100
• 202199cc18 Merge branch 'Aufinal/correction_negatifs' into 'k-fet' Aurélien Delobelle 2016-12-04 15:06:25 +0100
• 4fe17f3922 Merge branch 'Aufinal/capslock_indicator' into 'k-fet' Aurélien Delobelle 2016-12-04 14:42:45 +0100
• 6d666ec0aa Merge branch 'Aufinal/indication_raccourcis' into 'k-fet' Aurélien Delobelle 2016-12-04 14:09:45 +0100
• 2d1a9d8ecb Merge branch 'Kerl/fix_decorator' into 'master' Martin Pepin 2016-12-04 10:43:47 +0100
• 4da7689b16 Met à jour données hardcodées... Martin Pépin 2016-12-04 10:40:38 +0100
• 027bc2e94b Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique Ludovic Stephan 2016-12-04 00:22:46 -0200
• cbf1e234b8 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/indication_raccourcis Ludovic Stephan 2016-12-04 00:22:19 -0200
• 251d10a426 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/correction_negatifs Ludovic Stephan 2016-12-04 00:21:38 -0200
• d5877d083c Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/capslock_indicator Ludovic Stephan 2016-12-04 00:19:57 -0200
• a2dc92d799 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/arrondi_ukf Ludovic Stephan 2016-12-04 00:19:38 -0200
• f5ebe3f166 Merge branch 'master' into k-fet Aurélien Delobelle 2016-12-03 21:44:33 +0100
• 17f2202f0e Merge branch 'Aufinal/freeze_transferts' into 'k-fet' Aurélien Delobelle 2016-12-03 18:12:34 +0100
• dbf66d49f5 Merge branch 'Aufinal/fix_99' into k-fet Aurélien Delobelle 2016-12-03 17:29:20 +0100
• 65272450f8 change to Shift after consultation Ludovic Stephan 2016-12-02 00:24:49 -0200
• f747c0c389 print transfers (BROKEN) Ludovic Stephan 2016-12-02 00:17:03 -0200
• 5a354c61a0 fetch transfers as well Ludovic Stephan 2016-12-02 00:16:40 -0200
• a7f3b85b25 exclut #13 du négatif total Ludovic Stephan 2016-12-01 01:44:41 -0200
• 45cc7cfa33 correction négatif total Ludovic Stephan 2016-12-01 01:39:16 -0200
• 971848cb1b database lookups Ludovic Stephan 2016-12-01 01:29:28 -0200
• ab0ed097cf indication raccourcis Ludovic Stephan 2016-11-30 23:12:58 -0200
• ea1b3c71a3 Décorateur inutile Martin Pépin 2016-11-29 11:29:18 +0100
• a9f25374ff Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/clean_code Ludovic Stephan 2016-11-23 01:49:54 -0200
• 746f16f57d remove float Ludovic Stephan 2016-11-23 01:43:24 -0200
• 98886f422a replace round by floor Ludovic Stephan 2016-11-23 01:39:31 -0200
• 2196c7dce1 Merge branch 'Kerl/venv' into 'master' Martin Pepin 2016-11-21 01:28:26 +0100
• 4249524842 Typo vagrant -> ubuntu Martin Pépin 2016-11-21 01:26:56 +0100
• 34f06c4a29 Merge branch 'Kerl/nice_dates' into 'master' Basile Clement 2016-11-20 22:20:36 +0100
• 5a2fc9d1e5 Cesse d'utiliser des fichiers statiques custom Martin Pépin 2016-11-20 20:09:12 +0100
• 9a9ff69f55 Ajoute le jour en toutes lettres dans les dates Martin Pépin 2016-11-20 18:42:47 +0100
• d6dd7b346c Merge branch 'Elarnon/mail_bda' into 'master' Martin Pepin 2016-11-20 16:53:29 +0100
• debc10213e Typo + docstrings inutiles Martin Pépin 2016-11-20 16:52:07 +0100
• f93b095e0f Styling Martin Pépin 2016-11-20 16:39:26 +0100
• f741c70c72 revert settings_dev changes Ludovic Stephan 2016-11-17 22:44:43 -0200
• e31dadad10 détection et affichage capslock Ludovic Stephan 2016-11-17 22:35:33 -0200
• 6de2fa307b Merge branch 'master' into Kerl/venv Martin Pépin 2016-11-18 01:09:39 +0100
• 92b422697b rebase kfet Ludovic Stephan 2016-11-17 17:44:44 -0200
• 9960e7e37e rebase kfet Ludovic Stephan 2016-11-17 16:51:36 -0200
• 40f3cf60a0 code mort Ludovic Stephan 2016-11-14 13:00:21 -0200
• fa3ddd099f Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/clean_code Ludovic Stephan 2016-11-14 12:52:35 -0200
• b15dcba8c9 mail formatting Ludovic Stephan 2016-11-14 12:52:16 -0200
• a63269a4ce more coherent names Ludovic Stephan 2016-11-14 12:52:02 -0200
• dc1ed332df Merge branch 'Elarnon/json' into 'master' Martin Pepin 2016-11-14 06:48:08 +0100
• 297164aae0 Merge branch 'Elarnon/ci' into 'master' Martin Pepin 2016-11-14 06:41:27 +0100
• 4eea57c899 Merge branch 'Elarnon/urls' into 'master' Martin Pepin 2016-11-14 06:41:07 +0100
• 107079ce1f Fix pip version Martin Pépin 2016-11-14 06:39:55 +0100
• a5ee17d0b5 Lance les tests de gestioCOF sur gitlab-ci Basile Clement 2016-11-13 11:29:28 +0100
• 3c362014b0 Remplace simplejson par json de la bibliothèque standard Basile Clement 2016-11-13 12:22:48 +0100
• b60365ddd6 Merge branch 'Aufinal/fix_reinit_past' into 'master' Martin Pepin 2016-11-13 12:45:54 +0100
• 2a4af5fcf4 Merge branch 'Elarnon/do_resell' into 'master' Martin Pepin 2016-11-13 12:43:59 +0100
• 5efbce8f53 Merge branch 'Elarnon/spectacle_repr' into 'master' Martin Pepin 2016-11-13 12:43:18 +0100
• 790e73d7a4 fix messages revente_interested Ludovic Stephan 2016-11-12 23:45:14 -0200
• 1ba2766231 fix revente de reventes Ludovic Stephan 2016-11-12 22:45:52 -0200
• 13f282a289 Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/clean_code Ludovic Stephan 2016-11-12 21:48:03 -0200
• 03f7dff813 Garde la locale par defaut dans les management commands Basile Clement 2016-11-12 11:09:40 +0100
• 567c9a0a6d Meilleur affichage des dates Basile Clement 2016-11-08 10:24:17 +0100
• afab33f5a1 Supprime Spectacle.__repr__ Basile Clement 2016-11-08 10:57:40 +0100
• afed3479b0 Remplace le dernier email en dur par un template Basile Clement 2016-11-08 10:01:01 +0100
• 53a4413492 Déplace les gabarits d’email du bda dans un dossier spécifique Basile Clement 2016-11-08 09:53:54 +0100
• 1f1419c5f1 Supprime render_template Basile Clement 2016-11-08 07:34:19 +0100
• cce574a11b Supprime do_resell Basile Clement 2016-11-08 09:48:55 +0100
• 929672a2a9 check date admin Ludovic Stephan 2016-11-08 10:41:12 -0200
• a9a4bf6b4a Merge branch 'master' of https://git.eleves.ens.fr/cof-geek/gestioCOF into Aufinal/fix_reinit_past Ludovic Stephan 2016-11-08 10:28:59 -0200
• 76a88be4ef check date spectacle Ludovic Stephan 2016-11-08 10:28:00 -0200
• a63f1da2e1 Mise à jour de django_debug_toolbar Basile Clement 2016-11-06 19:44:05 +0100
• d77a4dde3e GestioCOF devrait fonctionner sur / aussi bien que sur /gestion Basile Clement 2016-11-06 01:36:10 +0100
• f2ceb88264 typo Martin Pépin 2016-11-06 19:28:47 +0100
• d1c6c2151a Ubuntu 16 Martin Pépin 2016-11-06 19:01:30 +0100
• 41b54cec9e Utilisation d'un virtualenv Martin Pépin 2016-11-06 15:39:50 +0100
• 0cca9f0861 Mise à jour de django_debug_toolbar Martin Pépin 2016-11-06 15:39:14 +0100
• a55d34380c Merge branch 'Elarnon/mail-revente-new' into 'master' Martin Pepin 2016-11-05 23:03:54 +0100
• 981ff48e3d Envoie un mail de confirmation lors d'une mise en vente Basile Clement 2016-11-05 22:35:46 +0100
• f1c87ab8ad Merge branch 'Elarnon/vevent-uid' into 'master' Martin Pepin 2016-11-05 22:12:25 +0100
• b40fc6204f Changements mineurs Martin Pépin 2016-11-05 21:59:49 +0100
• 68b85adc81 Merge branch 'Elarnon/revente-mail-losers' into 'master' Martin Pepin 2016-11-05 21:55:23 +0100
• 82689eed2e Merge branch 'Elarnon/upgrade-django-cas-ng' into 'master' Martin Pepin 2016-11-05 21:24:48 +0100
• 36e403bab3 Merge branch 'Elarnon/normalize-login' into 'master' Martin Pepin 2016-11-05 21:11:02 +0100
• ba2d90d906 [bda-revente] Envoie un mails aux perdants d'un tirage de revente Basile Clement 2016-11-05 20:04:25 +0100
• 9846ed201b Normalise les logins clipper venant du CAS Basile Clement 2016-11-05 18:31:40 +0100
• 34032c9a00 Utilise une version officielle de django-cas-ng Basile Clement 2016-11-05 18:25:35 +0100
• 6642f03720 Ajoute un UID aux VEVENTs du calendrier dynamique Basile Clement 2016-11-05 18:04:54 +0100
• 388f42b05f Merge branch 'Aufinal/reinit_admin' into 'master' Martin Pepin 2016-11-05 13:19:15 +0100
• 33545b028e Messages et docstrings Martin Pépin 2016-11-04 08:35:17 +0100
• b2973ed9ab Merge branch 'Aufinal/fix_transfer_button' into 'master' Martin Pepin 2016-10-29 12:55:14 +0200
• 249edb8d68 guillemets à value Ludovic Stephan 2016-10-28 17:52:16 -0200
• 8d1f599577 filter sold attributions Ludovic Stephan 2016-10-28 14:15:37 -0200
• e408437ab1 fix reinit Ludovic Stephan 2016-10-27 23:47:11 -0200
• 56a1f8e634 add transfer & reinit functions Ludovic Stephan 2016-10-27 23:46:57 -0200
• 5ebbf3f9b2 delete old BdA-Revente Ludovic Stephan 2016-10-27 13:05:59 -0200
• 0a5b488d75 cleaner shotgun cases Ludovic Stephan 2016-10-27 12:56:54 -0200
• 83f0328cc2 added security to mail_shotgun Ludovic Stephan 2016-10-27 12:38:14 -0200