Commit graph

4935 commits

Author SHA1 Message Date
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
Frederic Merizen
33f7b03ff2 [Fix #1677] Do not show 'submit' button to invités 2018-03-29 17:03:58 +02:00
Frederic Merizen
dd219d5d40 [#1677] Prevent invites from submitting a dossier 2018-03-29 17:03:58 +02:00
Frederic Merizen
b869efd7d1 [#1677] After editing, send Invites back to invitation page 2018-03-29 17:03:58 +02:00
Frederic Merizen
b606afee3f [#1677] Extract NewUser::DossiersController#owns_dossier? 2018-03-29 17:02:10 +02:00
Frederic Merizen
baf881a38b [#1677] Remove no-operation 2018-03-29 17:02:10 +02:00
Frederic Merizen
839a5d43f6 [#1677] Allow invites to edit dossiers 2018-03-29 17:02:10 +02:00
Frederic Merizen
13d7149b5c [#1677] Extract Dossier#invite_for_user 2018-03-29 16:59:16 +02:00
Frederic Merizen
884c430619 [#1677] No need to use emails when we have users 2018-03-29 16:59:16 +02:00
LeSim
a489bbeb44
Merge pull request #1756 from betagouv/user_ui_mes_dossiers
Première version de la vue des dossiers de l'usager
2018-03-29 16:55:54 +02:00
simon lehericey
b2f04e2503 Usager UI: simple dossier index 2018-03-29 16:23:10 +02:00
simon lehericey
48ddb4cfb6 Dossier status: add brouillon label 2018-03-29 16:23:10 +02:00
simon lehericey
88d46594e9 Dossier status: move partial dans shared 2018-03-29 16:23:10 +02:00
gregoirenovel
96a0e1dbd2
Merge pull request #1761 from betagouv/simplify-api-entreprise
Simplify API Entreprise
2018-03-29 16:09:01 +02:00
gregoirenovel
094ccecc01 Rename Adapter’s siret_or_siren to siret 2018-03-29 16:06:14 +02:00
gregoirenovel
8938a5b40d Delete SiretService.siren, move its code to EntrepriseAdapter#get_resource 2018-03-29 16:06:14 +02:00
gregoirenovel
4edad8d0a0 Merge branch 'dev' 2018-03-29 15:43:27 +02:00
gregoirenovel
feeb0cc80b
Merge pull request #1768 from betagouv/add-comment
Add a comment to explain why we reject 206 responses
2018-03-29 15:43:04 +02:00
gregoirenovel
cc9e318210 Add a comment to explain why we reject 206 responses 2018-03-29 15:36:41 +02:00
gregoirenovel
ba41190c32
Merge pull request #1745 from betagouv/api-entreprise-hard-refactor
API Entreprise hard refactor
2018-03-29 15:01:17 +02:00
gregoirenovel
7b288340d2 Merge branch 'dev' 2018-03-29 11:53:17 +02:00
gregoirenovel
67cf614879 Mutualize some code on ApiEntreprise::Adapter 2018-03-29 11:44:59 +02:00
gregoirenovel
5f1394cd7f ExercicesAdapter#to_array -> ExercicesAdapter#to_params 2018-03-29 11:44:59 +02:00
gregoirenovel
54ab0ec5f0 Extract code in a #handle_legacy_models! method 2018-03-29 11:44:59 +02:00
gregoirenovel
68c9849977 Mutualize the adapters’ #data_source methods 2018-03-29 11:44:59 +02:00
gregoirenovel
a9360a8be2 Mutualize Adapter initialization in a class and method 2018-03-29 11:44:59 +02:00
Frederic Merizen
53c8396b41
Merge pull request #1753 from betagouv/frederic/fix_1750-keep_procedure_description_paragraphs
Fix #1750 – keep procedure description paragraphs
2018-03-29 11:37:35 +02:00
Frederic Merizen
2d6a780714 [Fix #1750] Allow newlines in procedure descriptions as paragraph breaks 2018-03-29 11:26:53 +02:00
Frederic Merizen
5b81148c80
Merge pull request #1752 from betagouv/frederic/fix_1691-procedure_description_container_tag
Fix #1691 – procedure description container tag
2018-03-29 11:26:15 +02:00