DGNum/gestioCOF
16
2
Fork 2
Code Issues 79 Pull requests 19 Projects Releases 12 Packages Wiki Activity
999 commits 44 branches 17 tags 59 MiB
Commit graph

999 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Pépin
a28c00e474 Move the auth stuff to gestion/ 
- The login views are in `gestion/`
- The templates are under `gestion/templates/gestion/`
- `cof/shared.py` moves to `gestion/` and is splitted into 3 files:
    - The auth backends are in `backends.py`.
    - The context_processor is in `context_processor.py`
    - The LOCK/UNLOCK functions remain in `shared.py`
 2017-02-12 15:38:14 +01:00
Martin Pépin
50b667993f Merge branch 'master' into supportBDS 
- Mise en page
- Cleanup des petits cours
- Utilisation de custommail
- Utilisation du ldap du SPI pour fetch les nouveaux comptes
 2017-02-12 04:26:43 +01:00
Martin Pepin
dc822d3c72 Add license 2017-02-11 21:35:29 +01:00
Martin Pépin
d41d905366 PEP8 2017-02-11 21:20:51 +01:00
Martin Pépin
313b5cf61d Merge branch 'master' into Aufinal/dev_data_kfet 2017-02-11 21:01:37 +01:00
Qwann
b5037329dd small fixes + migration 
enable admin interface for bds
 2017-02-11 20:36:16 +01:00
Qwann
d46ab87e9b Merge branch 'michele.orru/gestioCOF-supportBDS' into supportBDS 2017-02-11 20:17:23 +01:00
Qwann
f53ced6a33 Merge branch 'supportBDS' into michele.orru/gestioCOF-supportBDS 2017-02-11 19:21:23 +01:00
Michele Orrù
ee1f29b17d Make is_cof a property and start developing permissions. 
Rmeove the is_cof flag to check permission and start implementing
a group and a permission for the respective cof members.
XXX. note: migrations do NOT add old is_cof members to the new group
(as actually they're just on the tests…)
 2017-02-11 18:48:13 +01:00
Qwann
b9ed7320ec Fix user registration 2017-02-11 18:41:47 +01:00
Qwann
fcf392f40d Merge remote-tracking branch 'origin/tmp' into michele.orru/gestioCOF-supportBDS 2017-02-11 18:02:05 +01:00
Martin Pépin
3365d7b9a1 Updates the decorators 2017-02-11 18:00:01 +01:00
Qwann
b16219f8ee fixing profile view 2017-02-11 17:57:37 +01:00
Martin Pépin
6c3e1bd2db Fix the loaddevdata script 2017-02-11 17:18:42 +01:00
Michele Orrù
a2b8dee022 Fix #134. 
Fill bds.models with the required fields; add migration scripts, and a stupid
unittests that checks the model really works.
Note: old fields will migrate to datetime.now().
 2017-02-11 17:13:48 +01:00
Qwann
5b54d76e36 Merge branch 'Kerl/use_django_custommail' 2017-02-11 16:30:12 +01:00
Qwann
ec7012ee47 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail 2017-02-11 16:22:09 +01:00
Qwann
924a289a78 cleaning UGLY django template style 
and moving some template files
 2017-02-11 16:21:13 +01:00
Martin Pépin
27bf59d4c0 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail 2017-02-11 16:16:00 +01:00
Martin Pépin
b4bf437447 Minor fixes 2017-02-11 16:15:17 +01:00
Michele Orrù
f0c3def935 Make the test really works. 
This fixes the proble with debug_toolbar,
the fucking toolbar that messes all your tests.
 2017-02-11 15:47:31 +01:00
Qwann
5d35112c87 Merge branch 'Kerl/use_django_custommail' of git.eleves.ens.fr:cof-geek/gestioCOF into Kerl/use_django_custommail 2017-02-11 15:34:04 +01:00
Qwann
62dc04c19f cleaning ugly html 2017-02-11 15:33:22 +01:00
Martin Pépin
0e759405c7 Change the migration index 2017-02-11 15:13:29 +01:00
Michele Orrù
376e829502 Reaching a point where I can query /k-fet. 
Edit forms and views in app kfet to make the depend on gestion.Profile and not
on cof.CofProfile.
 2017-02-11 15:07:45 +01:00
Michele Orrù
f50ef1d51a Merge remote-tracking branch 'origin/supportBDS-fixes1' into supportBDS 2017-02-11 14:26:55 +01:00
Martin Pépin
b639c04549 Fix the registration forms 
- The former `RegistrationUserProfileForm` is splitted in two.
- There is a new form: `RegistrationCofProfileForm`
 2017-02-11 12:42:36 +01:00
Martin Pépin
6e55905781 Merge branch 'master' into Kerl/use_django_custommail 2017-02-11 03:20:29 +01:00
Qwann
06eafdae47 Merge branch 'master' of git.eleves.ens.fr:cof-geek/gestioCOF 2017-02-11 02:54:54 +01:00
Qwann
5136e394d4 Merge branch 'Kerl/modernize_petitscours' 2017-02-11 02:54:22 +01:00
Qwann
ed01508481 using context_object_name and moving template 2017-02-11 02:51:43 +01:00
Martin Pépin
b1cf96d0ae Move profile editing to gestion 2017-02-11 01:43:17 +00:00
Robin Champenois
1060a0a368 Merge branch 'Kerl/ldap' into 'master' 
The end of Clipper

GestioCOF fetches the clipper accounts from an LDAP database and doesn't
need to store clippers in a table anymore.

You need to run migrations to apply this patch

The default behaviour is not to fetch data from the LDAP because you may not have access to it.
To test over a ldap database server or in production, you need to set `settings.LDAP_SERVER_URL`
to the correct value.

Fixes #13

See merge request !140
 2017-02-11 02:42:00 +01:00
Martin Pépin
02a8e74e3b Optimize code, better queries 
- Remove useless Q queries
- Optimize with sets
- Queries over clipper id too
 2017-02-11 02:39:59 +01:00
Martin Pépin
d4b696db70 Merge branch 'master' into Kerl/ldap 2017-02-11 01:55:02 +01:00
Martin Pepin
f0774a3e3c Merge branch 'robin' into 'master' 
Support des touch-events et clean des deps jquery-ui

Fixes #80

See merge request !167
 2017-02-11 00:37:16 +01:00
Michele Orrù
815a5f274c Fix some reviewing considerations. 
- appropriate naming for migration
- remove __future__ imports.
- remove "CofProfile" left in kfet/models.py
 2017-02-11 00:33:46 +01:00
Michele Orrù
25c3106168 Add some tests about how profiles types should relate to each other. 2017-02-11 00:33:36 +01:00
Michele Orrù
22da04c3e2 s/cofprofile/profile/g into k-fêt. 
This commit also restores the only unittest present.
 2017-02-11 00:32:58 +01:00
Evarin
839d60e48f Support tactile jquery-ui 2017-02-11 00:11:14 +01:00
Martin Pépin
58d708b791 Move profile editing to gestion 2017-02-10 23:50:19 +01:00
Evarin
80d8cb6b7e Mise à jour des dépendances jquery-ui et jquery 
Should fix #80 - à tester sur mobile (via dev.cof)
 2017-02-10 23:47:49 +01:00
Ubuntu
f39d1545f0 Generic profiles and migrations. 
Creating profiles for BDS, COF and K-Fêt.
 2017-02-10 22:12:03 +01:00
Evarin
399e5ca16d Jolie mise en page pour les demandes de petit cours 
Closes #6
 2017-02-10 20:42:54 +01:00
Evarin
f7ec5ef9ee Grise les spectacles passés dans la liste des spectacles pour le BdA 2017-02-10 19:58:22 +01:00
Martin Pépin
5aff771d9c Set the new structure of gestioCOF 
- `cof` is renamed `gestioCOF`
- `gestioncof` become `cof` (yes it looks pretty stupid but it is not)
- `bds` is created
 2017-02-09 21:28:36 +01:00
Martin Pepin
e32faf6182 Merge branch 'Aufinal/select_all' into 'master' 
Aufinal/fixes_85

Rajoute des boutons pour tout (dé-)sélectionner dans la vue d'inscription au calendrier.

Utilise `bootstrap` pour afficher le formulaire.

See merge request !166
 2017-02-09 12:29:08 +01:00
Martin Pépin
8e7428a11e Répercute le déplacement du template dans les vues 2017-02-09 12:26:08 +01:00
Ludovic Stephan
ca73dc27bb move template 2017-02-08 21:13:02 -02:00
Ludovic Stephan
46638bd6d8 fixes #85 2017-02-08 21:08:00 -02:00