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
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
Martin Pépin
2c848a564c
Some changes were missing in CHANGELOG
2019-12-12 21:58:05 +01:00
Antonin Reitz
e97c873b4f
Merge branch 'Aufinal/backbone' into 'master'
...
Refactor le JS de K-Psul via Backbone : 1ère étape
See merge request klub-dev-ens/gestioCOF!388
2019-12-11 23:19:44 +01:00
Antonin Reitz
f151ad75c6
For the sake of clarity
2019-12-11 23:05:39 +01:00
Antonin Reitz
83ce873e25
Remove unnecessary caching
2019-12-11 22:36:40 +01:00
Martin Pepin
71e3c210f2
Merge branch 'Aufinal/forgotten_decorators' into 'master'
...
Rajoute les décorateurs oubliés pour l'auth par mdp
See merge request klub-dev-ens/gestioCOF!389
2019-12-11 19:10:19 +01:00
Ludovic Stephan
a4fdb578bc
Add forgotten kfet_password decorators
2019-12-02 20:44:25 +01:00
Ludovic Stephan
0498db1140
Merge branch 'Aufinal/fix_created_paid' into 'master'
...
Fix: les participants nouvellement créés ont payé leurs places BdA
Closes #231
See merge request klub-dev-ens/gestioCOF!379
2019-12-02 09:59:15 +01:00
Martin Pépin
77ceae37ef
Update CHANGELOG
2019-12-01 11:37:43 +01:00
Martin Pépin
085013b256
Add some explanations about !379
2019-12-01 11:35:38 +01:00
Ludovic Stephan
381b52f46c
Fix: les participants nouvellement créés ont payé leurs places BdA
...
Si un participanti est créé avec `get_or_create`, son champ `paid`
n'était pas créé... C'est difficile à insérer dans la logique du
Manager, donc on fix ça dans la vue concernée.
2019-12-01 11:35:38 +01:00
Martin Pépin
0bd3bd63aa
Update changelog wrt last MR ( !382 )
2019-12-01 11:24:21 +01:00
Martin Pepin
c6c4814519
Merge branch 'Aufinal/fix-stats-escape' into 'master'
...
Fix la page de stats pour certains comptes avec des caractères spéciaux
See merge request klub-dev-ens/gestioCOF!382
2019-12-01 11:22:36 +01:00
Martin Pépin
b1747f61fe
Version 0.3.3
2019-11-30 19:04:56 +01:00
Ludovic Stephan
85aa56d030
Fix tests
2019-11-29 15:33:03 +01:00
Ludovic Stephan
361ad46be4
First steps in Account logic
2019-11-29 14:51:54 +01:00
Ludovic Stephan
4e15ab8041
Install django-js-reverse
2019-11-29 14:50:44 +01:00
Ludovic Stephan
091208b66c
Make kfet.account.read.json accessible with GET
2019-11-29 14:47:12 +01:00
Ludovic Stephan
7df8a9ef6b
Add vendor library and their sources
2019-11-28 18:26:39 +01:00
Martin Pépin
4c7993f48f
Forgot CHANGELOG for !385
2019-11-28 16:09:47 +01:00
Martin Pepin
94d5e0f0ac
Merge branch 'Aufinal/fix_cas_redirect' into 'master'
...
Fix la redirection lors d'un logout CAS
See merge request klub-dev-ens/gestioCOF!385
2019-11-28 16:08:50 +01:00
Martin Pépin
a521caba8d
Update changelog wrt the lastest merged patches.
2019-11-28 14:53:44 +01:00
Martin Pepin
797f0356f6
Merge branch 'Aufinal/no_reduction_category' into 'master'
...
Permet d'exclure des catégories de la réduction COF
See merge request klub-dev-ens/gestioCOF!386
2019-11-28 14:30:54 +01:00
Martin Pépin
8dcc1f012a
Update CHANGELOG
2019-11-28 14:17:59 +01:00
Ludovic Stephan
1115960107
Add unit test
2019-11-27 16:57:48 +01:00
Ludovic Stephan
727b3042a1
Merge branch 'kerl/fix-multiple-select-urls' into 'master'
...
Mise à jour de certaines urls (multiple-select.{css,js})
See merge request klub-dev-ens/gestioCOF!387
2019-11-27 16:09:13 +01:00
Martin Pépin
61efded673
Remove unused references to multiple-select.*
2019-11-27 15:46:50 +01:00
Ludovic Stephan
38aecdd741
Typo
2019-11-27 14:41:20 +01:00
Martin Pépin
e0ffee295d
Fix static urls for multiple-select
2019-11-27 14:30:24 +01:00
Ludovic Stephan
e62756ed29
Fix tests
2019-11-27 14:20:24 +01:00
Ludovic Stephan
ac3bfbe368
Display in kfet js
2019-11-27 14:14:42 +01:00
Ludovic Stephan
affdf43e0b
Add logic in views and templates
2019-11-27 14:14:33 +01:00
Ludovic Stephan
20ceec0e64
Add has_reduction property
2019-11-27 14:11:53 +01:00
Ludovic Stephan
4c9ee8a57d
Merge branch 'fix-cash-transaction-cancel' into 'master'
...
Fix typo and hence cash transaction cancel
Closes #239
See merge request klub-dev-ens/gestioCOF!384
2019-11-27 13:32:23 +01:00
Ludovic Stephan
5c581d8984
Cleanup + no msg on CAS logout
2019-11-27 13:14:20 +01:00
Ludovic Stephan
ac4d5cf7d5
Patch CAS redirect parameter in logout view
2019-11-27 13:03:28 +01:00
Antonin Reitz
b90e749a7f
Fix typo and hence cash transaction cancel
2019-11-27 10:50:27 +01:00
