Martin Pépin
3d22a1b029
Merge branch 'master' into test/views
2017-10-10 15:39:18 +02:00
Martin Pépin
528532cca7
Merge branch 'aureplop/fix-ci'
2017-10-10 15:35:22 +02:00
Martin Pépin
4d1cb3c2d7
Set password for redis in CI
2017-10-10 15:26:14 +02:00
Aurélien Delobelle
57a143e0e1
Merge branch 'PEI' into 'master'
...
Statut PEI + cotisation gratuite
See merge request !258
2017-10-06 11:06:44 +02:00
Martin Pépin
435e211b3d
Add a "PEI" status + "Gratis" subscription fees
2017-10-02 13:58:52 +02:00
Aurélien Delobelle
596868f5b6
plop
2017-09-30 03:03:48 +02:00
Martin Pepin
22413d861c
Merge branch 'aureplop/fix-attributions-admin' into 'master'
...
Fix attribution inlines of participant in admin
See merge request !255
2017-09-25 18:38:05 +02:00
Aurélien Delobelle
d18fb86a98
Fix attribution inlines of participant in admin
2017-09-25 18:26:54 +02:00
Aurélien Delobelle
11e8cb1be2
Merge branch 'bdaAdminHotfix' into 'master'
...
Hotfix : répare l'admin, le champ "given" n'était pas affiché quand il faut
See merge request !254
2017-09-25 15:01:28 +02:00
Martin Pépin
db512a97f6
In /admin: displays "given" when it's relevant
2017-09-25 14:22:46 +02:00
Martin Pepin
7d16001ee5
Merge branch 'aureplop/fix_kfet_perms' into 'master'
...
K-Fêt' groups edits don't remove non-kfet app permissions.
Closes #168
See merge request !252
2017-09-12 22:35:30 +02:00
Martin Pépin
1921f05eba
Move STATIC_ROOT in production
2017-09-12 09:22:54 +02:00
Martin Pépin
368ee3190f
Update CI: use postgres
2017-09-12 00:14:52 +02:00
Aurélien Delobelle
9e61887868
K-Fêt' groups edits don't remove non-kfet app permissions.
...
Fixes #168 .
2017-09-11 16:42:14 +02:00
Martin Pépin
faed7bff73
fix ?next=… on K-Fêt logout
2017-09-10 02:32:21 +02:00
Martin Pepin
f581279825
Merge branch 'aureplop/fix-kfet-navbar' into 'master'
...
Fix kfet navbar on small devices
See merge request !248
2017-09-10 02:12:49 +02:00
Martin Pépin
937a485704
Merge branch 'master' into Production
2017-09-09 22:03:32 +02:00
Martin Pépin
439f49c3ba
We ♥ hardcoding stuff…
2017-09-05 15:21:19 +02:00
Martin Pépin
35b352ac1d
Fix mistake introduced in 51f4bf3fb5
2017-09-04 14:50:12 +02:00
Martin Pépin
50432d969f
Update available promos for account creation
2017-09-04 13:25:45 +02:00
Martin Pépin
51f4bf3fb5
Clipper logins may be > 8 characters
2017-09-04 13:25:09 +02:00
Aurélien Delobelle
fb5ba5fb1b
Fix kfet navbar on small devices
2017-09-03 14:42:38 +02:00
Martin Pepin
afda1ba2ca
Merge branch 'test/views_fix_msg' into 'test/views'
...
Fix kfet.open.tests
See merge request !241
2017-08-29 20:39:31 +02:00
Aurélien Delobelle
22d8317dee
Fix kfet.open.tests
...
Due to messages sent in signals handlers, the tests were failing.
2017-08-16 22:43:52 +02:00
Aurélien Delobelle
a3bb9852be
Merge branch 'master' into test/views
2017-08-16 18:28:59 +02:00
Aurélien Delobelle
1d9310236b
Merge branch 'Kerl/setup' into 'master'
...
Setup de développement local
Développement sans Vagrant
- Ajoute un fichier de settings pour développer en local sans vagrant :
'cof/settings/local.py'. Il s'agit du fichier utilisé par défaut
si 'DJANGO_SETTINGS_MODULE' n'est pas dans l'environnement.
- Simplifie le README en conséquence.
Vagrant
La conf de production étant en cours de modification, on répercute ici
certaines de ces modifications.
- Front server: passe à nginx (à la place de apache).
- DB: passe à postgresql (à la place de mysql).
- La conf nginx sert le site (port 8080) derrière '/gestion/', à
l'exception des fichiers 'static' et 'media'.
- Ajout de `SERVER_EMAIL` dans les secrets pour pouvoir l'éditer en
production.
- Changement de `STATIC_ROOT` en production.
See merge request !242
2017-08-13 21:17:26 +02:00
Martin Pépin
2a519bfedf
Add SCRIPT_NAME to the production-like server
2017-08-13 14:36:45 +01:00
Martin Pépin
4c08962e09
Hide more stuff in secret.py
2017-08-13 13:39:13 +01:00
Martin Pépin
4d026407d1
Quicker setup for local development
2017-08-11 23:56:02 +01:00
Martin Pépin
5923166196
Specify the full path of the sqlite database
2017-08-11 17:24:09 +01:00
Martin Pépin
853fa57ce4
In README.md: typo env -> venv
2017-08-11 15:45:19 +01:00
Martin Pépin
522acafb2e
Add python dependency for Debian9
2017-08-10 16:56:20 +01:00
Martin Pépin
dae418af3d
Handle websockets in nginx.conf
2017-08-10 16:56:03 +01:00
Martin Pépin
73296ea251
Setup django before launching daphne + Django
2017-08-10 16:55:36 +01:00
Martin Pépin
4075fcaa64
typo
2017-08-10 16:35:41 +01:00
Martin Pépin
bd1dace8e8
Fix symlink for secret.py
2017-08-10 16:31:09 +01:00
Martin Pépin
ad15c45237
Switch to nginx + postgres in vagrant
2017-08-09 22:18:26 +01:00
Martin Pépin
cb1d253517
Local development settings
...
- Add a new settings file for local development
- Update README.md according to the new setup
2017-08-09 22:17:27 +01:00
Martin Pépin
a6b0c51d39
Add SERVER_EMAIL to the secrets
2017-08-08 00:25:13 +01:00
Martin Pépin
81f3d6ab81
Move STATIC_ROOT in production
2017-08-08 00:24:00 +01:00
Martin Pépin
062f547315
Use the right python interpreter in the cron tasks
2017-08-08 00:19:47 +01:00
Martin Pépin
784513b3cc
Use utf8 encoding for the mysql database
2017-08-08 00:12:09 +01:00
Martin Pépin
88597e62f1
More verbose secret error reporting
2017-08-08 00:06:03 +01:00
Martin Pépin
e13d68a127
Ignore PyCharm's files
2017-08-08 00:03:08 +01:00
Aurélien Delobelle
878c617cc7
fix PermConsumerMixin
2017-06-25 22:29:12 +02:00
Martin Pépin
68c1b45342
Add missing migrations
2017-06-25 16:30:49 +01:00
Martin Pepin
d30b36269a
Merge branch 'aureplop/kfet_cms' into 'master'
...
Add Wagtail CMS for kfet app.
See merge request !237
2017-06-25 16:47:48 +02:00
Aurélien Delobelle
455b730cc3
Merge branch 'master' into aureplop/kfet_cms
2017-06-23 02:53:05 +02:00
Martin Pepin
b49d96d18f
Merge branch 'aureplop/kfet_open' into 'master'
...
La K-Fêt est-elle ouverte ?
See merge request !239
2017-06-23 00:28:58 +02:00
Aurélien Delobelle
815ba50603
fix for small devices
2017-06-22 16:59:41 +02:00
