Commit graph

2252 commits

Author SHA1 Message Date
Martin Pépin
001a832116
Move the 'utils' template tags to the shared app 2020-06-07 23:49:42 +02:00
Martin Pépin
87184eaadc
Make events tests independent of LOGIN_URL 2020-06-04 18:02:40 +02:00
Martin Pépin
3946032362
only run relevant tests in cof/bds CI 2020-06-04 18:02:40 +02:00
Martin Pépin
ee3b197ad4
Fix settings.local.ALLOWED_HOSTS 2020-06-04 18:02:40 +02:00
Martin Pépin
2d7cd5408b
Use the new settings in gitlab-ci 2020-06-04 18:02:40 +02:00
Martin Pépin
586df45a2f
Add wsgi file 2020-06-04 18:02:40 +02:00
Martin Pépin
0d8c97dbf7
One url file to rule them all,
one url file to find them
One url file to bring them all,
and in the darkness bind them.
2020-06-04 18:02:40 +02:00
Martin Pépin
d8e3cd6566
Split settings between COF / BDS / Local 2020-06-04 18:02:40 +02:00
Martin Pépin
035a8cce3b
Merge local and dev settings 2020-06-04 18:02:36 +02:00
Ludovic Stephan
3ca8b45014 Migration for events app 2020-05-20 17:41:25 +02:00
Ludovic Stephan
90fc6aa3e7 Merge branch 'Aufinal/simplify_tests' into 'master'
Utilitaire de tests simplifié

See merge request klub-dev-ens/gestioCOF!421
2020-05-15 16:12:47 +02:00
Martin Pépin
707b7b76db Make events tests deterministic 2020-05-14 21:23:25 +02:00
Ludovic Stephan
6fff995ccd Expand CSVResponseMixin functionality 2020-05-12 01:12:19 +02:00
Ludovic Stephan
9b0440429c Fix ical tests 2020-05-12 00:47:48 +02:00
Ludovic Stephan
50266f2466 Fix tests for python3.7 (?) 2020-05-11 13:03:13 +02:00
Ludovic Stephan
65171d1276 Fix event tests 2020-05-11 01:16:58 +02:00
Ludovic Stephan
3b43ad84b5 Renomme testcases.py -> mixins.py 2020-05-11 00:19:43 +02:00
Ludovic Stephan
bb72a16b64 Lisibilité: t_urls -> reversed_urls 2020-05-10 23:58:46 +02:00
Ludovic Stephan
b1c69eddb5 Meilleure doc (j'espère !) 2020-05-10 23:58:13 +02:00
Ludovic Stephan
88c9187e2e MegaHelpers devient un mixin 2020-05-10 23:56:45 +02:00
Ludovic Stephan
bbe831a226 Sépare un gros fourre-tout en plus petits mixins 2020-05-10 23:54:21 +02:00
Ludovic Stephan
f642b218d0 Consistance dans les noms de fichiers 2020-05-10 23:44:02 +02:00
Ludovic Stephan
cc72f47f00 Merge branch 'kerl/event_options_and_extra_fields' into 'master'
Les événements du nouveau module `events` récupèrent les même fonctionnalités que les événements de `gestioncof`

See merge request klub-dev-ens/gestioCOF!398
2020-05-10 00:53:27 +02:00
Martin Pépin
24180e747e Events: one more validation check 2020-05-08 16:40:18 +02:00
Martin Pépin
5a0cf58d8a Events: more validation & uniqueness constraints 2020-05-08 16:34:35 +02:00
Martin Pépin
d7d4d73af3 typos 2020-05-08 16:34:19 +02:00
Martin Pépin
c2f6622a9f Update changelog 2020-05-08 16:16:37 +02:00
Martin Pépin
8778695e95 Add some more documentation in events.models 2020-05-08 16:14:04 +02:00
Martin Pépin
e0fd3db638 Make events tests deterministic 2020-05-08 16:14:04 +02:00
Martin Pépin
d5e9d09044 Events are configurable
This commit mostly reproduces the structure of gestioncof's events,
renames some stuff and adds a generic export view.
2020-05-08 16:14:04 +02:00
Martin Pepin
6e9dc03bc7 Merge branch 'Evarin/sitecof-improvements' into 'master'
Améliorations site du COF

See merge request klub-dev-ens/gestioCOF!415
2020-05-08 16:13:18 +02:00
Martin Pépin
6384cfc701 Update changelog 2020-05-08 16:04:05 +02:00
Martin Pépin
67d7dafc14 Merge branch 'master' into Evarin/sitecof-improvements 2020-05-08 15:56:42 +02:00
Martin Pépin
1ada8645b8 Black 2020-05-08 15:52:13 +02:00
Ludovic Stephan
d4a9e96e38 Merge branch 'kerl/ci' into 'master'
Bump python and postrgres in CI

See merge request klub-dev-ens/gestioCOF!419
2020-05-08 13:06:29 +02:00
Martin Pépin
abb8cc5a2d Bump python and postrgres in CI 2020-05-08 12:47:03 +02:00
Martin Pepin
5a9ea4234e Merge branch 'Aufinal/simplify_stats' into 'master'
Simplifie massivement les statistiques K-Fêt + étend la période de stats

Closes #257 and #244

See merge request klub-dev-ens/gestioCOF!411
2020-05-08 12:41:18 +02:00
Ludovic Stephan
c9136dbcfa CHANGELOG 2020-05-08 11:15:12 +02:00
Ludovic Stephan
61e4ad9741 Better docstring 2020-05-08 11:14:32 +02:00
Ludovic Stephan
c9dad9465a Fix tests 2020-05-08 11:14:32 +02:00
Ludovic Stephan
f10d6d1a71 Bugfix
Quand un article n'a pas de conso, il a été créé il y a 1s
2020-05-08 11:14:32 +02:00
Ludovic Stephan
97cb9d1f3b Rework stats_manifest
On change la façon dont les vues gèrent l'interface avec `Scale`.
Side effect : on peut avoir l'historique sur tout le temps
2020-05-08 11:14:32 +02:00
Ludovic Stephan
c66fb7eb6f Simplify statistic.js
On supprime des fonctions inutiles, on lint, et on simplifie 2-3 options
inutilisées.
2020-05-08 11:14:32 +02:00
Ludovic Stephan
48ad5cd1c7 Misc cleanup
On utilise SingleObjectMixin partout, et on simplifie 2-3 trucs
2020-05-08 11:14:32 +02:00
Ludovic Stephan
ef35f45ad2 Fusionne deux fonctions chunkify
On rajoute de l'agrégation optionnelle dans la fonction.
2020-05-08 11:14:32 +02:00
Ludovic Stephan
26bcd729bb Supprime le code mort ou redondant 2020-05-08 11:14:32 +02:00
Ludovic Stephan
78ad4402b0 Plus de timezones 2020-05-08 11:14:32 +02:00
Ludovic Stephan
6767ba8e8c Rajoute de la doc partout 2020-05-08 11:14:32 +02:00
Ludovic Stephan
4f15bb9624 CHANGELOG 2020-05-07 18:40:07 +02:00
Martin Pepin
3b2251a1d6 Merge branch 'Aufinal/editable_accounts' into 'master'
Harmonise les comptes non-lisibles ou éditables

Closes #234

See merge request klub-dev-ens/gestioCOF!412
2020-05-07 18:07:07 +02:00