Robin Champenois
31e4658766
Merge branch 'sakarah/patch-jquery-path' into 'master'
...
Corrige les chemins vers jquery pour sitecof
See merge request klub-dev-ens/gestioCOF!414
2020-03-29 11:50:14 +02:00
Guillaume Bertholon
7b554e4778
Corrige les chemins vers jquery pour sitecof
2020-03-28 14:10:24 +01:00
Martin Pepin
494cd5ddc1
Merge branch 'kerl/sitecof_directory_entry_template' into 'master'
...
Template pour les entrées d'annuaire (sitecof)
See merge request klub-dev-ens/gestioCOF!394
2020-02-12 18:36:05 +01:00
Martin Pépin
80188fa88d
CMS club page: redirection to parent page
2020-02-12 18:20:33 +01:00
Martin Pépin
4580f8bf0f
Update changelog
2020-02-12 18:20:33 +01:00
Martin Pépin
03e6fe3ef6
Default template for cof directory entries
2020-02-12 18:18:56 +01:00
Martin Pepin
8c75189ce1
Merge branch 'Aufinal/article_charts' into 'master'
...
Fix: les articles ont de nouveau leur graphe d'usage
Closes #260
See merge request klub-dev-ens/gestioCOF!410
2020-02-08 11:19:50 +01:00
Martin Pépin
68b7219cf5
Update CHANGELOG
2020-02-08 11:06:34 +01:00
Ludovic Stephan
7a828760b3
Répercute les changements en prod
2020-02-08 10:47:55 +01:00
Martin Pépin
5280ec2d18
Update CHANGELOG
2020-01-27 21:17:00 +01:00
Martin Pepin
b0d8b0b7f8
Merge branch 'Aufinal/ukf-display' into 'master'
...
Fix l'affichage des UKF dans K-Psul
Closes #259
See merge request klub-dev-ens/gestioCOF!409
2020-01-27 21:13:05 +01:00
Ludovic Stephan
bc90de76b6
Fix l'affichage des UKF
2020-01-18 17:01:07 +01:00
Ludovic Stephan
ed97ff466d
Merge branch 'kerl/fix-bda-participant-email-list' into 'master'
...
Les boutons "afficher/cacher" les mails et noms des participant⋅e⋅s d'un spectable BdA fonctionnent à nouveau
See merge request klub-dev-ens/gestioCOF!408
2020-01-18 16:40:57 +01:00
Martin Pépin
6cce9779fa
participants.html: s/participants/participant⋅e⋅s/
2020-01-18 12:23:45 +01:00
Martin Pépin
2c2872275a
Update CHANGELOG
2020-01-18 12:22:32 +01:00
Martin Pépin
fb3f6b9073
Add missing <script> tag in bda/participants.html
2020-01-18 12:20:39 +01:00
Martin Pépin
28cb35e0b0
Version 0.4.1
2020-01-17 21:54:00 +01:00
Antonin Reitz
79ad1346d3
Merge branch 'Aufinal/hashtag_42' into 'master'
...
On supporte à nouveau les caractères d'urls dans les trigrammes
See merge request klub-dev-ens/gestioCOF!407
2020-01-17 00:42:25 +01:00
Ludovic Stephan
bb05edfd6b
CHANGELOG
2020-01-16 23:24:07 +01:00
Ludovic Stephan
4d3531c2cb
Fix special chars in trigramme
2020-01-16 23:20:18 +01:00
Martin Pépin
ff968b68b2
Version 0.4
2020-01-15 22:42:24 +01:00
Ludovic Stephan
84c36b9903
CHANGELOG
2020-01-09 10:43:07 +01:00
Ludovic Stephan
3088098a0a
Merge branch 'master' into 'master'
...
Fixed images not showing up in petitscours
See merge request klub-dev-ens/gestioCOF!406
2020-01-09 10:40:14 +01:00
Julien Malka
f9feff4b24
Wrong use of src -> replaced by vendor
2020-01-07 23:01:19 +01:00
Julien Malka
08d7e12c38
Fixed images not showing up in petitscours
2020-01-07 22:37:37 +01:00
Ludovic Stephan
bd74f4098c
Merge branch 'kerl/ci_python_37' into 'master'
...
CI : les tests tournent sous python 3.5 et python 3.7
See merge request klub-dev-ens/gestioCOF!402
2020-01-07 19:26:56 +01:00
Martin Pepin
ee79281f53
Merge branch 'Aufinal/transfer_formset' into 'master'
...
Fix : nouveaux formulaires de transfert si le formset est plein
Closes #250
See merge request klub-dev-ens/gestioCOF!404
2020-01-04 16:49:42 +01:00
Martin Pépin
ee4d2d7f0e
CI: run tests on python:3.5 and python:3.7
2020-01-04 16:35:13 +01:00
Martin Pépin
f19b257afd
Update changelog
2020-01-04 16:33:32 +01:00
Ludovic Stephan
87e3795c76
Ajout d'un nouveau transfert si formulaire rempli
2020-01-04 15:31:14 +01:00
Ludovic Stephan
f5d6d91e51
Merge branch 'kerl/happy_new_year' into 'master'
...
Happy new year!
See merge request klub-dev-ens/gestioCOF!403
2020-01-03 23:41:33 +01:00
Martin Pépin
a1a2aac1f3
K-Fêt: new year, no valid promo…
2020-01-03 17:33:27 +01:00
Ludovic Stephan
c1449d50ce
Merge branch 'kerl/bds-buro' into 'master'
...
petite mise à jour de BDSProfile
See merge request klub-dev-ens/gestioCOF!396
2019-12-28 10:17:20 +01:00
Martin Pepin
e13a5b0e60
Merge branch 'kerl/sitecof_clubs_optional_urls' into 'master'
...
Dans la description d'un club (ou d'un partenaire du COF), le link est optionel.
See merge request klub-dev-ens/gestioCOF!393
2019-12-26 23:27:20 +01:00
Martin Pépin
858759865e
BDSProfile: s/membre/adhérent⋅e/
2019-12-26 23:19:41 +01:00
Martin Pépin
8bae013152
BDSProfile: add is_member & cotisation_type fields
2019-12-26 13:11:37 +01:00
Martin Pépin
4d5419fdbc
Use permissions to authenticate bds buro members
...
I prefer using a permission (namely `bds.is_team`) to determine if a
user is member of the BDS staff rather that using a `is_buro` boolean
field.
We already use this approach is the kfet app
2019-12-26 13:09:38 +01:00
Martin Pépin
2e4d7101ce
Update changelog
2019-12-26 01:03:46 +01:00
Martin Pépin
229b6e55f5
cofsite: make club links optional
2019-12-26 01:02:45 +01:00
Ludovic Stephan
d2ba9471da
Merge branch 'kerl/permission_disambiguation' into 'master'
...
Disambiguation in kfet's permission handling
See merge request klub-dev-ens/gestioCOF!397
2019-12-25 17:45:03 +01:00
Martin Pépin
1f945d1af3
Avoid using get_by_natural_key
2019-12-24 17:14:45 +01:00
Martin Pépin
64c792b11f
Disambiguation in kfet's permission handling
...
In some places we used to refer to permissions based on their codename
only (the part after the dot "." in the following examples) which can be
ambiguous. Typically, we might define permissions like "bds.is_team" or
"cof.is_team" in the near future ;)
2019-12-24 17:14:45 +01:00
Ludovic Stephan
67e28c704f
Merge branch 'kerl/kfet_calendar_links' into 'master'
...
Met à jour l'url du calendrier de la K-Fêt sur la page d'accueil de GestioCOF
See merge request klub-dev-ens/gestioCOF!392
2019-12-23 11:32:23 +01:00
Martin Pépin
ac901e5b77
Update changelog
2019-12-22 23:49:52 +01:00
Ludovic Stephan
21fc91c3a4
Merge branch 'kerl/rm_todo_prod' into 'master'
...
Remove the obsolete TODO_PROD file
See merge request klub-dev-ens/gestioCOF!395
2019-12-22 23:45:46 +01:00
Martin Pépin
00bad52570
Remove the obsolete TODO_PROD file
2019-12-20 17:49:55 +01:00
Martin Pépin
59d93900a3
Update the k-fet calendar url on the home page
2019-12-20 17:08:58 +01:00
Ludovic Stephan
2df4e931d4
Remove log
2019-12-18 21:15:40 +01:00
Ludovic Stephan
36e802082e
Merge branch 'kerl/changelog' into 'master'
...
Petite mise à jour du CHANGELOG et changement de format
See merge request klub-dev-ens/gestioCOF!391
2019-12-13 00:38:05 +01:00
Martin Pépin
d7e1583a8e
Nicer format for the CHANGELOG(.md) file
2019-12-12 22:02:57 +01:00
