Commit graph

2872 commits

Author SHA1 Message Date
Mathieu Magnin
676a756e1d Ensure task is run on dev env 2017-10-31 09:56:18 +01:00
Mathieu Magnin
95a9c61457 Rebuild test db after db:import_dev task 2017-10-31 09:56:18 +01:00
LeSim
35fadc5b33
Merge pull request #915 from sgmap/fix_messagerie_display
[Fix #890] better display of rich text messagerie
2017-10-30 17:29:29 +01:00
Simon Lehericey
f7dc36364e [Fix #890] better display of rich text messagerie 2017-10-30 17:24:18 +01:00
LeSim
c9a2b2617d
Merge pull request #923 from sgmap/fix_html_tag_in_excel_export
Improve excel export
2017-10-30 17:19:56 +01:00
Simon Lehericey
f4a8ff31b9 Champ: export multiple_drop_down_list as a [].join(', ') 2017-10-30 17:14:31 +01:00
Simon Lehericey
b658f8c8dc Champ: export yes_no champ with oui non 2017-10-30 17:14:31 +01:00
Simon Lehericey
338911d1a8 [fix #905] Champ: add for_export method which strips tag for textarea champ 2017-10-30 17:14:31 +01:00
Simon Lehericey
3f2419a2a3 Dossier: rename data_with_champs to to_sorted_values 2017-10-30 17:14:31 +01:00
Simon Lehericey
f0373f6bc2 Dossier: remove useless return 2017-10-30 17:14:31 +01:00
LeSim
56336dbc00
Merge pull request #927 from sgmap/localize_select2
Select2: fr localization
2017-10-30 14:31:40 +01:00
Simon Lehericey
d40c0d3b06 Select2: fr localization 2017-10-30 14:25:54 +01:00
LeSim
313ce17d6f
Merge pull request #926 from sgmap/fix_925_space_in_avis_email
[Fix #925] strip avis email input
2017-10-30 14:24:58 +01:00
Simon Lehericey
fc987a730d [Fix #925] strip avis email input 2017-10-30 14:19:20 +01:00
LeSim
459ebbda42
Merge pull request #928 from sgmap/typo
typo
2017-10-30 11:32:11 +01:00
Simon Lehericey
92beb321a4 typo 2017-10-27 17:28:50 +02:00
LeSim
6ccbab903e Merge pull request #922 from sgmap/fix_test
Fix tests
2017-10-27 10:53:38 +02:00
Simon Lehericey
5f348df570 Dossier spec: remove forgotten focus 2017-10-27 10:48:29 +02:00
Simon Lehericey
106b8ec118 Dossier decorator spec: fix dossier updated_at spec 2017-10-27 10:48:05 +02:00
LeSim
78a9629216 Merge pull request #913 from sgmap/fix_procedure_logo_on_ie_11
[fix #872] Procedure Logo: fix overflow logo for ie11
2017-10-25 16:08:49 +02:00
Simon Lehericey
a4be8e709c [fix #872] Procedure Logo: fix overflow logo for ie11
Bug in ie11 linked to flex and image ratio
The only way to fix it so far and preserving image ratio is to use background image property
2017-10-25 16:04:18 +02:00
Mathieu Magnin
c7bbe87f77 Merge pull request #914 from sgmap/simple-format-on-champ-description
Print champ description with simple format to display line breaks
2017-10-25 15:46:54 +02:00
Mathieu Magnin
eabc24b432 Print champ description with simple format to display line breaks 2017-10-25 15:36:42 +02:00
LeSim
33bf3d9f63 Merge pull request #912 from sgmap/fix_dossier_updated_at
[fix #575] dossier updated_at is ... updated when children are updated
2017-10-25 11:09:07 +02:00
Simon Lehericey
8dedf6fdca [fix #575] dossier updated_at is ... updated when children are updated 2017-10-24 18:12:25 +02:00
gregoirenovel
2d2929e5f6 Merge pull request #900 from sgmap/fix-icon-only-buttons
Fix icon only buttons
2017-10-24 11:28:19 +02:00
gregoirenovel
07ca2989bd Align several mixed-types buttons properly 2017-10-23 15:21:34 +02:00
gregoirenovel
dc1615393b Change the padding of icon-only buttons
So that they have the same height as buttons with
text
2017-10-23 15:21:34 +02:00
gregoirenovel
18ca9dfc5f Merge pull request #889 from sgmap/fix-mail-template-object-modification
[Fix #839] Fix mail template modification by side effect
2017-10-23 14:47:10 +02:00
Mathieu Magnin
02c83766e5 [Fix #839] Fix mail template modification by side effect 2017-10-23 14:36:52 +02:00
gregoirenovel
eba0339313 Merge pull request #869 from sgmap/fix-807
[Fix #807] dossiers-table improvements + allow 5 columns
2017-10-23 13:56:15 +02:00
gregoirenovel
3e2f12a054 [Fix #807] Increase the maximum number of columns to 5 2017-10-23 12:44:21 +02:00
gregoirenovel
8adca7e067 Increase the horizontal spacing in dossiers-table 2017-10-23 12:44:21 +02:00
gregoirenovel
f2b0a0d5bc Decrease the vertical padding of dossiers-table th and .cell-link 2017-10-23 12:44:21 +02:00
gregoirenovel
23a6f5bae1 Properly align the dossier-table th 2017-10-23 12:44:21 +02:00
gregoirenovel
9c7ad9da91 Align the follow button to the right 2017-10-23 12:44:21 +02:00
gregoirenovel
40c4ef24a0 Change the width of the number, status and follow columns 2017-10-23 12:44:21 +02:00
gregoirenovel
1fc5264900 In SCSS files, use the class instead of the HTML tag when possible 2017-10-23 12:44:21 +02:00
gregoirenovel
b595ce9066 Reduce the font-size in the dossiers-table 2017-10-23 12:44:21 +02:00
gregoirenovel
b88490e559 Reduce the top margin of the dossiers table in the procedure page 2017-10-23 12:44:21 +02:00
gregoirenovel
1a4cef818d Set the line-height of the labels
So that their heights are fixed
2017-10-23 12:44:21 +02:00
gregoirenovel
7899d2b1e9 Merge pull request #895 from sgmap/remove-phone-number
Remove the phone number from the homepage
2017-10-23 12:44:17 +02:00
gregoirenovel
e2a8bdcbb3 Remove the phone number from the homepage
We only get calls from users wanting support,
not from administrations wanting a demo
2017-10-23 11:12:11 +02:00
Mathieu Magnin
fa5387ca88 Merge pull request #823 from sgmap/draft-email-notification
[Fix #813] When a brouillon is created, send an email to user
2017-10-20 14:26:32 +02:00
Mathieu Magnin
a8ec374252 [Fix #813] When a brouillon is created, send an email to user 2017-10-20 12:13:55 +02:00
LeSim
1055c96c4d Merge pull request #882 from sgmap/regenerate_attestation_task
Rake: task to regenerate the attestation
2017-10-19 15:50:26 +02:00
Simon Lehericey
6dfab10dfa Rake: task to regenerate the attestation 2017-10-19 15:40:52 +02:00
LeSim
9cf02f77d0 Merge pull request #881 from sgmap/add_uuid_to_logo_and_signature
AttestationTemplate: store logo and signature with uuid
2017-10-19 15:37:22 +02:00
Simon Lehericey
3dce5b9b5e AttestationTemplate: store logo and signature with uuid 2017-10-19 15:32:04 +02:00
LeSim
475675f75d Merge pull request #877 from sgmap/fix_attestation
Fix attestation
2017-10-19 15:06:25 +02:00