Qwann
37aa00e990
Merge branch 'qwann/html/user' into qwann/move_user
2017-02-21 21:22:47 +01:00
Qwann
8fcc198892
Merge branch 'qwann/html/user' into qwann/views/shared
2017-02-21 21:21:52 +01:00
Qwann
cf8085952f
Merge branch 'qwann/html/base2' into qwann/html/user
2017-02-21 21:21:24 +01:00
Qwann
c3180281a4
forgotten include
2017-02-21 21:20:43 +01:00
Qwann
c863fa30ce
Merge branch 'qwann/html/base2' into qwann/html/user
2017-02-21 21:19:06 +01:00
Qwann
524876a03c
Merge branch 'models' into qwann/html/base2
2017-02-21 21:18:11 +01:00
Qwann
e72969e99b
initial migrations
2017-02-21 21:16:50 +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
6d37019612
Merge branch 'qwann/html/base2' into qwann/html/user
2017-02-21 20:45:59 +01:00
Qwann
fa7f046928
Merge branch 'models' into qwann/html/base2
2017-02-21 20:45:20 +01:00
Qwann
5a38c67150
upgrading pip
2017-02-21 20:28:26 +01:00
Qwann
a41d2b99b2
regexp urls
2017-02-21 19:12:18 +01:00
Qwann
f33db473a5
typo + PEP8
2017-02-21 17:53:40 +01:00
Martin Pépin
e79503430e
Utilise une version à jour de Django
...
Les version 1.10.X sont des mises à jour de sécurité et des corrections
de bugs, elles sont complètement compatibles avec 1.10 et doivent être
appliquées.
2017-02-21 17:40:24 +01:00
Qwann
8055be4c20
fixes
2017-02-21 17:25:46 +01:00
Qwann
c7db0c10b6
include forgotten
2017-02-21 17:17:09 +01:00
Qwann
ff434bbe39
Merge branch 'qwann/views/shared' into qwann/move_user
2017-02-21 17:06:59 +01:00
Qwann
d7049631d4
addng forgotten template
...
cleaning `shared/template/`
2017-02-21 17:04:21 +01:00
Qwann
1f8339b4db
renaming user into users
2017-02-21 16:56:34 +01:00
Qwann
271fe8ecf1
defining default side nav
2017-02-21 16:27:29 +01:00
Qwann
cdf5fbb285
specifying home as... home in urls
2017-02-21 16:02:23 +01:00
Qwann
b042ec1478
Merge branch 'qwann/html/user' into qwann/views/shared
2017-02-21 15:40:11 +01:00
Qwann
886f71fb5c
creating 'empty' home view
2017-02-21 15:32:03 +01:00
Qwann
18354872ab
now main content is resizable
2017-02-21 14:51:42 +01:00
Qwann
2996924fe4
user urls included in global interface
2017-02-21 11:38:21 +01:00
Qwann
6be19a463c
now shared components are in an application
...
now var components are in shared
installing widget_tweaks
2017-02-21 11:09:10 +01:00
Qwann
d0620a6bf8
first modifs in user views
2017-02-20 18:42:37 +01:00
Qwann
840e9c2979
cleaning
2017-02-18 20:30:45 +01:00
Qwann
8c716c772a
removing cheatsheets
2017-02-18 20:20:43 +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
4030f89ada
cheatsheets :)
2017-02-18 16:58:40 +01:00
Qwann
b3e92c3039
fresh start : it looks good.
2017-02-18 16:56:56 +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
926bb66450
small fixes
2016-10-21 18:49:46 +02:00
Qwann
f3180c0b3e
small fixes
2016-10-17 20:06:00 +02:00
Qwann
895ae3df55
Merge branch 'models' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into models
2016-10-17 19:40:37 +02:00
Qwann
f06ae696e5
validator modified
2016-10-17 19:40:31 +02:00
Qwann
cc9fea5b14
Merge branch 'master' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into models
2016-10-16 17:12:26 +02:00
Qwann
855b3533dc
middlexare fix
2016-10-16 17:11:18 +02:00
Qwann
2a8b3ed395
Merge branch 'master' of git.eleves.ens.fr:cof-geek/GestionEvenementiel into models
2016-10-16 17:07:49 +02:00
Erkan Narmanli
8cfdc08e8f
Merge branch 'models_equipement' into 'models'
...
Models equipement
See merge request !4
2016-10-14 13:14:33 +02:00
Qwann
3c93b0fa23
models de equipment done
2016-10-14 13:02:25 +02:00
Qwann
6021cc5a33
middlexare fix
2016-10-14 13:00:51 +02:00
