Commit graph

195 commits

Author SHA1 Message Date
Qwann
0741d330d9 small i18n fixes 2017-05-16 20:20:38 +02:00
Martin Pepin
ba6bff5ec4 Merge branch 'qwann/move_user' into 'master'
Qwann/move user

See merge request !8
2017-05-16 19:13:49 +02:00
Martin Pépin
e64c3d0b37 Setup a production-like environment in vagrant
- We already use Daphne and channels to prepare the future use of
  websockets.
- The app is served behind an nginx reverse-proxy
- The services we need are managed by systemctl

The production-like running instance of GestionÉvénementiel can be
accessed on localhost:8080 outside vagrant.
2017-05-16 16:13:31 +01:00
Martin Pépin
981c5cade5 Use the Debian Stretch box in Vagrant 2017-05-16 11:53:47 +01:00
Martin Pépin
0cfbf58cdb Upgrade to Django 1.11 2017-05-16 11:53:43 +01:00
Qwann
1df1c20998 Merge branch 'qwann/move_user' into qwann/models/lang_clean 2017-05-09 23:02:00 +02:00
Qwann
e5bfb0bd0e Merge branch 'master' into qwann/move_user 2017-05-09 23:01:21 +02:00
Qwann
3ba5f894b8 hygiène + small fixes 2017-05-09 22:56:20 +02:00
Qwann
609d743154 fixing shared url 2017-05-09 22:39:45 +02:00
Qwann
d168c8c8e6 translators added 2017-04-27 02:12:41 +02:00
Martin Pepin
01d8f2bb74 Merge branch 'qwann/views/shared' into 'master'
Qwann/views/shared

See merge request !7
2017-04-26 21:37:32 +02:00
Martin Pépin
704cd3e0fc PEP8 2017-04-26 20:36:22 +01:00
Qwann
6e733492ac Merge branch 'qwann/views/shared' into qwann/move_user 2017-04-26 19:02:41 +02:00
Qwann
7a4a836d6e small fixes 2017-04-26 04:08:25 +02:00
Martin Pepin
eb2613fc7c Merge branch 'qwann/html/user' into 'master'
Qwann/html/user

See merge request !6
2017-04-25 21:48:33 +02:00
Qwann
9f4ab91aad Merge branch 'qwann/views/shared' into qwann/move_user 2017-04-06 00:46:29 +02:00
Qwann
03b1fc31b8 Merge branch 'qwann/html/user' into qwann/views/shared 2017-04-05 18:52:45 +02:00
Qwann
3729f3005d removing shared from STATICFILES_DIRS 2017-04-05 18:49:11 +02:00
Martin Pepin
24a15e25c8 Merge branch 'qwann/html/base2' into 'master'
Qwann/html/base2

See merge request !5
2017-03-20 23:42:27 +01: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
f47608d246 Merge branch 'qwann/html/base2' into qwann/html/user 2017-03-05 19:12:56 +01:00
Qwann
be1a89a467 small fixes 2017-03-05 19:10:19 +01:00
Qwann
dd2f4d650f Merge branch 'qwann/views/shared' into qwann/move_user 2017-03-05 13:28:19 +01:00
Qwann
a11b84a398 Merge branch 'qwann/html/user' into qwann/views/shared 2017-03-05 13:27:34 +01:00
Qwann
25a936e10a Merge branch 'qwann/html/base2' into qwann/html/user 2017-03-05 13:26:44 +01:00
Martin Pepin
bbb5123051 Merge branch 'models' into 'master'
Models

models et tests de event terminés

See merge request !3
2017-03-05 13:26:27 +01:00
Qwann
b40713be49 Merge branch 'models' into qwann/html/base2 2017-03-05 13:25:42 +01:00
Qwann
01014c68de test fixed 2017-03-05 13:25:04 +01:00
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