Commit graph

20 commits

Author SHA1 Message Date
Ludovic Stephan
270e31f12b adapt migrations and tests 2017-07-18 15:37:13 +02:00
Qwann
9c4e950593 Merge branch 'qwann/views/shared' into qwann/move_user 2017-03-05 19:13:54 +01:00
Qwann
afdc821c21 Merge branch 'qwann/html/user' into qwann/views/shared 2017-03-05 19:13:24 +01:00
Qwann
be1a89a467 small fixes 2017-03-05 19:10:19 +01:00
Qwann
c3180281a4 forgotten include 2017-02-21 21:20:43 +01:00
Qwann
79770b0b9c Merge branch 'qwann/views/shared' into qwann/move_user 2017-02-21 21:01:31 +01:00
Qwann
7f2f995efd wrong merge fixed 2017-02-21 21:01:05 +01:00
Qwann
0175db89bd Merge branch 'qwann/views/shared' into qwann/move_user 2017-02-21 20:50:32 +01:00
Qwann
1a7df9dedb Merge branch 'qwann/html/user' into qwann/views/shared 2017-02-21 20:46:35 +01:00
Qwann
fa7f046928 Merge branch 'models' into qwann/html/base2 2017-02-21 20:45:20 +01:00
Qwann
c7db0c10b6 include forgotten 2017-02-21 17:17:09 +01:00
Qwann
1f8339b4db renaming user into users 2017-02-21 16:56:34 +01:00
Qwann
886f71fb5c creating 'empty' home view 2017-02-21 15:32:03 +01:00
Qwann
b67a40bb51 Merge branch 'qwann/html/cheatsheets' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into qwann/html/cheatsheets 2017-02-18 20:15:31 +01:00
Qwann
cc2d423f46 debug toolbar 2017-02-18 18:28:11 +01:00
Qwann
4f73d3cc1a Merge branch 'models' into qwann/html/base 2017-02-18 01:47:51 +01:00
Qwann
87967dbad7 adding user model 2017-02-18 01:45:22 +01:00
Qwann
2433eb40c1 removing any user mention 2017-02-18 01:40:03 +01:00
Qwann
cd86ea2fd6 base : ça commence à ressembler un à truc (vaguement) 2017-02-18 01:10:30 +01:00
Qwann
c6d1fc2791 installation vagrant 2016-09-28 20:36:48 +02:00