8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-22 19:33:11 +00:00
Commit graph

298 commits

Author SHA1 Message Date
Grizzly
27464ffa6f Crée des comptes mail et des alias mail 2018-07-30 15:03:50 +00: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
dc999b80b5 Utilisation du paquet Debian pour le js 2018-05-13 17:54:48 +02:00
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