Commit graph

8036 commits

Author SHA1 Message Date
LeSim
78aac493bb
Merge pull request #3384 from betagouv/dev
2019-02-06-01
2019-02-06 15:11:52 +01:00
Mathieu Magnin
42e323673b
Merge pull request #3383 from betagouv/faster_deployment
mina: reuse gem between deployment
2019-02-06 15:03:15 +01:00
simon lehericey
32281092e6 mina: reuse gem between deployment 2019-02-06 14:41:45 +01:00
LeSim
d1e7bc1906
Merge pull request #3379 from tchak/fix-clone-repetition
Clone nested types_de_champ
2019-02-06 10:11:34 +01:00
Paul Chavard
6b39128be3 Clone nested types_de_champ 2019-02-06 10:05:27 +01:00
LeSim
d19bccb935
Merge pull request #3376 from betagouv/dev
2019-02-05-01
2019-02-05 20:17:41 +01:00
LeSim
c8b11b621f
Merge pull request #3373 from betagouv/reinforce-clamav-service-response
If ClamavService fails then raise an error
2019-02-05 18:03:41 +01:00
Mathieu Magnin
f6714cd9a3 If ClamavService fails then raise an error 2019-02-05 17:58:41 +01:00
LeSim
2a5250b62c
Merge pull request #3364 from betagouv/fix_3363_organisation_name
[fix #3363] use organisation_name in dossier summary
2019-02-05 17:47:40 +01:00
simon lehericey
5715cdaa4c [fix #3363] use organisation_name in dossier summary 2019-02-05 17:41:51 +01:00
LeSim
01a1f77c54
Merge pull request #3374 from betagouv/frederic/fix_3356-balises_menus_lies
Balises pour les menus liés
2019-02-05 17:40:28 +01:00
Frederic Merizen
a255e61556 [#3356] Improve formatting for menus that only have a primary value 2019-02-05 17:35:30 +01:00
Frederic Merizen
a3d7c8de55 [Fix #3356] Add tags for primary menu only / secondary menu only 2019-02-05 17:35:30 +01:00
Frederic Merizen
d3498e10bd [#3356] Let dynamic type handle tag generation 2019-02-05 17:35:30 +01:00
Frederic Merizen
4a3d402a32 [#3356] No need for special treatment 2019-02-05 17:35:30 +01:00
Frederic Merizen
a8b9da9d3b [#3356] Remove redundant method 2019-02-05 17:35:30 +01:00
Frederic Merizen
5bc8bbbaa2 [#3356] Let tags handle their own substitution 2019-02-05 17:35:30 +01:00
Frederic Merizen
656061b21a [#3356] Clarify naming 2019-02-05 17:35:30 +01:00
Frederic Merizen
140a65cb36 [#3356] Simplify detection of handling champ 2019-02-05 17:35:30 +01:00
Frederic Merizen
bcfc0f2535 [#3356] Let types de champ decide their tags 2019-02-05 17:35:30 +01:00
Frederic Merizen
d67af741d5 [#3356] Prepare for multiples tags per type de champ 2019-02-05 17:35:30 +01:00
LeSim
6c3cb2716e
Merge pull request #3360 from tchak/better-champs-editor
Des améliorations sur le nouvel éditeur de champs
2019-02-05 16:56:34 +01:00
Paul Chavard
cb72507c12 Simplify repetition js 2019-02-05 16:48:26 +01:00
Paul Chavard
a9a853b669 Fix and simplify linked-drop-down-list js 2019-02-05 16:48:26 +01:00
Paul Chavard
1d75a32cac Add a default text type de champ to editor 2019-02-05 16:48:26 +01:00
Paul Chavard
2754dc9c9e Avoid n+1 when loading types de champ in to the editor 2019-02-05 16:48:26 +01:00
Mathieu Magnin
958be414c4
Merge pull request #3372 from betagouv/dev
MEP 2019-02-05-01
2019-02-05 13:14:27 +01:00
Mathieu Magnin
fbd10f7758
Merge pull request #3367 from betagouv/add-logs-to-antivirus-job
Add logs to AntivirusJob
2019-02-05 12:55:11 +01:00
Mathieu Magnin
f67fdae542 Add logs to AntivirusJob 2019-02-05 12:50:27 +01:00
Paul Chavard
1f5ea207b2
Merge pull request #3361 from betagouv/dev
2019-02-04-01
2019-02-04 17:51:47 +01:00
Pierre de La Morinerie
d957cf4492
Merge pull request #3308 from tchak/diaplay-champ-repetition
Bloc répétable 🎉🎉🎉
2019-02-04 16:55:47 +01:00
Paul Chavard
071448e1d9 Champ Repetition dossier editor 2019-02-04 16:19:07 +01:00
Paul Chavard
a4a421a91a Champ Repetition dossier display 2019-02-04 15:46:39 +01:00
Paul Chavard
862ab4ed04 “Bloc répétable” is ready to be tested 2019-02-04 15:46:39 +01:00
LeSim
cb38fe754a
Merge pull request #3300 from tchak/champs-editor-repetition
Champs editor should handle repetition type
2019-02-04 14:25:12 +01:00
Paul Chavard
9b7b59f67e Champs editor should handle repetition type 2019-02-04 11:58:26 +01:00
LeSim
431ea88a5d
Merge pull request #3352 from betagouv/dev
2018-02-01-01
2019-02-01 15:17:12 +01:00
Mathieu Magnin
9728721a12
Merge pull request #3329 from pengfeidong/fix_3282_datatime_with_empty_value
[fix #3282] add empty value for type_champ datatime
2019-02-01 13:46:11 +01:00
Mathieu Magnin
86a2a426bb
Merge branch 'dev' into fix_3282_datatime_with_empty_value 2019-02-01 11:45:45 +01:00
LeSim
c53d72db1a
Merge pull request #3334 from betagouv/improve-satisfaction-graph
Stats : amélioration du graphique de satisfaction
2019-02-01 11:08:18 +01:00
Pierre de La Morinerie
f42d9fce0c stats: add data points to the user satisfaction 2019-02-01 11:02:37 +01:00
Pierre de La Morinerie
283f110e9b stats: improve numeric separators and suffixes 2019-02-01 11:02:37 +01:00
Pierre de La Morinerie
34a2dc6b97 stats: turn satisfaction into a stacked area chart 2019-02-01 11:02:37 +01:00
LeSim
351f2872a5
Merge pull request #3350 from betagouv/secure_connexion_cleaner_date_comparison
Trusted_device: cleaner time comparison
2019-02-01 11:00:20 +01:00
simon lehericey
41ae1f46f4 Trusted_device: cleaner time comparison 2019-02-01 10:54:20 +01:00
Frederic Merizen
cd5574163d
Merge pull request #3346 from betagouv/dev
2019-01-30-01
2019-01-30 17:38:42 +01:00
Frederic Merizen
b2e4d95580
Merge pull request #3344 from betagouv/frederic/fix_3343-allow_non_windows_1252_characters_in_attestation
Allow non windows 1252 characters in attestation
2019-01-30 15:15:31 +01:00
Frederic Merizen
ba3a88353b [#3343] Remove unused font 2019-01-30 15:06:25 +01:00
Frederic Merizen
f17ab449b9 [Fix #3343] Allow non windows-1252 characters in attestation
by using ttf font
2019-01-30 15:06:25 +01:00
Mathieu Magnin
b02013d6af
Merge pull request #3340 from betagouv/dev
2019-01-29-01
2019-01-29 16:10:36 +01:00