Commit graph

105 commits

Author SHA1 Message Date
Daru13
a718b6afc5 Add and update the SCSS used to generate annuaire.css.
Also update the related section in the README.
2020-09-16 22:20:16 +02:00
jluiselli
1fa503cc4f changed views to class 2020-09-16 15:38:38 +02:00
Juliette Luiselli
6a9a47fcea Merge branch 'thubrecht/css-forms' into 'master'
Thubrecht/css forms

See merge request klub-dev-ens/annuaire!8
2020-09-16 11:29:09 +02:00
Tom Hubrecht
ed99f361c4 Merge branch 'master' into 'thubrecht/css-forms'
# Conflicts:
#   fiches/templates/fiches/fiches_modif.html
#   fiches/views.py
2020-09-16 11:27:59 +02:00
Juliette Luiselli
0f7f1d9338 Merge branch 'kerl/fix_image_upload' into 'master'
Gère l'upload de la photo sur la page pour modifier sa fiche annuaire

See merge request klub-dev-ens/annuaire!7
2020-09-16 11:10:18 +02:00
Tom Hubrecht
b6c956380e Prépare la traduction de l'annuaire 2020-09-16 01:53:43 +02:00
Tom Hubrecht
a5fc8c20f2 Page des anniversaires, il faudra implémenter une méthode age pour obtenir l'age d'un profil à son prochain anniversaire 2020-09-16 01:27:24 +02:00
Tom Hubrecht
4f8374318b Formulaire de la page d'accueil 2020-09-16 01:20:53 +02:00
Tom Hubrecht
e6593d4b14 Nouvelle page de vue de fiche d'annuaire 2020-09-16 00:53:44 +02:00
Tom Hubrecht
07d89aba67 Intégration du formulaire dans la page de modif 2020-09-16 00:14:21 +02:00
Martin Pépin
dcef95d5d4
Handle file upload when editing a fiche 2020-09-15 21:10:36 +02:00
jluiselli
fe6019e5f0 added CSS (Merci Camille!) 2020-09-15 15:33:13 +02:00
jluiselli
f8f353f3e2 working auth with CAS 2020-09-15 13:32:11 +02:00
Juliette Luiselli
bb06a2a084 Update README.md 2020-09-11 13:41:53 +02:00
Ludovic Stephan
afa2a7511a Merge branch 'pronom' into 'master'
Pronom

Closes #13, #12, #16, #15, and #18

See merge request klub-dev-ens/annuaire!6
2020-02-21 20:49:00 +01:00
Ju Luiselli
4ba86cddc1 init README 2020-02-21 19:30:36 +00:00
Ju Luiselli
67b23051b6 corrected migration 2020-02-19 21:51:27 +00:00
Ju Luiselli
843704c7f8 give space to pronouns 2020-02-19 21:25:42 +00:00
Ju Luiselli
e20cdf5977 added plural 2020-02-19 21:17:30 +00:00
Ludovic Stephan
67a553382a Merge branch 'ju' into 'master'
Ju

Closes #11

See merge request klub-dev-ens/annuaire!5
2020-02-19 22:12:01 +01:00
Ju Luiselli
360afc83b6 cleaned gitignore 2020-02-19 21:06:23 +00:00
Ju Luiselli
414a1c8fe9 enables to display profile without pictures 2020-02-19 20:46:01 +00:00
Ju Luiselli
715566db8a added pronoun to fields 2020-02-19 20:42:36 +00:00
Ju Luiselli
316a9448a4 conflicts resolved 2020-02-19 20:15:07 +00:00
Ju Luiselli
5b398c223e send mail upon modification 2020-02-19 20:08:38 +00:00
Ju Luiselli
1cf12421f0 added CAS authentification 2020-02-19 20:06:22 +00:00
Ju Luiselli
6d6be7ddf2 send mail upon modification 2020-02-13 00:11:28 +01:00
Ju Luiselli
14bc4927ed added CAS authentification 2020-02-12 23:26:09 +01:00
Martin Pepin
49a5675bd7 Merge branch '4-page-des-anniversaires' into 'master'
Resolve "Page des anniversaires"

Closes #4

See merge request klub-dev-ens/annuaire!3
2020-02-08 14:56:33 +01:00
Ju Luiselli
8a2afe3893 flake8 2020-02-08 14:48:44 +01:00
Ju Luiselli
35720d3d96 corrected models 2020-02-08 14:16:51 +01:00
Ju Luiselli
183801ae3f Added birthday page 2020-02-08 14:15:12 +01:00
Ju Luiselli
6ff754a882 added dep and promotion to results 2020-02-08 14:15:12 +01:00
Ju Luiselli
0a3e9b28df Added birthday page 2020-02-08 14:10:14 +01:00
Ju Luiselli
df06c5d2a4 added dep and promotion to results 2020-02-08 11:32:47 +01:00
Martin Pepin
c6f134c31d Merge branch 'ju' into 'master'
Recherche basique, visualisation d'une fiche et édition se sa fiche

Closes #3 and #2

See merge request klub-dev-ens/annuaire!2
2020-02-08 11:17:21 +01:00
Ju Luiselli
a360ebcae6 added nickname to search 2020-02-08 11:15:43 +01:00
Ju Luiselli
49fa15eb23 finer research function 2020-02-08 11:02:39 +01:00
Martin Pépin
cac6bd390b
Cosmetic whitespace changes 2020-01-27 19:58:25 +01:00
Ju Luiselli
674d41172e added basic search function 2020-01-15 21:27:37 +01:00
Ju Luiselli
47dd122603 added profile editing 2020-01-15 20:58:10 +01:00
Ju Luiselli
39a69c4d95 Added mails & adresse 2020-01-09 00:13:07 +01:00
Ju Luiselli
20c1c5581d Problems with Django3 2020-01-08 23:50:09 +01:00
Ju Luiselli
92eb85c790 Merge branch 'ju' of git.eleves.ens.fr:klub-dev-ens/annuaire into ju 2020-01-08 23:41:51 +01:00
Ju Luiselli
9247f734b2 Added requirements to project 2020-01-08 23:36:03 +01:00
Juliette Luiselli
a672e439e8 page fiche (html) 2019-04-08 21:47:50 +02:00
Juliette Luiselli
9f254fc839 add import 2019-04-08 20:07:38 +02:00
Juliette Luiselli
6f9b9e4127 html page d'accueil et css 2019-03-25 22:30:25 +01:00
Martin Pepin
ae2d909b7c Merge branch 'ju/profile' into 'master'
ajout de modèles

See merge request klub-dev-ens/annuaire!1
2019-02-18 22:08:57 +01:00
Juliette Luiselli
f4e86ee849 fields made optional 2019-02-18 22:06:48 +01:00