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

• 9aa4782d57 Move petits-cours forms in another file Martin Pépin 2017-02-05 17:10:51 +0100
• 81681ad0e5 Turn 2 functions into class/objects methods Martin Pépin 2017-02-05 17:07:58 +0100
• 2bc5f3d646 Style and PEP8 Martin Pépin 2017-02-05 13:49:01 +0100
• bb4e9dde4f End of py2 support Martin Pépin 2017-02-05 13:32:31 +0100
• b404c989ff pep8 Ludovic Stephan 2017-02-05 03:42:02 -0200
• 1d5e693045 ws for transfers Ludovic Stephan 2017-02-05 03:26:15 -0200
• 1ea334341b ws update for history and transfer pages Ludovic Stephan 2017-02-05 03:04:41 -0200
• f8aa67721c fix socket update Ludovic Stephan 2017-02-05 02:19:20 -0200
• 8895daff6a Merge branch 'Aufinal/transferts_historique' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/transferts_historique Ludovic Stephan 2017-02-04 23:22:54 -0200
• 1e5c55a540 update readme Martin Pépin 2017-02-04 11:57:58 +0100
• 5b0dc1a07f Merge branch 'fix/117' into 'k-fet' Martin Pepin 2017-02-04 11:23:30 +0100
• f274c1e978 Un seul message pour la liste des inscriptions Martin Pépin 2017-02-04 00:01:15 +0100
• 13da42b823 typo Martin Pépin 2017-02-03 23:41:33 +0100
• 54f09820bf Merge branch 'Kerl/messages' of https://git.eleves.ens.fr/cof-geek/GestioCOF into Kerl/messages Martin Pépin 2017-02-03 18:30:47 +0100
• 8c34e2f83f proper use of messages in petits cours Martin Pépin 2017-01-30 13:50:24 +0100
• fd42563f7f Proper use of messages in calendar subscription Martin Pépin 2017-01-30 13:46:16 +0100
• 51c0e2dabc proper use of messages in registration Martin Pépin 2017-01-30 13:36:51 +0100
• b7ecac3db6 Proper use of messages in profile edit Martin Pépin 2017-01-30 13:19:50 +0100
• 1fe1b94afc Proper use of messages in events Martin Pépin 2017-01-30 13:12:01 +0100
• b12b5c938f Proper use of messages in inscription-reventes Martin Pépin 2017-01-29 23:05:59 +0100
• efea92b5d2 Proper use of messages in places Martin Pépin 2017-01-29 22:49:32 +0100
• 91fff8a11e Proper use of messages in BdA inscription Martin Pépin 2017-01-29 17:13:01 +0100
• 0666b5288f Proper use of messages in survies Martin Pépin 2017-01-29 16:24:07 +0100
• d31b9f59ab Traitement des messages Martin Pépin 2017-01-28 19:46:56 +0100
• 45856ca872 update README Martin Pépin 2017-02-03 17:29:33 +0100
• ba88b94320 Fixes and cleanup Martin Pépin 2017-02-03 17:07:50 +0100
• 18b186929c Dev data loaded using a django admin command Martin Pépin 2017-01-30 23:13:32 +0100
• 1bf5352097 Merge branch 'Aufinal/fix_87' into 'k-fet' Aurélien Delobelle 2017-02-02 12:28:56 +0100
• d5bf249212 Merge branch 'qwann/k-fet/stock_update' into 'k-fet' Aurélien Delobelle 2017-02-02 12:24:54 +0100
• bc14205d29 fixing decimal issue2 Qwann 2017-02-01 19:32:18 +0100
• 47d7a3ec6e fixes #87 Ludovic Stephan 2017-01-31 16:35:52 -0200
• 863699bfb6 Merge branch 'qwann/k-fet/stock_update' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stock_update Qwann 2017-01-31 16:03:00 +0100
• 1275fdff99 fixes #127 fixing stock update Qwann 2017-01-31 15:55:38 +0100
• a400832c6d fixing stock update Qwann 2017-01-31 15:55:38 +0100
• cf4a3ec64b Traitement des messages Martin Pépin 2017-01-28 19:46:56 +0100
• ce9f717f06 WS : quand la K-Fêt est ouverte ? Qwann 2017-01-27 21:46:21 +0100
• ddf6343826 Merge branch 'qwann/k-fet/stats' into qwann/k-fet/home Qwann 2017-01-27 13:13:28 +0100
• df824a3a70 Merge branch 'k-fet' into qwann/k-fet/stats Qwann 2017-01-27 13:10:31 +0100
• 0ac1eaf414 fixing decimal_issue Qwann 2017-01-27 13:08:50 +0100
• 5cedabf5a8 Merge branch 'qwann/k-fet/stats' into qwann/k-fet/home Qwann 2017-01-27 12:15:47 +0100
• 2f1fe15be3 fixing decimal_issue merging Qwann 2017-01-27 12:08:18 +0100
• 5ee188e4df Merge branch 'qwann/k-fet/stats' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats Qwann 2017-01-27 11:56:39 +0100
• a13c40736c Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats Qwann 2017-01-27 11:54:50 +0100
• 7ab4e949d8 k-fet in gestiocof menu Qwann 2017-01-26 20:40:55 +0100
• aa1afccf1f adding argumement hidden to Article in order to avoid some articles to appear in the menu Qwann 2017-01-26 19:22:38 +0100
• 3ca38bd8e9 Carte done. Qwann 2017-01-26 17:19:42 +0100
• c2b74ea625 Merge branch 'Kerl/bda_models_update' into 'master' Martin Pepin 2017-01-25 23:58:23 +0100
• 75ff77c4ec Merge branch 'Aufinal/search_account' into 'k-fet' Martin Pepin 2017-01-25 23:58:08 +0100
• a63966b2f6 carte styling done Qwann 2017-01-25 23:41:16 +0100
• bd7f767953 Cleanup Martin Pépin 2017-01-25 23:23:53 +0100
• 9607fab046 future removed Qwann 2017-01-25 16:00:48 +0100
• 30cebac6e6 Merge branch 'hotfix/bda-static' Qwann 2017-01-24 20:39:14 +0100
• 045f3f58e5 Met inscription-formset àa la bonne place Martin Pépin 2017-01-24 20:34:53 +0100
• 6b95403318 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF Qwann 2017-01-24 20:05:34 +0100
• b52c0bf6c9 Merge branch 'Kerl/csv' Qwann 2017-01-24 20:03:33 +0100
• 0d1cece6db adding columns features Qwann 2017-01-24 19:56:58 +0100
• 939e0f32a2 Merge branch 'qwann/decimal_fixes' into 'k-fet' Martin Pepin 2017-01-24 19:49:33 +0100
• f48f6c57a7 Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats Qwann 2017-01-24 19:43:08 +0100
• 94f8705ea4 wrong merge fixed Qwann 2017-01-24 19:42:15 +0100
• df2a9bb1b3 factorising BalanceStat views Qwann 2017-01-24 16:54:02 +0100
• 947de3b638 wrong months in 'last months' stats Qwann 2017-01-20 21:21:51 +0100
• 61a7f2df1e sourcing get_thing in a js file Qwann 2017-01-20 21:05:22 +0100
• 232b293052 typos fixed Qwann 2017-01-20 20:27:24 +0100
• f8c49ae90c docstring instead of comments Qwann 2017-01-20 20:13:03 +0100
• e6854d7987 using strftime instead of a personnal function Qwann 2017-01-20 20:07:03 +0100
• de3db1405e Merge branch 'qwann/decimal_fixes' into qwann/k-fet/stats Qwann 2017-01-20 18:53:49 +0100
• fff7a2022b conflict solved Qwann 2017-01-20 18:45:28 +0100
• 8b4f7ad60c decimal cast for operation.amount Qwann 2017-01-20 18:34:45 +0100
• 7e5910e0b3 balance templatetag fixed Qwann 2017-01-20 18:10:49 +0100
• 1b0144691f No need for len of query Ludovic Stephan 2017-01-20 07:32:11 -0200
• 832dc0ce10 Search shortcut Ludovic Stephan 2017-01-19 22:54:11 -0200
• 016989c4de search results css Ludovic Stephan 2017-01-19 22:53:58 -0200
• e7956f3b62 Account search w/ autocomplete Ludovic Stephan 2017-01-19 12:36:40 -0200
• eff37f6c89 plain text highlighting Ludovic Stephan 2017-01-19 01:42:00 -0200
• 88aec52141 PEP8 + typo Ludovic Stephan 2017-01-19 01:06:09 -0200
• bdbb252a05 Revert "first fixes" Qwann 2017-01-17 17:16:53 +0100
• d6e13dbd61 Merge branch 'k-fet' of git.eleves.ens.fr:cof-geek/gestioCOF into Aufinal/visibilite_stock Ludovic Stephan 2017-01-16 23:57:27 -0200
• 1ddd34d50e Merge branch 'qwann/k-fet/stats' of git.eleves.ens.fr:cof-geek/gestioCOF into qwann/k-fet/stats Qwann 2017-01-14 16:24:56 +0100
• a14f1db9a1 doc added for kfet new fixtures Qwann 2017-01-03 02:22:46 +0100
• 76db0c86a3 Add fixtures. Michele Orrù 2017-01-03 01:17:49 +0100
• 5877218af5 first fixes Qwann 2016-12-27 15:44:58 +0100
• 993b8ae87b Merge branch 'master' into Kerl/use_django_custommail Martin Pépin 2017-01-13 01:02:01 +0100
• 697511a884 Merge branch 'hotfix/urls' into 'master' Martin Pepin 2017-01-10 23:30:37 +0100
• cef40dff70 Typo et renommage Martin Pépin 2017-01-10 23:26:11 +0100
• 3e96c982f9 Fix urls in production Martin Pépin 2017-01-10 23:07:27 +0100
• fabd0949e2 correct imports Ludovic Stephan 2017-01-10 15:15:53 -0200
• 6315ddf6b8 move pwd change to method Ludovic Stephan 2017-01-10 12:58:35 -0200
• 5fa0618ad3 Message pour moldu Martin Pépin 2017-01-10 11:46:23 +0100
• 84f9b80f09 On ne met pas root dans la fixture users Martin Pépin 2017-01-09 16:41:49 +0100
• 540b6f38b8 Merge branch 'master' into Kerl/ldap Martin Pépin 2017-01-09 15:47:12 +0100
• 1b82b2300a Typo et suppression de la py2 compat Martin Pépin 2017-01-08 20:26:02 +0100
• 3f9f19ef8c Hotfix pour le JS absent Martin Pépin 2017-01-08 19:53:31 +0100
• 0e7fc99a09 Merge branch 'k-fet' into 'master' Martin Pepin 2017-01-07 17:42:01 +0100
• 703921a314 Supprime du code mort Martin Pépin 2017-01-07 17:36:18 +0100
• 7dc7d57a5e restrict to team even if malicious POST edit Ludovic Stephan 2017-01-07 13:57:54 -0200
• 6aa237c4bc Merge branch 'Kerl/fix_choices_count' into 'master' Martin Pepin 2017-01-07 16:49:21 +0100
• fcf76b4af8 can change own password (actually working now) Ludovic Stephan 2017-01-07 13:32:05 -0200
• 2a20beeb59 pep8 Ludovic Stephan 2017-01-07 13:28:53 -0200
• 1c5c1fe94d can change own password Ludovic Stephan 2017-01-07 12:47:43 -0200
• dc33160e0b Plus d'infos + pluralisation Martin Pépin 2017-01-07 13:13:12 +0100