Commit graph

7730 commits

Author SHA1 Message Date
simon lehericey
959097ce8b DubiousProcedure: small style adjustement 2018-05-30 14:21:41 +02:00
simon lehericey
6eadea29bc [fix #1952] DubiousProcedure: add admin contact, procedure state and dossier count 2018-05-30 14:21:41 +02:00
simon lehericey
47cc0180bd DubiousProcedure: change forbidden keywords 2018-05-30 14:21:35 +02:00
gregoirenovel
6bec2f43a3 Merge branch 'dev' 2018-05-30 10:48:26 +02:00
Paul Chavard
6a8cd6da4e
Merge pull request #1944 from tchak/cerfa-pj
Convert CERFA to PJ
2018-05-29 15:08:35 +02:00
Paul Chavard
1e3bb352cd Convert CERFA to PJ 2018-05-29 15:00:24 +02:00
Paul Chavard
902e1a7bcb
Merge pull request #1978 from tchak/fix-procedure-archive
Do not attempt to archive already archived procedures
2018-05-29 15:00:04 +02:00
Paul Chavard
86b2cb211e Do not attempt to archive already archived procedures 2018-05-29 14:29:26 +02:00
Mathieu Magnin
1beafbbf7e
Merge pull request #1981 from betagouv/dev
MEP
2018-05-29 12:41:36 +02:00
Mathieu Magnin
a9b4ba2958
Merge pull request #1980 from betagouv/add-dossier-state-to-deletion-email
Add dossier state to deletion email
2018-05-29 12:23:15 +02:00
Mathieu Magnin
0f32821b27 Add dossier state to deletion email 2018-05-29 12:16:22 +02:00
Paul Chavard
4eabfde56d Merge remote-tracking branch 'upstream/dev' 2018-05-28 15:22:30 +02:00
Paul Chavard
50326b6827
Merge pull request #1974 from tchak/fix-clone-procedure
Fix clone procedure
2018-05-28 15:06:34 +02:00
Paul Chavard
87d7bd4fb2 Fix clone procedure 2018-05-28 14:58:40 +02:00
Frederic Merizen
a2fcf97694
Merge pull request #1973 from betagouv/frederic/fix-1972-async-mail
[Fix #1972] Envoyer les mails en asynchrone
2018-05-28 12:19:25 +02:00
Frederic Merizen
fd168c4a72 [Fix #1972] Make devise mails async 2018-05-28 12:02:13 +02:00
Frederic Merizen
07b1c147d9 [Fix #1972] Always send mails asynchronously 2018-05-28 12:02:13 +02:00
Frederic Merizen
cce00e19c6 [#1972] Avoid passing unsaved templates to ActionMailer
So that all mail arguments can be serialized
2018-05-28 12:02:13 +02:00
gregoirenovel
1fb85afdc7
Merge pull request #1965 from betagouv/gemfile-cleanup
Gemfile cleanup
2018-05-25 09:08:23 +02:00
gregoirenovel
a8ac59dd4c Remove constraint on rails 2018-05-24 18:17:34 +02:00
gregoirenovel
5a880b5663 Remove constraint on uglifier 2018-05-24 18:17:34 +02:00
gregoirenovel
cf0eec6cd6 Remove the fixed version for guard-livereload 2018-05-24 18:17:34 +02:00
gregoirenovel
b60c3b551b
Merge pull request #1966 from betagouv/api-entreprise
Simplify ApiEntrepriseService even further
2018-05-24 18:16:59 +02:00
gregoirenovel
3eab48c699 Simplify ApiEntrepriseService even further 2018-05-24 18:12:29 +02:00
gregoirenovel
c38705a890
Merge pull request #1967 from betagouv/fix-1801
Format links in procedure description (❤️ temps de review ~ 1 minute ❤️)
2018-05-24 18:12:00 +02:00
Mathieu Magnin
cf36d7f1ed [Fix #1801] use the new string_to_html method 2018-05-24 18:05:41 +02:00
Mathieu Magnin
152cf03d72 [Fix #1801] rename and move html_formatted_description in a generic helper 2018-05-24 18:05:00 +02:00
gregoirenovel
0635b50d70
Merge pull request #1838 from tchak/entreprise-association-object
Expose entreprise and association on etablissement
2018-05-24 18:00:04 +02:00
Paul Chavard
edc8e24ddd Update gestionnaire filters 2018-05-24 17:54:51 +02:00
Paul Chavard
66b83b4508 Remove unused alias 2018-05-24 17:54:51 +02:00
gregoirenovel
5d188c191d Move transform_keys calls directly to #process_params methods 2018-05-24 17:54:51 +02:00
gregoirenovel
a3fd271b00 Remove legacy
Update EtablissementUpdateJob
2018-05-24 17:54:51 +02:00
Paul Chavard
d99eed122d Use new models in controllers and views 2018-05-24 17:54:51 +02:00
Paul Chavard
753a81c2d3 Update tag substitution concern 2018-05-24 17:54:51 +02:00
Paul Chavard
3f249d6663 Remove unused decorators 2018-05-24 17:54:51 +02:00
Paul Chavard
ad24fd5991 Remove entreprise and rna_information models 2018-05-24 17:54:51 +02:00
Paul Chavard
81179ceba9 Update search view to search v3 2018-05-24 17:54:51 +02:00
gregoirenovel
93b1fd0da9
Merge pull request #1928 from tchak/procedure-state-scopes
Use aasm_state in scopes
2018-05-24 17:53:50 +02:00
Paul Chavard
7fb7d77886 Use aasm_state in scopes 2018-05-24 17:49:24 +02:00
gregoirenovel
3e27b761ec Merge branch 'dev' 2018-05-24 17:28:45 +02:00
gregoirenovel
311fb0d9e8
Merge pull request #1964 from betagouv/fix_1701_do_not_use_pipedrive_form
[fix #1701] Use DS form to enroll admin
2018-05-24 17:23:29 +02:00
simon lehericey
aaebcd3494 [fix #1701] Use DS form to enroll admin 2018-05-24 17:15:44 +02:00
gregoirenovel
0b19f1a8c5
Merge pull request #1963 from betagouv/fix-1931
[RGPD] [Fix #1931] User can ask support to delete dossier
2018-05-24 16:49:28 +02:00
Mathieu Magnin
aaf1bc0b99 [Fix #1931] User can ask support to delete dossier 2018-05-24 16:42:16 +02:00
Frederic Merizen
4cb9fe05e5
Merge pull request #1960 from betagouv/frederic/fix-1946/add-dossier-retention-time
[#1946] Add data retention times to Procedure
2018-05-24 13:54:41 +02:00
Frederic Merizen
79e35158e3 [#1946] Add data retention times to Procedure 2018-05-24 11:16:25 +02:00
Paul Chavard
7bf90e9076
Merge pull request #1927 from tchak/procedure-state
Refactor procedure state to use AASM
2018-05-23 17:53:05 +02:00
Paul Chavard
7070b0aba0 Fix tests to rely on aasm states 2018-05-23 16:31:27 +02:00
Paul Chavard
365bbe931b make propper state transitions in procedure traits 2018-05-23 16:31:27 +02:00
Paul Chavard
6345d5d153 Use new primitives in procedures controller 2018-05-23 16:31:27 +02:00