Commit graph

5163 commits

Author SHA1 Message Date
Mathieu Magnin
235dfc0ab1
Merge pull request #1790 from betagouv/fix-1724
[Fix #1724] Fix carto
2018-04-04 14:05:44 +02:00
Mathieu Magnin
8c1c2f32ca [Fix #1724] Ensure that printed json is safe 2018-04-04 14:00:50 +02:00
LeSim
c670c0fbea
Merge pull request #1792 from betagouv/improve_individual_date_second_part
Individual: use birthdate as a  ... date :)
2018-04-04 13:52:18 +02:00
simon lehericey
c019cb623a Individual: use birthdate as a ... date :) 2018-04-04 13:19:39 +02:00
LeSim
b67b13aac8
Merge pull request #1791 from betagouv/missing_individual_part_in_old_controller
Individual: missing individual part in old controller
2018-04-04 13:15:35 +02:00
simon lehericey
1f536c94ab Individual: missing individual part in old controller 2018-04-04 12:25:54 +02:00
Paul Chavard
e347e23a01
Merge pull request #1767 from tchak/entreprises-mulinette
Entreprise/Association moulinettes™
2018-04-04 12:23:23 +02:00
Paul Chavard
51972ba728 Entreprise/Association moulinettes™ 2018-04-04 11:48:06 +02:00
gregoirenovel
0b86c22c91 Merge branch 'dev' 2018-04-04 11:14:41 +02:00
Frederic Merizen
f2ee041065
Merge pull request #1661 from betagouv/frederic/fix_1563/add_lien_attestation_template
#1563 : add lien attestation template
2018-04-04 11:06:41 +02:00
Frederic Merizen
3e56b6fe9b [#1563] Include attestation link in default closed mail when it makes sense 2018-04-04 10:44:40 +02:00
Frederic Merizen
db0937d1eb [#1563] Allow default template name to depend on procedure 2018-04-04 10:44:40 +02:00
Frederic Merizen
7bf7347b9c [#1563] Clarify constant’s role 2018-04-04 10:44:40 +02:00
Frederic Merizen
66aca60957 [#1563] Remove useless self keywords 2018-04-04 10:44:40 +02:00
Frederic Merizen
c94cc53985
Merge pull request #1659 from betagouv/frederic/fix_1563/add_lien_attestation_tag
#1563 : add lien attestation tag
2018-04-04 10:43:14 +02:00
Frederic Merizen
84c864ed11 [#1563] Add lien attestation link to closed mail template 2018-04-04 09:34:04 +02:00
Frederic Merizen
abf938ff1b [#1563] Generalise external link generation for mails 2018-04-04 09:34:04 +02:00
gregoirenovel
95cb1ec813
Merge pull request #1784 from betagouv/remove_individual_logic_from_old_controller
Remove individual logic from old controller
2018-04-03 23:07:18 +02:00
simon lehericey
46fd213ad2 Individual: old controller does not care about individual anymore 2018-04-03 21:16:54 +02:00
simon lehericey
9749365cc7 Etape2 individual: procedure with individual uses the new system 2018-04-03 18:39:48 +02:00
LeSim
eacb9d1c62
Merge pull request #1781 from betagouv/improve_individual_date
Improve individual date
2018-04-03 16:35:07 +02:00
simon lehericey
6370365fe4 Task: parse individual_date 2018-04-03 16:23:15 +02:00
simon lehericey
8828663880 Individual: save the birthdate in Y 2018-04-03 16:23:15 +02:00
simon lehericey
0093db18a1 Individual: add a second birthdate which is a date 2018-04-03 16:23:04 +02:00
gregoirenovel
9456bfaa80 Merge branch 'dev' 2018-04-03 15:57:42 +02:00
Paul Chavard
0bf389b849
Merge pull request #1771 from tchak/procedure-link
Show procedure link in manager view
2018-04-03 15:40:47 +02:00
Paul Chavard
ee5a3852b5 Show procedure link in manager view 2018-04-03 15:15:27 +02:00
Mathieu Magnin
bfed4dfb91
Merge pull request #1764 from betagouv/delete-flash
Remove a now useless flash message
2018-04-03 14:19:30 +02:00
gregoirenovel
3a3afc5797 Remove a now useless flash message 2018-04-03 14:12:56 +02:00
LeSim
44c0812dde
Merge pull request #1780 from betagouv/usager_ui_invite_tab
Usager ui invite tab
2018-04-03 13:38:59 +02:00
simon lehericey
ce2f076ace Dossiers show: add notification-col class to avoir weird display 2018-04-03 13:33:27 +02:00
simon lehericey
6fa4fc0046 DossierController: factorize page logic 2018-04-03 13:33:25 +02:00
simon lehericey
05ab4c5ca6 DossierController: add tab for dossiers invites 2018-04-03 13:32:41 +02:00
simon lehericey
0bff7abb0c User: add has many relation to dossiers_invites 2018-04-03 10:48:46 +02:00
simon lehericey
4a355f6776 Merge branch 'dev' 2018-03-30 17:15:09 +02:00
gregoirenovel
508304a2bf
Merge pull request #1777 from betagouv/fix_1755_module_carto
[fix_1755] clean cartographie polygones before save
2018-03-30 16:32:51 +02:00
simon lehericey
4ec6c72c96 [fix #1755] clean GeoJSON polygones before save 2018-03-30 16:15:30 +02:00
gregoirenovel
7ab38450f6
Merge pull request #1774 from betagouv/remove-tps
Remove any reference to our old name
2018-03-30 08:34:29 +02:00
gregoirenovel
fe333674a0 Remove any reference to our old name 2018-03-30 07:42:09 +02:00
gregoirenovel
846a2db661
Merge pull request #1770 from tchak/api-adapter-object
Give procedure_id to SIRETService
2018-03-29 18:10:42 +02:00
gregoirenovel
279d4c1631 Merge branch 'dev' 2018-03-29 18:02:22 +02:00
Paul Chavard
fd8674dffc Give procedure_id to SIRETService 2018-03-29 17:57:09 +02:00
Paul Chavard
1961c39f26
Merge pull request #1440 from tchak/sti-types-de-champs
STI types de champ et champs
2018-03-29 17:52:54 +02:00
Paul Chavard
9cc6d494a4 Spec STI loading champ/type de champ 2018-03-29 17:45:19 +02:00
Paul Chavard
a9f078265a Add STI types de champ models 2018-03-29 17:45:19 +02:00
Paul Chavard
e8f3fda1f0 Add STI champ models 2018-03-29 17:45:19 +02:00
Mathieu Magnin
8fe5c25c46
Merge pull request #1760 from betagouv/fix-1729
Fix 1729 remove <code> tags from mail templates
2018-03-29 17:39:50 +02:00
Mathieu Magnin
20fd7e52e6 [Fix #1729] Clean mail templates with <code> tags 2018-03-29 17:23:30 +02:00
Mathieu Magnin
acc68bc050 [Fix #1729] Do not allow <code> tags in template editors 2018-03-29 17:23:29 +02:00
Frederic Merizen
23326ca1a2
Merge pull request #1702 from betagouv/frederic/fix_1677-view_invite_as_usager_instructeur
#1677 allow invites to edit dossiers
2018-03-29 17:16:16 +02:00