Commit graph

6829 commits

Author SHA1 Message Date
Pierre de La Morinerie
1c7ad4d37b dossier spec: rename user to owner
This makes the distinction between the invited user and the owner 
clearer.
2018-09-25 11:39:31 +02:00
Pierre de La Morinerie
fe4921bf8e dossier spec: deprecate the old UI tests 2018-09-25 11:39:31 +02:00
Pierre de La Morinerie
c534a9a792 dossier spec: extract the dossier edition behaviors to a shared spec
This will allow to test behavior for invited users.
2018-09-25 11:39:31 +02:00
Pierre de La Morinerie
df2bbba201 dossier spec: create a simple_procedure factory 2018-09-25 11:39:30 +02:00
Pierre de La Morinerie
2b2dbcb112 dossier spec: move visit_dossier to a before block 2018-09-25 11:38:30 +02:00
Frederic Merizen
3445d0b3f7
Merge pull request #2641 from betagouv/frederic/type_de_champ_sti
[#1421] Use delegation rather than STI for TypeDeChamp
2018-09-25 09:00:12 +02:00
Frederic Merizen
9beaa293cd [#1421] Use delegation rather than STI for TypeDeChamp 2018-09-25 08:26:56 +02:00
gregoirenovel
4bb00e9875
Merge pull request #2646 from betagouv/frederic/fix_2613-filtrage_date_creation_entreprise
fix filtrage date creation entreprise
2018-09-25 08:01:03 +02:00
Frederic Merizen
21587e6939
Merge pull request #2671 from betagouv/dev
MEP 2018-09-24-03
2018-09-24 23:24:38 +02:00
Frederic Merizen
a48ffef9dc [#2613] Clean up procedure presentation with entreprise table 2018-09-24 20:19:26 +02:00
Frederic Merizen
112fdb71fb [#2613] Remove dead code 2018-09-24 20:19:26 +02:00
Frederic Merizen
26ece1d144 [Fix #2613] Filter by date creation entreprise 2018-09-24 20:19:26 +02:00
Frederic Merizen
f4b95d3f40
Merge pull request #2640 from betagouv/frederic/fix_2622_instructeur_filter_json
Utilisation de colonnes JSONB par les filtres instructeur
2018-09-24 19:55:44 +02:00
Frederic Merizen
7d382837d9 [Fix #2622] Change filters to proper JSONB 2018-09-24 19:39:01 +02:00
Frederic Merizen
1419e9b73f [#2622] Change sort to proper JSONB 2018-09-24 19:39:01 +02:00
Frederic Merizen
68608307ad [#2622] Change displayed_fields to proper JSONB 2018-09-24 19:39:01 +02:00
Frederic Merizen
a3cb2356cf [#2622] Change DB schema to JSONB 2018-09-24 19:39:01 +02:00
gregoirenovel
0e8b1b9c01 Merge branch 'dev' 2018-09-24 18:13:57 +02:00
gregoirenovel
f402dc1bff
Merge pull request #2669 from betagouv/tour-de-france
Add the /tour-de-france page
2018-09-24 18:13:35 +02:00
gregoirenovel
5b011fef59 [Fix #2652] Add the /tour-de-france page 2018-09-24 18:07:29 +02:00
Pierre de La Morinerie
422d200280
Merge pull request #2643 from betagouv/new-dossier-fix-invites
[Dossier] Corrige les accès invités
2018-09-24 17:19:29 +02:00
Pierre de La Morinerie
23820988be fixup! dossier: allow inviting users on the dossier page 2018-09-24 17:12:15 +02:00
Pierre de La Morinerie
682e29a211 dossier: refactor the pages permissions
Fixes the invites not being able to create a commentaire.
2018-09-24 17:05:27 +02:00
Pierre de La Morinerie
a5419b2f08 dossier: fix redirection to dossiers/invite 2018-09-24 17:05:27 +02:00
Pierre de La Morinerie
01599ac1e1 dossier: allow inviting users on the dossier page 2018-09-24 17:05:26 +02:00
Pierre de La Morinerie
0995c8e5ad dossier: extract the invitation dropdown to a partial 2018-09-24 16:29:36 +02:00
gregoirenovel
4ce6ab4d8d Merge branch 'dev' 2018-09-24 15:24:46 +02:00
gregoirenovel
73ac6f24c3
Merge pull request #2667 from betagouv/fix-2665
[Fix #2665] Correction du footer de l'email d'invitation à donner son avis
2018-09-24 14:43:09 +02:00
gregoirenovel
f9d640d78d [Fix #2665] Fix the avis invitation email footer 2018-09-24 14:32:20 +02:00
gregoirenovel
5c1d7e1734
Merge pull request #2664 from betagouv/fix-187
[Fix #187] Allow an admin to delete their demarche logo
2018-09-24 14:27:53 +02:00
gregoirenovel
7b3a7d2336 [Fix #187] Allow an admin to delete their demarche logo 2018-09-24 13:29:35 +02:00
gregoirenovel
3268da02d5 Merge branch 'dev' 2018-09-24 12:32:31 +02:00
gregoirenovel
cea67efd44
Merge pull request #2662 from betagouv/fix-2332
[Fix #2332] Allow the notice deletion
2018-09-24 12:31:36 +02:00
gregoirenovel
94378e3663 [Fix #2332] Allow the notice deletion 2018-09-24 12:25:10 +02:00
gregoirenovel
a8bcc19044
Merge pull request #2659 from betagouv/fix-1511
Remplace l'ancien logo DS par une Marianne
2018-09-24 12:24:53 +02:00
gregoirenovel
89deb93e1d Remove marianne_small.png 2018-09-24 12:16:58 +02:00
gregoirenovel
5db408efdb [Fix #1511] Remove the now obsolete DS logo 2018-09-24 12:16:58 +02:00
gregoirenovel
7e21685e4e
Merge pull request #2655 from betagouv/fix-2648
[Fix #2648] Add more details about the retention time out of DS
2018-09-24 12:15:38 +02:00
gregoirenovel
0b0c668888 [Fix #2648] Add more details about the retention time out of DS 2018-09-24 12:09:54 +02:00
Pierre de La Morinerie
719ac06271
Merge pull request #2663 from betagouv/fix-1979
Fix #1979
2018-09-24 11:57:31 +02:00
gregoirenovel
535f9004bf Admins can delete the attestation template's logo 2018-09-24 10:15:22 +02:00
gregoirenovel
d649e29bb0 [Fix #1979] Admins can delete the attestation template's signature 2018-09-24 10:15:02 +02:00
gregoirenovel
370cb2e05e
Merge pull request #2656 from betagouv/fix-329
Fix #329
2018-09-23 22:45:04 +02:00
gregoirenovel
227006d87b [Fix #329] Properly translate the “password is too short” error 2018-09-23 22:39:01 +02:00
gregoirenovel
3c220fe181
Merge pull request #2657 from betagouv/fix-console-warning
Remove a warning in the console task
2018-09-23 22:38:31 +02:00
gregoirenovel
8fa3602bfc Remove a warning in the console task
Passing the environment's name as a regular
argument is deprecated and will be removed in the
next Rails version. Please, use the -e option
instead.
2018-09-23 22:29:55 +02:00
gregoirenovel
a5aac76140
Merge pull request #2658 from betagouv/demande-rework
Demande rework
2018-09-23 22:23:07 +02:00
gregoirenovel
ded9c0eaf6 Add a separator between the explanation and form 2018-09-23 21:52:13 +02:00
gregoirenovel
086bf8e203 Improve the spacing on the new demande page 2018-09-23 21:45:39 +02:00
gregoirenovel
477faf06d7 Add a title to the new demande page 2018-09-23 18:17:16 +02:00