rezometz/re2o
8
0
Fork 0
mirror of https://gitlab2.federez.net/re2o/re2o synced 2024-11-05 01:16:27 +00:00
Code Issues Releases Wiki Activity
1490 commits 211 branches 14 tags 12 MiB
Commit graph

1490 commits

This branch
This branch
All branches
Author SHA1 Message Date
Maël Kervella
f9af3fad8b Fix generate img when spaces in names 2018-05-21 21:50:11 +00:00
grisel-davy
93a9ce630f Fichier dot temporaire 2018-05-21 22:05:31 +02:00
grisel-davy
8cc1841f69 ajout des migrations 2018-05-21 21:19:10 +02:00
grisel-davy
d8f139c207 Récupération de code 2018-05-21 21:13:44 +02:00
grisel-davy
7e3e27be90 Docstring reST style 2018-05-20 11:42:35 +02:00
grisel-davy
33d5df19a5 Doc et commentaires 2018-05-19 21:20:55 +02:00
grisel-davy
7f6729c2a7 bug list vide 2018-05-16 23:59:51 +02:00
chirac
1ca1b28a36 Merge branch 'revert-9d6562d1' into 'master' 
Revert "Merge branch 'fix_room_force_move_in' into 'master'"

See merge request federez/re2o!162
 2018-05-14 23:58:57 +02: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
chirac
9d6562d154 Merge branch 'fix_room_force_move_in' into 'master' 
Fix room force move in

See merge request federez/re2o!161
 2018-05-14 23:27:25 +02:00
Hugo LEVY-FALK
c1ceb5e2b3 fix de l'emménagement forcé 2018-05-14 23:16:36 +02:00
Gabriel Detraz
eebb02c989 Merge branch 'master' into graph_topo 2018-05-14 20:38:37 +02:00
grisel-davy
47d4cee55a Gestion des boucles dans le graph et des doublons dans les liens 2018-05-14 20:03:04 +02:00
chirac
b940dfbff3 Merge branch 'datepicker' into 'master' 
Datepicker

See merge request federez/re2o!160
 2018-05-13 21:03:13 +02:00
Yoann Pietri
5757a1e911 Avec le name ça marche mieux 2018-05-13 17:54:48 +02:00
Hugo LEVY-FALK
838c5999b1 Suppression de bootstrap qui sert à rien du coup 2018-05-13 17:54:48 +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
root
c693f9f5ba Création du widget datetimeinput 2018-05-13 17:54:18 +02:00
Gabriel Detraz
b2d57ec827 Refactor de la fonction gen_graph + graph quand modification des objets 2018-05-11 23:18:25 +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
Gabriel Detraz
a975efd7ff Remaniement du code make_machine_graph 2018-05-11 18:53:10 +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
chirac
add24d5c7d Merge branch 'moamoak/js_shortcuts' into 'master' 
Add CTRL+K and CTRL+L shortcuts

See merge request federez/re2o!156
 2018-05-10 12:14:20 +02:00
Maël Kervella
60337ee203 Add CTRL+K and CTRL+L shortcuts 2018-05-09 15:03:15 +00:00
moamoak
05bc645a65 Merge branch 'fix_121_prettier_ACL_decorators' into 'master' 
Fix #121 prettier acl decorators

Closes #121

See merge request federez/re2o!155
 2018-05-07 22:50:23 +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
b1ac9fffbb PEP 8 pour preferences/views.py 2018-05-07 20:03:12 +02:00
Hugo LEVY-FALK
a61d8d6ebd Factorisation des décorateurs ACL dans les vues. Fix #121 2018-05-07 19:43:53 +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
chirac
1955229842 Merge branch 'Fix_111_properly' into 'master' 
Fix #111 properly

Closes #111

See merge request federez/re2o!154
 2018-05-05 16:06:31 +02:00
Maël Kervella
8c2b2ca8df Fix #111 properly 2018-05-03 12:57:43 +00:00
chirac
dcd1e2af96 Merge branch 'fix_110_display_superuser' into 'master' 
Fix #110 display superuser

Closes #110

See merge request federez/re2o!150
 2018-05-03 14:42:44 +02:00
Hugo LEVY-FALK
a5013920da ACL 2018-05-03 14:22:52 +02:00
Hugo LEVY-FALK
9d79ffb5ca Plus de BÔTÉ dans l'affichage des superusers 2018-05-03 14:08:05 +02: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
Hugo LEVY-FALK
8a19977757 Ne réinvente pas la roue 2018-05-03 11:55:34 +02:00
klafyvel
f62178bebb Merge branch 'fix_ns' into 'master' 
Fix #119 : Plusieurs NS peuvent avoir le meme origin

Closes #119

See merge request federez/re2o!149
 2018-05-03 11:00:43 +02:00
Hugo LEVY-FALK
4a5fd06ace Ajout de superusers 2018-05-03 10:56:21 +02:00
Hugo LEVY-FALK
6f3fc983ac Suppression de superuser 2018-05-03 10:26:17 +02:00
chirac
94cea4e7c3 Merge branch 'fix_#114' into 'master' 
Fix #114: Take locale datetime formats into account in help text

Closes #114

See merge request federez/re2o!144
 2018-05-03 06:47:37 +02:00
Gabriel Detraz
28393797e4 Et la migration 2018-05-03 06:42:59 +02:00