rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-12-25 00:13:45 +00:00
Code Issues Releases Wiki Activity
2479 commits 211 branches 14 tags 12 MiB
Commit graph

357 commits

Author SHA1 Message Date
Charlie Jacomme
fbb2c59722 Support old hashes, md5/crypt 2018-08-04 16:58:42 +02:00
Charlie Jacomme
5dab70ccee Add machines.models.Role 2018-08-02 23:28:43 +02:00
Laouen Fernet
0ed68194d7 add model PortProfile 2018-08-02 20:29:14 +02:00
David_5.1
19da3ce341 Remove useless space. 2018-08-01 18:57:17 +02:00
chirac
98c1e8cfe1 Remove 5 indentation views.py 2018-08-01 18:57:17 +02:00
chirac
8abff4c35c Update contact.html 2018-08-01 18:57:17 +02:00
chirac
5b61d8991e Update views.py 2018-08-01 18:48:23 +02:00
Grizzly
15571e79a1 oubli du fichier urls 2018-08-01 18:48:23 +02:00
grisel-davy
5c1d2a6b90 Page de contact coté utilisateur 2018-08-01 18:48:23 +02:00
grisel-davy
38edf3b0eb Création, modification, suppression d'adresses mail de contact 2018-08-01 18:48:23 +02:00
chirac
53079c0a9e Fix acl.py lower 2018-07-28 23:13:51 +02:00
Hugo LEVY-FALK
b5513db8ae Suppression du dictionnaire de mort dans re2o/templatetags/acl.py 2018-07-26 20:11:13 +02:00
Grizzly
2e1f4fa425 deplacement du templatetags et nettoyage du template 2018-07-23 13:17:29 +00:00
chirac
a84e8b5575 Merge branch 'fix_65_history' into 'master' 
fix #65, gestion propre de l'historique.

Closes #65

See merge request federez/re2o!186
 2018-07-22 22:22:19 +02:00
Hugo LEVY-FALK
8d6439f13b Regroupement avec l'erreur 500. 2018-07-20 20:12:03 +02:00
Hugo LEVY-FALK
6b945bf322 fix #65, gestion propre de l'historique. 2018-07-19 12:30:15 +02:00
Hugo LEVY-FALK
17da4a52dc Support de postgreSQL pour AESENCryptedField 2018-07-12 14:42:13 +02:00
Hugo LEVY-FALK
f99d2cef60 Rend le aes_field disponible pour tout le monde et mon chibracounet facilement 2018-07-12 14:42:13 +02:00
Maël Kervella
08157c4565 Add context processor to get the current date 2018-07-12 12:19:26 +00:00
Maël Kervella
c82e17d5fd Add support for django-debug-toolbar 2018-06-24 22:09:36 +00:00
klafyvel
17f3867371 Merge branch 'master' into 'clean_api_duplicate' 
# Conflicts:
#   CHANGELOG.md
 2018-06-24 22:57:15 +02:00
Maël Kervella
6367944a5e Translate base HTML page 2018-06-23 17:12:32 +00:00
Maël Kervella
ceb2c86d74 Fix #60: Change context variable so it does not get overriden by django-auth views 2018-06-22 19:22:40 +00:00
Maël Kervella
55c1da241a Support translation on home page 2018-06-22 19:22:40 +00:00
Maël Kervella
6b777754e5 API: Add tests 2018-06-20 11:38:58 +00:00
Maël Kervella
6562f32ebf Add token authentication with expiration of tokens 2018-06-20 11:38:58 +00:00
Maël Kervella
0c7e944b07 Add permission for API view 2018-06-20 11:38:58 +00:00
Maël Kervella
510a0c9b43 Isolate API settings from project settings 2018-06-20 11:38:58 +00:00
Maël Kervella
d190ef00ce Std API for user 2018-06-20 11:38:58 +00:00
Maël Kervella
e4e592a71a Ajoute une fonction 'update-settings' + cleanup 2018-05-23 15:31:58 +00:00
chirac
fbd7c3de49 Revert "Merge branch 'fix_room_force_move_in' into 'master'" 
This reverts merge request !161
 2018-05-14 23:58:05 +02:00
Gabriel Detraz
eebb02c989 Merge branch 'master' into graph_topo 2018-05-14 20:38:37 +02:00
Hugo LEVY-FALK
de75e7bb27 Utilisation du packet debian pour bootstrap 2018-05-13 17:54:48 +02:00
Yoann Pietri
dc999b80b5 Utilisation du paquet Debian pour le js 2018-05-13 17:54:48 +02:00
Yoann Pietri
39e96bc53d Datetimepicker pour les bans et whitelists 2018-05-13 17:54:48 +02:00
Gabriel Detraz
c62a1ac30e Merge branch 'master' into graph_topo 2018-05-11 19:27:27 +02:00
Gabriel Detraz
e690292e77 Merge branch 'master' into graph_topo 2018-05-11 18:54:28 +02:00
chirac
d27d670571 Merge branch 'validation' into 'master' 
Fix #100 : validation des factures plus explicite

Closes #100

See merge request federez/re2o!158
 2018-05-10 22:33:19 +02:00
lebouder
f88597967d Fix #100 : validation des factures plus explicite 2018-05-10 22:28:27 +02:00
chirac
e064db626d Merge branch 'Fix_116' into 'master' 
Fix #116: Remove default SOA in Extension & Force reversion context

Closes #116

See merge request federez/re2o!147
 2018-05-10 21:51:26 +02:00
Hugo LEVY-FALK
5c254fa026 factorise les can_view_app 2018-05-07 22:01:32 +02:00
Hugo LEVY-FALK
664fb7ae00 Utilisation de inutile. 2018-05-07 20:24:04 +02:00
Hugo LEVY-FALK
f7d7a41586 Autorise plusieurs apps dans can_view_app 2018-05-07 19:33:06 +02:00
Hugo LEVY-FALK
84a901e3fc Documentation des décorateurs d'ACL 2018-05-07 18:57:08 +02:00
Hugo LEVY-FALK
586321fd8a Un seul décorateur pour les gouverner (presque) tous. 2018-05-07 17:22:00 +02:00
Maël Kervella
8c2b2ca8df Fix #111 properly 2018-05-03 12:57:43 +00:00
chirac
34d29349ed Merge branch 'paginateur' into 'master' 
Fixe #111: Supression du paginateur si page unique

See merge request federez/re2o!151
 2018-05-03 13:49:39 +02:00
grisel-davy
5575995437 Fixe #111: Supression du paginateur si page unique 2018-05-03 13:45:13 +02:00
Maël Kervella
5eaa9a2feb Fix #116: Remove default SOA in Extension & Force reversion context 
- The default for extension SOA is now None, else a new SOA named `SOA
to edit` was created when adding a new extension (because of the
get_or_create() )
- The mixins are now inside a reversion context else sometimes the
reversion context was not set and re2o would crash on the set_comment
 2018-04-29 16:34:05 +00:00
Maël Kervella
090c838381 Take locale datetime formats into account in help text 2018-04-26 13:08:04 +00:00
Gabriel Detraz
9f153c49d8 Ca me broute donc je fais simple 2018-04-25 18:39:13 +02:00
Gabriel Detraz
2c02a9fb6b Factorise + fonctions pour recup switch et building d'une machine 2018-04-25 08:37:04 +02:00
Maël Kervella
8003634563 Add warning button: translation in dev 2018-04-18 20:13:11 +00:00
Maël Kervella
9569e22df9 Set language button 2018-04-18 15:49:03 +00:00
grizzly
39d8340e6c Merge branch 'twitter_and_fb' into 'master' 
Twitter and fb

See merge request federez/re2o!138
 2018-04-16 18:37:55 +02:00
chirac
5453b845e2 Merge branch 'fix_stack' into 'master' 
Fix stack

Closes #104 and #108

See merge request federez/re2o!140
 2018-04-16 18:26:04 +02:00
Gabriel Detraz
f38c12fcc3 Accueil -> Home 2018-04-16 18:23:04 +02:00
Gabriel Detraz
e515360936 Oublie du fichier de génération de la page d'accueil 2018-04-16 06:42:17 +02:00
Gabriel Detraz
b118e1199e Fix #108 2018-04-16 05:28:47 +02:00
Maël Kervella
48030d9a53 Let use HTML tags in asso description 2018-04-15 18:51:04 +00:00
moamoak
21bfbed542 Merge branch 'fix_upload_img' into 'master' 
Fix no img file

See merge request federez/re2o!134
 2018-04-15 20:19:53 +02:00
Maël Kervella
a639e6a809 Do not display <img> on home page services when no image 2018-04-15 18:16:50 +00:00
Gabriel Detraz
68830f2e64 Fix no img file 2018-04-15 19:44:23 +02:00
Maël Kervella
1225af69bd Add custom Error 500 page 2018-04-15 17:30:46 +00:00
Maël Kervella
98eae95632 Avoid duplicate settings and keeps comments 2018-04-15 17:26:28 +00:00
Gabriel Detraz
2337a24997 Fix #106 2018-04-15 19:09:37 +02:00
Maël Kervella
f7f8f7493b Fix : various little things 2018-04-15 13:34:51 +00:00
Maël Kervella
2ca271bf82 Pylint compliance on re2o 2018-04-15 10:52:27 +00:00
Maël Kervella
48d904b6de Pep8 compliance on re2o 2018-04-15 10:52:26 +00:00
chirac
f2929baaef Update settings.py 2018-04-14 17:14:32 +02:00
Maël Kervella
9067582118 Remove multiple try/except for getting git info 2018-04-11 13:29:14 +00:00
Maël Kervella
ce8fa57747 Add cache for about view 2018-04-11 11:41:00 +00:00
Maël Kervella
7d54c10c29 Add many information on about page 2018-04-11 11:41:00 +00:00
klafyvel
33a75494e4 Merge branch 'maj_crans' into 'master' 
Maj crans

See merge request federez/re2o!115
 2018-04-09 23:31:51 +02:00
Maël Kervella
aa02016c3a Translation: Setup re2o to use locale and add French 2018-04-08 21:00:12 +00:00
Gabriel Detraz
a621d378ec Remplace location par bayswitch 2018-04-08 04:13:14 +02:00
Gabriel Detraz
bc1267e8f8 Gestion complète de la baie de brassage, menu d'edition des switchs membres 2018-04-08 04:02:12 +02:00
Gabriel Detraz
3f05b27f3b Modele pour les baies de switchs 2018-04-07 20:45:45 +02:00
Gabriel Detraz
3affe08d29 Factorisation de paginator + pagination des machines dans profil 2018-04-03 05:01:01 +02:00
Gabriel Detraz
b748a3003a Merge branch 'aff_port_naturel' into 'master' 
Aff port naturel

See merge request nounous/re2o!21
 2018-04-02 20:21:01 +02:00
Gabriel Detraz
f39ae95b35 Fix historique alias 2018-04-02 04:31:34 +02:00
Gabriel Detraz
88b003d0fe Remplace "cableur" par effectué par 2018-04-02 03:39:03 +02:00
Gabriel Detraz
5596abf4df Affichage des objets liés quand c'est necessaire (interfaces-machines-domain) 2018-04-02 03:36:54 +02:00
Gabriel Detraz
a553789bad Draft : on save que si l'objet a été modifié 2018-03-31 18:10:43 +02:00
Gabriel Detraz
1795d26c55 Gestion de l'historique avec un mixin forms et model 2018-03-31 17:19:02 +02:00
Gabriel Detraz
83c59d29c6 Merge branch 'acl_mixins' into 'master' 
Doc pour acl mixins

See merge request nounous/re2o!20
 2018-03-29 14:58:47 +02:00
Gabriel Detraz
8fe0c8776f Doc pour acl mixins 2018-03-29 14:56:17 +02:00
Gabriel Detraz
db74a5c496 Merge branch 'arcas' into 'master' 
Arcas

See merge request nounous/re2o!16
 2018-03-29 14:26:21 +02:00
Gabriel Detraz
c9fd4cd7b5 Fix acl mixin sur users, docstring, fix topologie acl 2018-03-29 04:36:23 +02:00
Gabriel Detraz
12cf400e2a Shell -> ListShell 2018-03-28 20:46:33 +02:00
Gabriel Detraz
f91feff0fc Fix divers nas et ap 2018-03-28 19:59:51 +02:00
Gabriel Detraz
3a253f3874 Adapte history pour le acl_mixin 2018-03-28 18:04:46 +02:00
Gabriel Detraz
007ad3310a Factorise les get_instance dans le mixin acl 2018-03-28 17:15:45 +02:00
Gabriel Detraz
ef1dbc882b Poc de acl mixin, factorisation du code 2018-03-28 03:52:34 +02:00
Gabriel Detraz
2966547b19 Paginateur sur school + tableaux responsives + fix divers 2018-03-27 23:56:46 +02:00
Gabriel Detraz
004f6099f5 Switchs héritent de machines 2018-03-26 05:12:29 +02:00
Gabriel Detraz
119416cc4f Bornes hérite de machine 2018-03-26 03:10:14 +02:00
Gabriel Detraz
297e300abe Rename Borne en AccessPoint 2018-03-26 00:08:46 +02:00
Lev-Arcady Sellem
64e3a9e7c2 Remplissage d'un formulaire depuis la ligne de commande 
Attention, ne prend pas encore en charge les cases à cocher/sélectionner,
seulement les champs textuels et les champs cachés
 2018-03-25 19:20:59 +02:00
Lev-Arcady Sellem
d7869d44cd Récupération de l'utilisateur système 2018-03-25 19:18:40 +02:00