Commit graph

61 commits

Author SHA1 Message Date
Basile Clement
a26a77b508 Future-proof for django 4.0
Minor changes to make the code compatible with django 4.0

Note that we can't actually upgrade to django 4.0 because that requires
python 3.8, and www.eleves only has python 3.7, so we need to upgrade
www.eleves first.
2022-12-05 14:37:55 +01:00
Basile Clement
25a1b880e5 Merge branch 'thubrecht/django3' into 'master'
Update to Django 3.2

See merge request klub-dev-ens/WikiENS!18
2022-12-05 13:57:57 +01:00
d98d8d013c Update to Django 3.2 2022-01-07 16:47:09 +01:00
Martin Pepin
dbffa735a0 Merge branch 'thubrecht/scroll-groups' into 'master'
On évite le graphe qui prend 3 écrans de largeur

See merge request klub-dev-ens/WikiENS!16
2021-10-30 10:59:57 +02:00
4262f0e7a5 On évite le graphe qui prend 3 écrans de largeur 2021-10-29 17:51:21 +02:00
Martin Pepin
9ce3238000 Merge branch 'kerl/group_list' into 'master'
List des groupes

See merge request klub-dev-ens/WikiENS!11
2021-10-26 20:12:27 +02:00
29c5abbc1a On affiche la liste des managers 2021-10-26 20:01:58 +02:00
Martin Pépin
cc50d540c3 Display the list of groups at /_groups/ 2021-10-26 19:48:33 +02:00
Martin Pepin
ef00b63053 Merge branch 'thubrecht/groupes' into 'master'
Ajoute la gestion des groupes

See merge request klub-dev-ens/WikiENS!15
2021-10-26 19:41:30 +02:00
c771f1ad49 Placeholder 2021-10-26 19:38:00 +02:00
66cb88721f Docstring 2021-10-26 19:29:30 +02:00
e8830540ec Meilleur message d'erreur 2021-10-26 19:20:29 +02:00
93792f5f46 On évite les erreurs si pas la bonne url 2021-10-26 19:17:06 +02:00
d5c1e2225a On remplace les Querysets par ce qu'on veut 2021-10-26 19:06:23 +02:00
3da477729a Better docstring 2021-10-26 18:57:38 +02:00
9c02e1e902 Use already_notified in get_all_groups 2021-10-26 18:53:31 +02:00
f257209f8f JS update 2021-10-11 15:34:24 +02:00
0fa182cb4a Ajoute la gestion des groupes 2021-07-24 04:13:47 +02:00
Basile Clement
20d0f1fba9 Define HOST to "" to use unix domain socket connection 2021-04-10 20:04:01 +02:00
Martin Pepin
7111ce1583 Merge branch 'thubrecht/navbar' into 'master'
Corrige le look de la navbar du wiki

See merge request klub-dev-ens/WikiENS!13
2021-01-28 20:17:30 +01:00
69d34e5a44 Corrige le look de la navbar du wiki 2021-01-28 15:24:41 +01:00
Ludovic Stephan
e8db9f46a6 Merge branch 'dodo/fix_email' into 'master'
Changed email from cof-geek to klub-dev

See merge request klub-dev-ens/WikiENS!10
2021-01-01 21:11:28 +01:00
Dorian Lesbre
ef8bbdfde1 Changed email from cof-geek to klub-dev 2020-12-24 17:38:07 +01:00
Martin Pépin
2c17bd4835
Add the production requirements 2020-11-18 20:59:16 +01:00
Martin Pépin
a6d0986119
Bump django-wiki 2020-11-18 20:58:54 +01:00
Théophile Bastian
e543e0438f Merge branch 'kerl/dot' into 'master'
Affichage de la hiérarchie des groupes avec graphviz

See merge request klub-dev-ens/WikiENS!9
2020-01-08 11:11:04 +01:00
Martin Pépin
5ed578ff9f
Use the wiki template for the groups graph page 2020-01-06 19:41:00 +01:00
Martin Pépin
6af61b4c65
WikiGroups: graphviz visualisation 2020-01-06 19:36:29 +01:00
Théophile Bastian
7dd0bc478b Merge branch 'Kerl/prod' into 'master'
Répercute sur master des changements non commités en prod

See merge request klub-dev-ens/WikiENS!6
2019-12-27 14:10:27 +01:00
Théophile Bastian
5a88e6ecf0 Requirements: use gitlab django-allauth-ens v1.1.3 2019-12-25 12:03:03 +01:00
Martin Pépin
0e963a5cc4
black WikiENS/settings/ 2019-12-24 17:07:10 +01:00
Martin Pépin
253444d345
Re-add the lost wiki_group installed app 2019-12-24 17:06:04 +01:00
Martin Pépin
964652b385
Settings: add missing __init__.py 2019-12-24 17:04:07 +01:00
Martin Pépin
b91910d362
SERVER_EMAIL is not a secret 2019-12-24 17:01:48 +01:00
Martin Pépin
da4a440c3b
Remove test-specific settings 2019-12-24 17:01:48 +01:00
Martin Pépin
33fc1564bb
Settings: switch to Django2 2019-12-24 17:01:47 +01:00
Martin Pépin
8271c3a1c6
configure django-allauth 2019-12-24 17:00:49 +01:00
Martin Pépin
ac9d45782e
Bump django-allauth-ens 2019-12-24 17:00:49 +01:00
Martin Pépin
ae082bc9fb
Split production / development settings 2019-12-24 17:00:49 +01:00
Théophile Bastian
087b5a871e Merge branch 'structured_groups' into 'master'
Structured groups

Closes #5

See merge request klub-dev-ens/WikiENS!8
2019-12-20 17:07:47 +01:00
Martin Pépin
c8f57a2357 Add tests for structured groups 2019-12-20 17:04:32 +01:00
Théophile Bastian
d3f80f2339 Implement the structured groups backend
This implements a structured user group model, propagating its changes
to vanilla Django groups. It features cycle detection at save-time,
although this cycle detection can only be seen as a fallback and forms
should check the acyclicity of their changes before committing using the
provided class method.
2019-12-20 17:02:29 +01:00
Martin Pepin
d9da1ef528 Merge branch 'django-2.2' into 'master'
Update Django to 2.2

See merge request klub-dev-ens/WikiENS!7
2019-12-18 20:22:36 +01:00
Théophile Bastian
b9f1c2ecff Move settings.py -> settings.default.py
This allows us to have a production settings.py that doesn't get
overwritten at every git pull
2019-12-15 23:11:35 +01:00
Théophile Bastian
36f3d8d6ef Bump Django version to 2.2 2019-12-15 23:10:08 +01:00
Ludovic Stephan
fa2e1279c4 Merge branch 'Kerl/urls_fixes' into 'master'
Lien de déconnexion & typo

See merge request klub-dev-ens/WikiENS!5
2019-09-26 18:14:43 +02:00
Martin Pépin
56a3c1da6b Remove typo (random "i") in the base template 2019-01-14 14:37:47 +01:00
Martin Pépin
6666bd8134 set settings.LOGOUT_URL (used in the base template) 2019-01-14 14:35:04 +01:00
Erkan Narmanli
e20976eb73 Merge branch 'Qwann/lts' into 'master'
LTS is good

Closes #1

See merge request cof-geek/WikiENS!4
2018-03-29 19:27:26 +02:00
Qwann
40367d5fe9 fix login url, bump django 2018-03-29 19:26:45 +02:00