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

2210 commits

Author SHA1 Message Date
Maël Kervella
6562f32ebf Add token authentication with expiration of tokens 2018-06-20 11:38:58 +00:00
Maël Kervella
a5715d69b6 Include 'use_api' permission in the api.acl module 2018-06-20 11:38:58 +00:00
Maël Kervella
0be63ad58e Use the use_api permission to access API 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
6478a0aed9 Add ACL permission on API 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
chirac
998d093cac Merge branch 'rm_whitlist' into 'master'
Rm whitlist

See merge request federez/re2o!175
2018-06-19 14:34:17 +02:00
chirac
23001bf323 Merge branch 'rm_banissement' into 'master'
Rm banissement

See merge request federez/re2o!173
2018-06-19 14:33:45 +02:00
moamoak
839d88a0c4 Merge branch 'Fix_130' into 'master'
Fix #130: Check the right value for need_infra filtering

Closes #130

See merge request federez/re2o!171
2018-06-18 14:04:35 +02:00
moamoak
82e0dc8c50 Merge branch 'dropdown-responsiv' into 'master'
Gere mieux l'affichage du menu dropdown sur les petits ecrans

Closes #85

See merge request federez/re2o!170
2018-06-18 11:16:30 +02:00
Grizzly
3e244b8ba9 Ajout d'un bouton pour supprimer les accés gracieux 2018-06-17 13:12:12 +00:00
klafyvel
12af239f64 Revert "Fix les erreurs d'affichage lors du paiement"
This reverts commit 9cae582201
2018-06-17 15:04:05 +02:00
klafyvel
c7adc15e34 Revert "Fix du AESEncryptedField"
This reverts commit f02e6c6e1f
2018-06-17 15:03:43 +02:00
Hugo LEVY-FALK
f02e6c6e1f Fix du AESEncryptedField 2018-06-17 14:57:11 +02:00
Hugo LEVY-FALK
9cae582201 Fix les erreurs d'affichage lors du paiement 2018-06-17 14:44:58 +02:00
Grizzly
4252f84398 Ajout d'un bouton de supression des banissements 2018-06-17 12:13:10 +00:00
Maël Kervella
7f25212a05 Force the dropdown of edit machine to be align with the edit button 2018-06-16 13:29:47 +00:00
Maël Kervella
8573e2b8d1 Fix #130: Check the right value for need_infra filtering 2018-06-05 18:50:22 +00:00
moamoak
09d7baba5f Merge branch 'fix_acl' into 'master'
Fix acl search pour phabricator

See merge request federez/re2o!157
2018-06-05 15:30:09 +02:00
Grizzly
f6b04a186a Gere mieux l'affichage du menu dropdown sur les petits ecrans 2018-06-03 15:53:19 +00:00
chirac
2703cb94ba Merge branch 'graph_topo' into 'master'
suppression des doubles liens

See merge request federez/re2o!168
2018-05-30 22:15:22 +02:00
grizzly
684134f351 suppression des doubles liens 2018-05-30 22:11:27 +02:00
chirac
956634dd3e Merge branch 'nom_colonne_baies' into 'master'
Nom colonne baies

Closes #125 and #122

See merge request federez/re2o!166
2018-05-30 12:19:29 +02:00
chirac
f439da2872 Merge branch 'fix_127' into 'master'
Fix #127 and remove duplicate migration

Closes #127

See merge request federez/re2o!165
2018-05-29 16:46:30 +02:00
Grizzly
56cf0688c6 Changement du nom de la colonne 2018-05-28 20:43:10 +00:00
Maël Kervella
a926b28bbc Fix #127 and remove duplicate migration 2018-05-28 10:03:15 +00:00
chirac
4c8848876b Update schema.ldiff fix federez 2018-05-28 09:47:35 +00:00
Gabriel Detraz
dce287bcd3 Fix acl search pour phabricator 2018-05-28 09:46:07 +00:00
chirac
acb41cf375 Merge branch 'Fix_install_re2o' into 'master'
Fix install re2o

Closes #122

See merge request federez/re2o!163
2018-05-27 20:42:57 +02:00
root
35eaff6160 Merge branch 'Fix_install_re2o' of https://gitlab.federez.net/federez/re2o into Fix_install_re2o 2018-05-26 15:37:50 +00:00
Maël Kervella
a884f36fcb Utilise des fichiers de requirements 2018-05-23 15:31:58 +00:00
Maël Kervella
3b706722f7 Update changelog and readme 2018-05-23 15:31:58 +00:00
Maël Kervella
38bf10ab99 Typo and use _ask_value everywhere 2018-05-23 15:31:58 +00:00
Maël Kervella
ccc741f7f5 Remove update-settings from update subcommand 2018-05-23 15:31:58 +00:00
Maël Kervella
f81d94ea28 Reset BDD provoque apply migrations et collect statics 2018-05-23 15:31:58 +00:00
Maël Kervella
1541434e8f Update help subcommand in install_re2o.sh 2018-05-23 15:31:58 +00:00
Maël Kervella
ddc87ded36 Fix invisible character 2018-05-23 15:31:58 +00:00
Maël Kervella
a5006fae93 Fix wrong variable name 2018-05-23 15:31:58 +00:00
Maël Kervella
e4e592a71a Ajoute une fonction 'update-settings' + cleanup 2018-05-23 15:31:58 +00:00
Maël Kervella
8f1ec6979b Add install_re2o subcommands 2018-05-23 15:31:58 +00:00
Maël Kervella
03aaba1545 Split install_re2o.sh into functions 2018-05-23 15:31:58 +00:00
Maël Kervella
fa9a6f7173 Remove input from collectstatic 2018-05-23 15:31:58 +00:00
Maël Kervella
213b52934c Update for javascript-common conf and add commands to changelog 2018-05-23 15:31:58 +00:00
Maël Kervella
8ac96d1d59 Fixes and improvements in install_re2o.sh 2018-05-23 15:31:58 +00:00
Maël Kervella
4963ec3c1b Comments, cleanup, reorder and echo in install_re2o.sh 2018-05-23 15:31:58 +00:00
Maël Kervella
0fe734e097 More blabla on install_re2o.sh 2018-05-23 15:31:58 +00:00
Maël Kervella
6646293ec8 Fix #122 + translation in install_re2o.sh 2018-05-23 15:31:58 +00:00
Maël Kervella
d797f18ace Fix install script 2018-05-23 15:31:58 +00:00
chirac
d610ac6d93 Merge branch 'graph_topo' into 'master'
branche de création de graph

See merge request federez/re2o!164
2018-05-23 12:05:43 +02:00