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
1697 commits 211 branches 14 tags 12 MiB
Commit graph

306 commits

Author SHA1 Message Date
Grizzly
f34d0a9a3f oubli du fichier urls 2018-07-01 16:37:56 +00:00
Gabriel Detraz
0d6a0db366 Merge branch 'end_sub_mail' of https://gitlab.federez.net/federez/re2o into end_sub_mail 2018-07-01 15:13:34 +00:00
Gabriel Detraz
115c91caad Merge branch 'switch_conf_json' into crans 2018-07-01 15:23:04 +02:00
grisel-davy
e42b8f9be0 Page de contact coté utilisateur 2018-07-01 10:49:47 +02:00
grisel-davy
97eb065337 Création, modification, suppression d'adresses mail de contact 2018-06-30 19:19:40 +02:00
chirac
8e5d897615 Les champs mails sont dans users 2018-06-29 16:36:04 +02:00
Maxime Bombar
acc1106099 Printer is an optional app 2018-06-29 05:54:54 +02:00
Maxime Bombar
767ba17fc3 Printer App a beginning. 2018-06-28 20:20:08 +02:00
Charlie Jacomme
99bd78aabe Merge branch 'mail' into crans 2018-06-26 19:01:43 +02:00
Grizzly
b150663125 Crée des comptes mail et des alias mail 2018-06-26 16:46:57 +00:00
root
adc5757f51 Merge branch 'switch_conf_json' of https://gitlab.federez.net/federez/re2o into switch_conf_json 2018-06-26 15:23:38 +00:00
Charlie Jacomme
98c24d781a New DNAME model 2018-06-25 16:50:45 +02:00
root
8a7781884e Merge branch 'master' into crans 2018-06-25 13:06:52 +02:00
Maël Kervella
c82e17d5fd Add support for django-debug-toolbar 2018-06-24 22:09:36 +00:00
chirac
e45cab2f01 Merge branch 'master' into crans 2018-06-24 23:47:57 +02: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
chirac
f7b29453aa Ajout des modèles sshfingerprint et sshfingerprintalgo 2018-06-23 18:00:30 +02:00
Charlie Jacomme
a50afbdeac Add machines.models.Role 2018-06-23 18:00:30 +02:00
Laouen Fernet
7ab0d656c9 add model PortProfile 2018-06-23 02:25:55 +02: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
Gabriel Detraz
5a8888231d Ajoute le réglage reminder et factorise la liste des services 2018-05-06 19:11:54 +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