Commit graph

7259 commits

Author SHA1 Message Date
Frederic Merizen
45994089ca
Merge pull request #3577 from betagouv/frederic/fix_champ_field_order
Force stable order on champ fields
2019-03-11 11:39:03 +01:00
Frederic Merizen
c75983710c Force stable order on champ fields 2019-03-11 11:32:17 +01:00
Pierre de La Morinerie
b9146b8892
Merge pull request #3579 from betagouv/frederic/fix_3578-no_tags_for_static_champs
[Fix #3578] No tags for champs that cannot have user input anyway
2019-03-11 11:14:41 +01:00
Frederic Merizen
b428406fc7 [Fix #3578] No tags for champs that cannot have user input anyway 2019-03-11 10:26:27 +01:00
Frederic Merizen
8626d0a055
Merge pull request #3573 from betagouv/frederic/fix_3572-balises_sur_mauvais_type_de_champ
[Fix #3572] Use champ with correct type for balise
2019-03-08 20:07:26 +01:00
Frederic Merizen
1d0156f9c6 [#3572] Add tests 2019-03-08 18:32:35 +01:00
Frederic Merizen
610d2e7e2b [Fix #3572] Use champ with correct type for balise 2019-03-08 18:32:35 +01:00
LeSim
739ddf3f7c
Merge pull request #3496 from betagouv/philemon95-patch-2
Update _general_footer_row.html.haml
2019-03-08 18:21:24 +01:00
philemon95
56a4e73689 Update _general_footer_row.html.haml 2019-03-08 18:14:41 +01:00
LeSim
a638b49ff4
Merge pull request #3557 from maatinito/issue/loose_of_timezone
converting DateTime to Date looses time zone information resulting in…
2019-03-08 18:07:16 +01:00
maatinito
766e9db752 converting DateTime to Date looses time zone information resulting in bad time computing
Specifically, for Tahiti, time zone is -10 so after 14h, UTC time is Tahiti time + 10h i.e the day after. Loosing time zone results in 1 day difference whether the time is computed before of after 14h :-)
2019-03-08 17:58:58 +01:00
LeSim
5605ceacc2
Merge pull request #3574 from betagouv/fix-3542-matomo-js
Fix Turbolinks page views are not tracked properly in matomo #3542
2019-03-08 17:56:35 +01:00
Chaïb Martinez
b6552f45ab [fix #3542] Fix https bug in matomo
Signed-off-by: Chaïb Martinez <chaibax@gmail.com>
2019-03-08 17:44:07 +01:00
LeSim
b6bb33dcaf
Merge pull request #3576 from betagouv/philemon95-patch-3
Update administration.html.haml
2019-03-08 17:35:09 +01:00
philemon95
43f95b98e7 Update administration.html.haml 2019-03-08 17:29:18 +01:00
LeSim
ce3ad2f406
Merge pull request #3559 from maatinito/issue/use_constants
Use predefined constants instead of values for URLs, mails
2019-03-08 17:15:20 +01:00
maatinito
55f17f64a4 Use predefined constants instead of values for URLs, mails 2019-03-08 17:06:56 +01:00
LeSim
dc9acdb533
Merge pull request #3562 from pengfeidong/fix_3521_image_truncated_in_mail
[fix #3521] del fix height for image in the mail
2019-03-08 17:05:43 +01:00
pedong
d8f48edbed [fix #3521] del fix height for image in the mail 2019-03-08 16:49:32 +01:00
Frederic Merizen
80b2f2988e
Merge pull request #3568 from betagouv/frederic/sendinblue
Send administrateur usage statistics in nightly batches rather than JS
2019-03-08 16:43:06 +01:00
Frederic Merizen
ceb354963e Remove old sendinblue interface through JavaScript 2019-03-08 16:33:28 +01:00
Frederic Merizen
f9a4369a54 Compute administrator usage statistics every night 2019-03-08 16:33:28 +01:00
Frederic Merizen
6b0832047b Service that computes administrator statistics and sends them to SendinBlue 2019-03-08 16:33:28 +01:00
Frederic Merizen
98713b6a4d Proxy for SendinBlue API 2019-03-08 16:33:28 +01:00
Frederic Merizen
fc38880155 Move sendinblue client key to configuration file
This is not a secret (it's sent to the client as part of the JS anyway) so it's
not a big deal that it was on the public repository but it's still better to
have it be configurable.
2019-03-08 16:33:28 +01:00
LeSim
24ee81af2c
Merge pull request #3571 from betagouv/secured_connexion_mail_wording
Secured connexion: improve mail wording
2019-03-08 12:59:56 +01:00
simon lehericey
26958a2785 Secured connexion: improve mail wording 2019-03-08 11:52:04 +01:00
Mathieu Magnin
a25fabb0a5
Merge pull request #3550 from betagouv/add-attestation-template-to-manager
Add attestation template to manager
2019-03-06 18:05:46 +01:00
Mathieu Magnin
97189cc3aa Add attestation template to manager 2019-03-06 16:49:16 +01:00
Mathieu Magnin
be30cb8e56
Merge pull request #3497 from betagouv/philemon95-patch-3
Update accessibilite.html.haml
2019-03-06 11:31:07 +01:00
philemon95
db2fff703c Update accessibilite.html.haml
changed tag name 'a11y' to 'accessibilite' for clarity reasons
2019-03-06 11:21:21 +01:00
Paul Chavard
f9c656282a
Merge pull request #3548 from betagouv/frederic/target_blank_rel_noopener
Add rel=noopener to links with target=_blank
2019-03-06 10:16:22 +01:00
Frederic Merizen
a8ce11a4d2 Add rel=noopener to links with target=_blank
http://support.detectify.com/customer/portal/articles/2792257-external-links-using-target-_blank-
2019-03-05 18:25:26 +01:00
Mathieu Magnin
f207641b4e
Merge pull request #3504 from betagouv/add-status-page-in-footer
Add status page in footer
2019-03-05 17:49:10 +01:00
Mathieu Magnin
1eed114d78 Add status page in footer 2019-03-05 17:42:00 +01:00
Paul Chavard
817d783daa
Merge pull request #3544 from betagouv/fix-3495
[Fix #3495] add update identité button
2019-03-05 15:12:18 +01:00
Mathieu Magnin
4d019f6d16
Merge pull request #3540 from betagouv/fix-1874
[Fix #1874] Add update SIRET button on edit page
2019-03-05 14:53:09 +01:00
Mathieu Magnin
a977e098d5 [Fix #3495] add update identité button 2019-03-05 14:52:12 +01:00
Mathieu Magnin
4f70292aed [Fix #1874] Add update SIRET button on edit page 2019-03-05 14:39:15 +01:00
Paul Chavard
05b6e496ee
Merge pull request #3525 from tchak/blank-region
Le champs liste des régions force un choix
2019-03-05 11:16:04 +01:00
Paul Chavard
4aef77788a Include blank for regions and pays
fix #3523
2019-03-05 11:08:09 +01:00
LeSim
55a4a1ff8e
Merge pull request #3530 from betagouv/frederic/fix_manager_lien_procedure_brouillon
Fix link to procedure brouillon in manager
2019-03-04 15:13:08 +01:00
Frederic Merizen
d54a0a4612 Fix link to procedure brouillon in manager 2019-03-04 15:03:30 +01:00
LeSim
901765c6d7
Merge pull request #3535 from betagouv/wording_for_secured_connexion
Wording for secured connexion
2019-03-04 14:57:53 +01:00
simon lehericey
cb1895c515 send_login_token: add mention of one week validity 2019-03-04 12:37:15 +01:00
simon lehericey
6bc820d16c link_sent: add link to faq 2019-03-04 12:31:31 +01:00
Frederic Merizen
2915d86749
Merge pull request #3518 from betagouv/frederic/bump-shoulda-matchers
Bump shoulda matchers
2019-03-01 19:09:15 +01:00
Frederic Merizen
83adb8dcba Bump shoulda matchers
to avoid the warning about the deprecation of BigDecimal.new
2019-03-01 19:00:52 +01:00
Paul Chavard
8fac9167ca
Merge pull request #3531 from betagouv/frederic/fix_delai_instruction_test_after_february
Fix test for the 2 months following February
2019-03-01 18:51:02 +01:00
Frederic Merizen
d053a9bb8d Fix test for the 2 months following February
The problem was caused by the variable lenght of 2.months.ago, used
in the test.
During the period from March 1st to April 29th, because February
is so short, the message would change from 'delai de 2 mois'
to 'delai de environ 2 mois', causing the test to fail.
2019-03-01 18:25:15 +01:00