Commit graph

7242 commits

Author SHA1 Message Date
gregoirenovel
27460b55a3 Use the new merge with multiple arguments 2019-02-25 16:57:51 +01:00
gregoirenovel
6ae5ffb2c6 Use ruby 2.6 2019-02-25 16:57:50 +01:00
LeSim
8124035800
Merge pull request #3499 from betagouv/update-bootstrap-sass
Gem update bootstrap-sass (>= 3.4.1)
2019-02-25 13:42:34 +01:00
Mathieu Magnin
28fd9051d7 Gem update bootstrap-sass (>= 3.4.1) 2019-02-25 12:01:47 +01:00
Paul Chavard
4d9397f9d5
Merge pull request #3446 from betagouv/fix-3365
Fix 3365 formulaire de contact usager avec réponse automatique
2019-02-21 18:13:51 +01:00
Paul Chavard
146e8ba2aa Revrite with unobtrusive js 2019-02-21 18:05:47 +01:00
Chaïb Martinez
62d7e328c9 New design
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 17:50:58 +01:00
Chaïb Martinez
0a3d87f461 Texte change
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 17:50:58 +01:00
Chaïb Martinez
6f727f4cb1 Add responses messages
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 17:50:58 +01:00
Chaïb Martinez
e9c4ff41a7 Minor changes 2019-02-21 17:50:58 +01:00
Chaïb Martinez
7124965ba8 Add JS script 2019-02-21 17:50:58 +01:00
Chaïb Martinez
9edc7ab2be Minor css changes 2019-02-21 17:50:58 +01:00
Chaïb Martinez
93a0edcce0 Il y avait une issue crée, je push sur une nouvelle branche 2019-02-21 17:50:58 +01:00
Pierre de La Morinerie
0fdd197b98
Merge pull request #3489 from betagouv/philemon95-patch-2
Ajout d'un texte pour inciter les usagers à ne pas créer de compte admin
2019-02-21 17:16:23 +01:00
Pierre de La Morinerie
d384b6b07f card: add spacing to paragraphs 2019-02-21 16:49:16 +01:00
Pierre de La Morinerie
8f3d4de6c3 patron: don't override p style on the patron page
It adds a global styles that messes with the elements we are trying to
present.
2019-02-21 16:49:16 +01:00
philemon95
0820db0161 demande: add text to prevent users from creating an admin account 2019-02-21 16:49:16 +01:00
philemon95
fb5e24028f Update new.html.haml 2019-02-21 16:49:16 +01:00
Pierre de La Morinerie
9d1aea7bb8
Merge pull request #3481 from betagouv/fix-pj-link
pj_link: fix an exception when the scan is not associated yet
2019-02-21 16:29:41 +01:00
Pierre de La Morinerie
066672803b pj_link: fix an exception when the scan is not associated yet 2019-02-21 16:00:33 +01:00
Mathieu Magnin
5fa6778e49
Merge pull request #3419 from betagouv/fix-3370
Redesign admin roles menu
2019-02-21 15:24:25 +01:00
Chaïb Martinez
9f1c089b30 Minor css changes
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 15:09:34 +01:00
Chaïb Martinez
221ed952d1 Redesign admin roles menu 2019-02-21 14:53:49 +01:00
Chaïb Martinez
b532d6521e Add switch account type layout
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 14:53:49 +01:00
Chaïb Martinez
97fda013c0 Minor texte changes
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 14:53:49 +01:00
Chaïb Martinez
e29415d401 remove switch button
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-02-21 14:53:49 +01:00
Chaïb Martinez
2e2424ec3f Minor html/css change 2019-02-21 14:53:49 +01:00
Pierre de La Morinerie
d3ab6f8619
Merge pull request #3484 from Keirua/feat/3463-balise-nom-service
#3463 - Ajout d'une balise pour le nom du service
2019-02-21 12:50:03 +01:00
clemkeirua
71bff0812c ajout d'un test pour caractériser le cas service = null 2019-02-21 12:34:53 +01:00
clemkeirua
236f73f838 ajout d'une balise pour le nom du service 2019-02-21 12:18:44 +01:00
Pierre de La Morinerie
1f7d5b6541
Merge pull request #3488 from Keirua/doc/precisions-pour-les-tests
Doc: ajout de précisions concernant le lancement des tests
2019-02-21 12:14:25 +01:00
clemkeirua
aa8e28b2c0 ajout de précisions concernant les tests 2019-02-21 11:45:39 +01:00
Pierre de La Morinerie
7eb53459a6
Merge pull request #3433 from tchak/multi-admin
[#1626] Duplicate administrateur in the administrateurs array
2019-02-21 10:52:36 +01:00
Paul Chavard
12e93391c9 Task to add administrateur to administrateurs 2019-02-20 17:15:44 +01:00
Paul Chavard
84383fc3c1 Assigne admins to procedure.administrateurs 2019-02-20 17:10:57 +01:00
Pierre de La Morinerie
8085704d9f
Merge pull request #3482 from tchak/fix-champ-spec
Fix champ spec
2019-02-20 16:36:12 +01:00
Paul Chavard
a7ba01a02a Fix champ spec
fix #3257
2019-02-20 16:26:12 +01:00
Frederic Merizen
c1b47adbc2
Merge pull request #3480 from betagouv/revert-3473-philemon95-patch-1
Revert "Update _general_footer_row.html.haml"
2019-02-20 11:23:38 +01:00
Frederic Merizen
3f11f65d73
Revert "Update _general_footer_row.html.haml" 2019-02-20 11:17:40 +01:00
philemon95
2a716a1d3f
Merge pull request #3473 from betagouv/philemon95-patch-1
Update _general_footer_row.html.haml
2019-02-20 09:15:57 +01:00
philemon95
282b8048f5
Merge branch 'dev' into philemon95-patch-1 2019-02-19 18:24:57 +01:00
Pierre de La Morinerie
6883acfcc9
Merge pull request #3429 from betagouv/fix-3375
Fix 3375, do not expose an unsafe PJ
2019-02-19 18:16:28 +01:00
Mathieu Magnin
f7650135f4 [Fix #3375] on the API display safe files only 2019-02-19 18:10:35 +01:00
Pierre de La Morinerie
0dbe880f51
Merge pull request #3461 from betagouv/improve-uploaded-file-ui
Amélioration de l'UI des fichiers uploadés
2019-02-19 18:07:21 +01:00
Pierre de La Morinerie
ffda67c1d8 spec: add specs for attachments 2019-02-19 18:02:27 +01:00
Pierre de La Morinerie
a3c0f3ccd6 spec: wait for the page to be rendered before checking values 2019-02-19 18:02:27 +01:00
Pierre de La Morinerie
d51cc8bfa2 spec: fix ActiveRecord queue not being set 2019-02-19 18:02:27 +01:00
Pierre de La Morinerie
1f636e4d59 piece_justificative: toggle file upload control 2019-02-19 18:02:27 +01:00
Pierre de La Morinerie
ae5e8810a5 piece_justificative: style links as buttons, and improve layout 2019-02-19 18:02:27 +01:00
Pierre de La Morinerie
62ef02183c pj_link: add an "attachment" icon to the link 2019-02-19 18:02:27 +01:00