cst1/kpsul
1
0
Fork 0
forked from DGNum/gestioCOF
Code Pull requests Activity
1725 commits 38 branches 17 tags 11 MiB
Commit graph

1725 commits

This branch
This branch
All branches
Author SHA1 Message Date
Martin Pépin c3d465d75a Clipper ≤ 8 chars in cof.migrations.0008_py3 2017-10-30 15:25:14 +01:00
Martin Pépin 30fcd1217a Copy the kpsul_checkout_data view from master 2017-10-30 14:56:45 +01:00
Martin Pépin 18dc063ae6 Rename / import some forms in kfet.views 2017-10-30 14:06:07 +01:00
Martin Pépin 345fcf8228 Rewrite Account.is_cof using has_perm("cof.member") 2017-10-30 12:49:37 +01:00
Martin Pépin 8895024a23 Fix COF membership unittest 
We did not reload the right user from the database
 2017-10-30 12:45:04 +01:00
Martin Pépin 14fa40c1ff Fix COF membership test in loadkfetdevdata 
cofprofile.is_cof don't exist anymore. The membership test should be performed
like `cofprofile.profile.user.has_perm("cof.member")`
 2017-10-30 12:43:47 +01:00
Martin Pépin 5794f0945f rename userN -> cbds_userN in check_olddata 2017-10-30 11:26:05 +01:00
Martin Pepin cf2a3f64d5 Merge branch 'aureplop/yolo/misc' into 'yolo' 
Misc fix for supportBDS

See merge request !271
 2017-10-30 09:53:21 +01:00
Aurélien Delobelle 09a88f768d Fix username conflicts with test suite and the… 
…check_supportBDS_migrations script.
 2017-10-28 18:08:40 +02:00
Aurélien Delobelle 09a96a0375 Fix postgres sequences 
When manually assigning a value to AutoField, sequences must be updated
manually.

https://docs.djangoproject.com/en/1.11/ref/databases/#manually-specifying-values-of-auto-incrementing-primary-keys
 2017-10-28 17:30:37 +02:00
Aurélien Delobelle f843c337e3 cof.{settings,asgi} -> gestioCOF.{…} 2017-10-28 17:28:04 +02:00
Martin Pépin 139a2e8293 rename url 'cof-logout' -> 'gestion:logout' 2017-10-27 11:10:01 +02:00
Martin Pépin d2a0240900 Remove accidentally committed (dummy) secret file 2017-10-27 11:10:01 +02:00
Martin Pépin 34b4a453e6 rename cof -> gestioCOF in some settings options 2017-10-27 10:25:56 +02:00
Martin Pépin ad60907b67 Change module names in CI config 2017-10-27 10:20:11 +02:00
Martin Pépin 8beff1fd37 Merge branch 'yolo' of git.eleves.ens.fr:cof-geek/gestioCOF into yolo 2017-10-27 10:16:55 +02:00
Martin Pepin 69c994ca5e Merge branch 'aureplop/yolo/fix-duplicate-perms' into 'yolo' 
Empêche d'obtenir des permissions dupliquées

See merge request !269
 2017-10-27 10:15:57 +02:00
Aurélien Delobelle 772d0b6895 Update kfet migrations history 2017-10-27 03:40:41 +02:00
Aurélien Delobelle 5b378d621a Delete GlobalPermissions model (migrations) 
It is an old model which doesn't exist anymore in kfet.models module.

This adds its missing DeleteModel in migrations.
 2017-10-27 03:39:51 +02:00
Martin Pepin dff19199ec Merge branch 'aureplop/yolo/fix-setup-kfet-generic-user' into 'yolo' 
Fix setup of the kfet generic user when…

See merge request !268
 2017-10-26 17:14:59 +02:00
Aurélien Delobelle 6e28f1260a Fix setup of the kfet generic user when… 
…a specific migration is targeted.
 2017-10-26 15:44:21 +02:00
Martin Pépin 72691b2d98 Merge branch 'supportBDS' into supportBDS 2017-10-26 15:11:11 +02:00
Martin Pépin 6d99fab45b kfet.signals has moved to kfet.auth.signals 2017-10-26 15:05:59 +02:00
Martin Pépin d26da74520 Add missing module cof.signals 2017-10-26 14:50:47 +02:00
Martin Pépin 6fc7df8b7b Renamings cofprofile -> profile in the kfet app 2017-10-26 14:07:45 +02:00
Martin Pépin 0eecdb8648 Fix on_delete policy for kfet.Account 2017-10-26 14:07:45 +02:00
Martin Pépin 5ab090fa72 rm cofprofile.num, add PEI / GRATIS 2017-10-26 14:07:45 +02:00
Martin Pépin 704731addd Remove accidentally merged file 2017-10-26 14:07:45 +02:00
Martin Pépin 0162f431d4 Some renamings gestioncof -> cof 
The tests fail for an obscure reason:
django.db.utils.OperationalError: no such column: cof_cofprofile.num
 2017-10-26 11:38:53 +02:00
Martin Pépin 36827cef6b Hack to handle duplicate permission entries… 
ONLY A TEMPORARY FIX
But migrations pass now
 2017-10-26 11:16:56 +02:00
Martin Pépin 547d866955 Update the check_migrations_supportBDS script 
Doesn't work yet
 2017-10-26 11:16:12 +02:00
Martin Pépin 9409b55df5 Merge migrations from master and supportBDS 
- Add missing migrations
- Fix dependencies
- rename gestioncof -> cof
 2017-10-26 11:06:17 +02:00
Martin Pépin 63963ce1f0 tmp 2017-10-26 09:34:56 +02:00
Martin Pépin 2aa2dafa13 Merge branch 'master' into supportBDS 2017-10-26 09:25:26 +02:00
Martin Pepin e4d5489549 Merge branch 'aureplop/supportBDS/fix-profile-test' into 'supportBDS' 
Fix profile test

See merge request !267
 2017-10-26 02:37:50 +02:00
Aurélien Delobelle 0149323b79 Fix profile test 2017-10-26 01:40:17 +02:00
Martin Pepin c575f75591 Merge branch 'aureplop/supportBDS/migrations' into 'supportBDS' 
Clean supportBDS migrations.

See merge request !250
 2017-10-26 01:09:07 +02:00
Aurélien Delobelle 5621c6f81e Merge branch 'Kerl/supportBDS/migrations' into 'aureplop/supportBDS/migrations' 
Kerl/support bds/migrations

- merge supportBDS
- rajoute des classes `Meta` disparues et autres renommages

See merge request !266
 2017-10-26 01:07:00 +02:00
Martin Pépin e867662996 renamings in the migrationq, missing Meta classes 2017-10-25 23:36:18 +02:00
Martin Pépin 9787770fc6 Merge branch 'supportBDS' into blah 2017-10-25 23:08:38 +02:00
Aurélien Delobelle 8e8e9aa076 Fix migration history 2017-10-24 19:25:20 +02:00
Aurélien Delobelle 53ef8b517a Merge branch 'test/views' 2017-10-24 18:01:49 +02:00
Aurélien Delobelle af3a7cf697 Reapply fix to kfetauth (…) and fix tests 2017-10-24 17:56:14 +02:00
Aurélien Delobelle 1cc51f17a3 Prevent connection to LDAP when settings is None 2017-10-24 17:55:02 +02:00
Aurélien Delobelle 8673da1874 Fix migration conflict 2017-10-24 16:52:57 +02:00
Aurélien Delobelle 8b1f174b13 manage.py is executable 2017-10-24 16:46:15 +02:00
Aurélien Delobelle 8cdb4c62fc Merge branch 'master' into test/views 2017-10-24 16:45:26 +02:00
Martin Pepin cb820e1414 Merge branch 'aureplop/fix-tirage-pk-conflict' into 'test/views' 
Fix tirage pk conflicts with postgres

See merge request !262
 2017-10-18 11:40:02 +02:00
Aurélien Delobelle 46187659ed Fix tirage pk conflicts with postgres 2017-10-17 14:42:39 +02:00
Martin Pépin fccad5edee rename root -> kfet_genericteam in fixtures 2017-10-16 14:31:02 +02:00