Commit graph

7175 commits

Author SHA1 Message Date
Mathieu Magnin
a9969e59ec
Merge pull request #3454 from betagouv/enforce-rubocop-timezone
Enforce rubocop timezone
2019-02-19 11:08:09 +01:00
Mathieu Magnin
cf610bbd91
Merge branch 'dev' into enforce-rubocop-timezone 2019-02-18 17:41:41 +01:00
Mathieu Magnin
9606f76a12
Merge pull request #3435 from pengfeidong/fix_3417_departement_with_empty_value
[fix #3417] add emtpy value for departement
2019-02-18 17:41:27 +01:00
Mathieu Magnin
b2f5ff8690
Merge branch 'dev' into fix_3417_departement_with_empty_value 2019-02-18 17:35:53 +01:00
LeSim
af1c2b028c
Merge pull request #3391 from betagouv/fix_3345_connexion_securise
Fix 3345 connexion securise
2019-02-18 17:26:06 +01:00
simon lehericey
0b8619be77 Gestionnaire: login_token! -> create_trusted_device_token 2019-02-18 17:21:46 +01:00
simon lehericey
47e3b57e81 TrustedDeviceToken: valid for one week 2019-02-18 17:20:49 +01:00
simon lehericey
c16e30442a save path before redirect to link_sent_path 2019-02-18 17:20:49 +01:00
simon lehericey
7de3a18fd1 valid period depend on trusted_device_token.created_at 2019-02-18 17:20:49 +01:00
simon lehericey
d664f130fd trustedDeviceToken: move token youth 2019-02-18 17:20:49 +01:00
simon lehericey
23db8a160c move token validity to trusted_device_token 2019-02-18 17:20:49 +01:00
simon lehericey
b9b83cca3a use multiple trusted_device_token 2019-02-18 17:20:42 +01:00
simon lehericey
bee9a108c5 split login and trusted_device logic 2019-02-18 17:20:00 +01:00
LeSim
aebd3ff670
Merge pull request #3458 from betagouv/fix_3315_service_organisme
[fix #3315] Migrate service organisme
2019-02-18 16:58:02 +01:00
simon lehericey
9d92e43d8d [fix #3315] Migrate service organisme 2019-02-18 16:50:44 +01:00
LeSim
0bb4abb3b3
Merge pull request #3459 from betagouv/improve-upload-ui
Amélioration des indicateurs lors de l'envoi de PJ
2019-02-18 16:28:39 +01:00
Mathieu Magnin
dd27167c5d Enforce Timezone rule in Rubocop 2019-02-18 16:19:42 +01:00
Pierre de La Morinerie
d1f514c7b0 dossier: make clear when files are being uploaded 2019-02-18 15:31:08 +01:00
Pierre de La Morinerie
e1a2a8c0d1 stylesheet: improve upload progress bar appearance 2019-02-18 15:31:08 +01:00
Pierre de La Morinerie
995e189637
Merge pull request #3456 from betagouv/manager-search-by-path
Manager : permet de chercher une démarche par son chemin
2019-02-18 14:59:24 +01:00
Pierre de La Morinerie
ffe0ceaaa2 manager: allow search procedures by path
By default the Field::String type is searchable.
2019-02-18 14:59:08 +01:00
Pierre de La Morinerie
80c0ff428d
Merge pull request #3457 from betagouv/procedure_preview_link
Manager: add procedure preview link
2019-02-18 14:57:16 +01:00
simon lehericey
b152025c5f Manager: add procedure preview link 2019-02-18 14:44:27 +01:00
Pierre de La Morinerie
83341ad958
Merge pull request #3452 from betagouv/frederic/fix_1140
[Fix #1140] Wording de l’explication du template d’attestation
2019-02-18 14:16:56 +01:00
Frederic Merizen
1ca64e3f28 [Fix #1140] Let's close this stupid issue already 2019-02-18 14:16:06 +01:00
Pierre de La Morinerie
66948bf02e
Merge pull request #3455 from Keirua/fix/3453-exception-date-nulle
[FIX 3453] Ne pas afficher de date de dépot si celle-ci n'est pas dispo
2019-02-18 14:09:35 +01:00
clemkeirua
e653e5876b fix: ne pas afficher de date de dépot si celle-ci n'est pas dispo 2019-02-18 14:02:19 +01:00
Mathieu Magnin
6e07eb84c1
Merge pull request #3428 from betagouv/fix_3427_super_admin_soft_delete
[fix #3427] Administration can soft delete a dossier
2019-02-18 12:01:03 +01:00
simon lehericey
a7e068003a [fix #3427] Administration can soft delete a dossier 2019-02-14 18:09:08 +01:00
Pierre de La Morinerie
210088132e
Merge pull request #3434 from betagouv/fix-3359
Modification de texte
2019-02-14 17:22:24 +01:00
Chaïb Martinez
6aa2bf64ca Texte update 2019-02-14 17:19:17 +01:00
Pierre de La Morinerie
6693c701ef
Merge pull request #3423 from tchak/fix-upload-progress
Fix upload progress
2019-02-14 17:19:05 +01:00
Paul Chavard
5e806aa39e Add progress bar to model uploads 2019-02-14 17:13:41 +01:00
Paul Chavard
1e8bc3e14c Refactor upload progress bar 2019-02-14 17:13:41 +01:00
Paul Chavard
235310bcf6 Fix upload progress bar 2019-02-14 17:13:41 +01:00
Pierre de La Morinerie
8fb8c5d3b9
Merge pull request #3437 from betagouv/revert-direct-upload-to-static-subdomain
Use static.demarches-simplifiees.fr domain to upload PJ again
2019-02-14 16:28:12 +01:00
Pierre de La Morinerie
7413df81e0 Revert "file upload: proxy direct upload through the APP_HOST"
This reverts commit 2365efbdaa.
2019-02-14 16:23:11 +01:00
Paul Chavard
ca19c88f3e
Merge pull request #3416 from tchak/ruby-debug
Add ruby debugger support
2019-02-14 15:59:54 +01:00
pedong
034929632b [fix #3417] add emtpy value for departement 2019-02-14 15:24:12 +01:00
Paul Chavard
c2a7460315 Add ruby debugger support 2019-02-14 15:22:57 +01:00
Pierre de La Morinerie
e5b1a9dad8
Merge pull request #3430 from betagouv/fix-upload
Fix upload (cors)
2019-02-14 14:35:55 +01:00
Mathieu Magnin
2365efbdaa file upload: proxy direct upload through the APP_HOST
Ref #3409
2019-02-14 14:28:03 +01:00
Pierre de La Morinerie
6e9662b765
Merge pull request #3421 from betagouv/fix-3371
Comment/Hide "Commencer une nouvelle démarche" in user dossier page
2019-02-14 14:13:50 +01:00
Chaïb Martinez
3a81a4ce2d Comment/Hide "Commencer une nouvelle démarche" in user dossier page 2019-02-14 11:26:37 +01:00
Frederic Merizen
4e32f9da1d
Merge pull request #3422 from Keirua/feat/afficher-surfaces-avec-plan-cadastral
Affichage de la surface cadastrale dans les cartes
2019-02-14 11:03:31 +01:00
clemkeirua
fcce8bd98c affichage de la surface cadastrale dans les cartes 2019-02-14 10:55:44 +01:00
Paul Chavard
c3189ed34e
Merge pull request #3431 from betagouv/frederic/fix_nil
Fix undefined method for nil:NilClass
2019-02-13 19:29:32 +01:00
Frederic Merizen
eb7cd28504 Fix undefined method for nil:NilClass 2019-02-13 19:22:38 +01:00
LeSim
8239c159b0
Merge pull request #3426 from betagouv/fix-matomo
matomo: fix JS error when timing data are not available
2019-02-13 16:15:05 +01:00
Pierre de La Morinerie
2deb34ce33 matomo: fix JS error when timing data are not available
Happened when navigating on IE 11 for some reason.
2019-02-13 15:51:10 +01:00