Evarin
3d091f50b5
Suppr captcha page, ajout block iframe
2018-03-21 21:53:48 +01:00
Evarin
347497602c
Revert urls prefixing
2018-02-20 17:21:26 +01:00
Evarin
6d6c995563
Fixtures fonctionnelles
2018-02-20 17:13:21 +01:00
Evarin
63ce694b4d
Fix dependency
2018-02-03 22:39:50 +01:00
Evarin
59116f2d46
International wagtail urls
2018-02-03 22:34:37 +01:00
Evarin
88e911ff9d
Fixtures mises à jour
2018-01-28 23:45:46 +01:00
Evarin
ba87044638
Calendrier dynamique + sympa + jolies dates
2018-01-28 23:44:48 +01:00
Evarin
f8952225d6
Apparence et Responsiveness
2018-01-28 19:10:14 +01:00
Evarin
c11ccf2ecc
Tri des annuaires
2018-01-28 19:09:35 +01:00
Evarin
8488beeb4e
Un seul modèle pour les actus
2018-01-22 21:24:20 +01:00
Evarin
8551ffcfd3
Merge branch 'master' into evarin/site-cof
2018-01-20 19:37:12 +01:00
Evarin
ea495e8f29
Archives beta
2018-01-20 19:33:50 +01:00
Aurélien Delobelle
44eee9be38
Merge branch 'aureplop/py34-compat' into 'master'
...
py34 compat
See merge request !279
2018-01-10 17:30:44 +01:00
Aurélien Delobelle
f58f120e7a
py34 compat
...
(already present in prod)
2018-01-10 17:25:07 +01:00
Martin Pepin
771b642a98
Merge branch 'aureplop/revente-reply_to' into 'master'
...
bda -- Set winner's email as Reply-to of the email…
Closes #179
See merge request !276
2018-01-07 16:03:20 +01:00
Martin Pepin
433b3f4716
Merge branch 'aureplop/1.11' into 'master'
...
Upgrade to Django 1.11
See merge request !275
2018-01-06 17:00:28 +01:00
Aurélien Delobelle
241c77e3b4
bda -- Set winner's email as Reply-to of the email…
...
…sent to the seller when a resale has been assigned.
Fixes #179 .
2017-11-24 06:58:33 +01:00
Aurélien Delobelle
b0b0542407
Upgrade to Django 1.11
...
- Deprecation warnings using Django 1.8 are resolved.
- Deprecation warnings using Django 1.11 are resolved.
- Admin: grappelli is no longer used.
- Upgrade to django-autocomplete-light v3 (v2 is not 1.11 compatible).
* autocomplete.modelform_factory being dropped, code uses dal Select2
views and widgets.
2017-11-19 18:41:39 +01:00
Aurélien Delobelle
36ce038050
Merge branch 'Qwann/legibility_kfet' into 'master'
...
Qwann/legibility kfet
See merge request !272
2017-11-10 14:54:17 +01:00
Martin Pépin
273e6374ef
Pluralization in bda -> participant list
2017-11-01 11:09:35 +01:00
Qwann
93fa79128c
order table striped
2017-10-31 15:10:21 +01:00
Martin Pepin
19e6ddc8bf
Merge branch 'aureplop/delete-kfet-globalperms' into 'master'
...
Delete GlobalPermissions model (migrations)
See merge request !270
2017-10-27 10:04:17 +02:00
Aurélien Delobelle
895f7e062c
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:38:28 +02:00
Martin Pépin
1c90d067fa
Make cof.settings a module
2017-10-26 18:13:09 +02:00
Aurélien Delobelle
364648fb4f
Merge branch 'Kerl/cours' into 'master'
...
initialisation des compteurs d'attributions de petits cours et settings.EMAIL_HOST
Ce patch règle deux problèmes en prod + un bug seulement présent en dev :
- Mauvaise initialisation des compteurs d'attributions de petits cours lors de la création d'un matière (premier compteur lié à cette matière)
- absence de `EMAIL_HOST` dans les settings => problèmes en production : la valeur par défaut `localhost` n'est pas satisfaisante.
- Il manquait un `Type` de variable dans la fixture des mails auto (dev seulement, visiblement pas de souci en production).
See merge request !265
2017-10-26 01:57:01 +02:00
Martin Pépin
1a136088bf
Add missing type in custommail (dev only)
2017-10-25 22:08:29 +02:00
Martin Pépin
40abe27e81
EMAIL_HOST needs to be set but as a secret
2017-10-25 22:05:14 +02:00
Martin Pépin
a07b5308a3
PetitCoursAttributionCounter defaults to 0
2017-10-25 22:01:58 +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
Evarin
adf43889e1
Fixtures site cof
2017-10-23 11:05:49 +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
Martin Pépin
b9aaea0f99
Merge branch 'master' into Production
2017-10-16 14:26:05 +02:00
Martin Pepin
47e48e36b2
Merge branch 'aureplop/fix-unreachable-objects-form-creation' into 'test/views'
...
Fix fields cleaning with unreachable items when…
See merge request !260
2017-10-12 19:21:16 +02:00
Aurélien Delobelle
85657591f5
Fix fields cleaning with unreachable items when…
...
… object is being created.
2017-10-12 11:10:30 +02:00
Aurélien Delobelle
c59bc487c3
Merge branch 'test/views__' into test/views
2017-10-11 23:35:38 +02:00
Aurélien Delobelle
f4a7e9dbf1
Verbosity should stay calm.
2017-10-11 23:34:43 +02:00
Aurélien Delobelle
03deb54d92
Merge branch 'Kerl/fix-JSONField-exn' into 'master'
...
djangorestframework 3.7 breaks with Django 1.8
See merge request !259
2017-10-11 23:18:05 +02:00
Martin Pépin
3b1d8487e2
Merge branch 'aureplop/kfet-auth_backends'
2017-10-11 22:59:28 +02:00
Martin Pépin
f8bb5b081e
Merge branch 'Kerl/fix-JSONField-exn' into test/views
2017-10-10 21:37:40 +02:00
Martin Pépin
3f6c5be748
Upgrade python packages before testing
2017-10-10 21:27:15 +02:00
Martin Pépin
e0ab7f5f94
Fix migration conflict
2017-10-10 21:21:28 +02:00
Martin Pépin
116b4da1a5
Merge branch 'test/views_kfet' into test/views
2017-10-10 21:15:49 +02:00
