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
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