Commit graph

1372 commits

Author SHA1 Message Date
Simon Lehericey
2923d4448b NewDesign: can ask a new avis 2017-09-06 11:11:36 +02:00
Simon Lehericey
f03d8ef909 NewDesign: add dossier instruction view 2017-09-06 11:11:36 +02:00
Simon Lehericey
9d7066d3c3 Form: display mandatory star in red 2017-09-06 11:11:35 +02:00
Simon Lehericey
46c144146c Form: add description 2017-09-06 11:11:35 +02:00
Simon Lehericey
74c71a3776 Form: use rails form helper 2017-09-06 11:11:34 +02:00
Mathieu Magnin
42a8792071 Add icons to patron + new icon folder 2017-09-06 11:11:33 +02:00
Mathieu Magnin
32c83dd7a5 Add label variations to /patron 2017-09-06 11:11:33 +02:00
Mathieu Magnin
f3f2b6acc2 Avoid n+1 because of gestionnaire.follows?(dossier) 2017-09-06 11:11:32 +02:00
Simon Lehericey
1b42766836 Form: add address auto complete 2017-09-06 11:11:31 +02:00
Simon Lehericey
1a485f173e Form: add required 2017-09-06 11:11:30 +02:00
Simon Lehericey
80023e4f7f Form: remove form overflow to improve box shadow on input error 2017-09-06 11:11:30 +02:00
Simon Lehericey
2fd486c1a3 Form: add pseudo native form validation 2017-09-06 11:11:30 +02:00
Simon Lehericey
509b378567 Form: add select2 form multiple select 2017-09-06 11:11:30 +02:00
Simon Lehericey
9c2e71afa3 Form: add various champs html and style 2017-09-06 11:11:29 +02:00
Mathieu Magnin
373d9999fc Add map for gestionnaire 2017-09-06 11:11:28 +02:00
Simon Lehericey
2aa8c1d272 Messagerie: remove useless class 2017-09-06 11:11:26 +02:00
Simon Lehericey
3b7244675d Css: add .width-100 utility class 2017-09-06 11:11:26 +02:00
Simon Lehericey
877f64599d Form: add send button on the right 2017-09-06 11:11:25 +02:00
Simon Lehericey
0d27ca3bca Commentaire: use scope to order commentaires association 2017-09-06 11:11:25 +02:00
Simon Lehericey
714b2a5f08 NewDesign: gestionnaire can add a new commentaire 2017-09-06 11:11:25 +02:00
Simon Lehericey
3ecc4f1327 NewDesign: add person icon to message 2017-09-06 11:11:24 +02:00
Simon Lehericey
3a8e84b128 NewDesign: add guest label to message 2017-09-06 11:11:24 +02:00
Simon Lehericey
983c17fdcf NewDesign: Dossier add dossier and messagerie link in header 2017-09-06 11:11:24 +02:00
Simon Lehericey
497f898e1b NewDesign: add dossier messagerie show 2017-09-06 11:11:24 +02:00
Simon Lehericey
a7f270bac4 Follow: user new dossier follow controller instead of backoffice 2017-09-06 11:11:22 +02:00
Simon Lehericey
033f08524f Gestionnaire: refactor follow? 2017-09-06 11:11:21 +02:00
Simon Lehericey
2a8b8d4a01 NewDesign Form: apply design to textarea 2017-09-06 11:11:19 +02:00
Simon Lehericey
9753da8fdd NewDesign Form: move margin from label to input
provide beautiful layouts with or without label between inputs
2017-09-06 11:11:19 +02:00
Mathieu Magnin
f0777e166f Add sticky footer 2017-09-06 11:11:19 +02:00
Mathieu Magnin
7a0d6108e1 .footer -> %footer 2017-09-06 11:11:18 +02:00
Mathieu Magnin
3b3e0403d2 Improve /patron readability 2017-09-06 11:11:18 +02:00
Mathieu Magnin
cf63fd6b04 Add breadcrumbs 2017-09-06 11:11:17 +02:00
Mathieu Magnin
9aac9ba7cd use backoffice-header in views 2017-09-06 11:11:17 +02:00
Mathieu Magnin
c0eeec82c4 Add backoffice header to patron 2017-09-06 11:11:17 +02:00
Mathieu Magnin
b555320d46 Add RNA informations 2017-09-06 11:11:17 +02:00
Mathieu Magnin
f41b1b59c0 Add tabs partial 2017-09-06 11:11:16 +02:00
Mathieu Magnin
2b0c0567b8 Add header section in form table 2017-09-06 11:11:16 +02:00
Mathieu Magnin
7bb75c3f56 Add identite infos for individual 2017-09-06 11:11:16 +02:00
Mathieu Magnin
373447a19f Pieces justificatives on dossier page 2017-09-06 11:11:16 +02:00
Mathieu Magnin
8aed0d7aef Use champ decorator to print dossier details 2017-09-06 11:11:15 +02:00
Mathieu Magnin
47857664eb Add dossier champs (minimalist version) 2017-09-06 11:11:15 +02:00
Mathieu Magnin
f9f313e990 Add identité demandeur for entreprise on dossier detail page 2017-09-06 11:11:15 +02:00
Mathieu Magnin
1c7d9eaa69 Add table component to patron 2017-09-06 11:11:15 +02:00
Mathieu Magnin
dc00c10366 Add card component to patron 2017-09-06 11:11:14 +02:00
Mathieu Magnin
5b417889b2 Use same counters on procedures index than show 2017-09-06 11:11:14 +02:00
Simon Lehericey
5a0be8918e NewDesign: procedure index show procedure image if present 2017-09-06 11:11:14 +02:00
Simon Lehericey
962f55f6cc NewDesign: same order of categories in index and show 2017-09-06 11:11:13 +02:00
Simon Lehericey
d58502ab49 NewDesign: fix pluralization on procedure index 2017-09-06 11:11:13 +02:00
Simon Lehericey
0667883817 NewDesign: new procedures index links to new procedure show ! 2017-09-06 11:11:13 +02:00
Simon Lehericey
0d3c145ef3 NewDesign: procedure show add dossier actions 2017-09-06 11:11:12 +02:00
Simon Lehericey
013f2463d1 NewDesign: procedure show add dossier status 2017-09-06 11:11:12 +02:00
Simon Lehericey
ad1a11ab52 NewDesign: procedure show add dossier table 2017-09-06 11:11:11 +02:00
Simon Lehericey
b48af51ee9 NewDesign: procedure show only header 2017-09-06 11:11:11 +02:00
Mathieu Magnin
e2735b4238 Remove %page-width-container from patron 2017-09-06 11:11:10 +02:00
Mathieu Magnin
d0fa94fef0 Remove %page-width-container from footer 2017-09-06 11:11:10 +02:00
Mathieu Magnin
009a478526 Remove %page-width-container from landing 2017-09-06 11:11:09 +02:00
Mathieu Magnin
22bb4b7c92 Change link in switch profile menu to match new route 2017-09-06 11:11:09 +02:00
Mathieu Magnin
1d53214870 Add archived label on procedures list 2017-09-06 11:11:08 +02:00
Mathieu Magnin
29b201ad00 Add left menu in navbar 2017-09-06 11:11:08 +02:00
Mathieu Magnin
bc4e961200 Style backoffice title 2017-09-06 11:11:08 +02:00
Mathieu Magnin
eb2a33138c Add french inflections rules for nouveau=>nouveaux 2017-09-06 11:11:07 +02:00
Mathieu Magnin
622a170793 Add and design new #index on procedures for gestionnaires 2017-09-06 11:11:07 +02:00
Mathieu Magnin
dcb3a48bd3 Tabs component in patron 2017-09-06 11:11:06 +02:00
benjaminhenkel
48d88a110c Update landing.html.haml
Changement du deuxième numéro de la page que j'avais oublié la première fois
2017-08-31 14:35:10 +02:00
benjaminhenkel
480aefe815 Update landing.html.haml
Changement du numéro de téléphone de contact disponible sur le site TPS
2017-08-30 17:15:02 +02:00
gregoirenovel
79eccb2de0 Add a method to speed up a conditional statement 2017-08-29 14:57:23 +02:00
Mathieu Magnin
3804ab5911 [Fix #589] When displaying individual form, fill birthdate input 2017-08-01 16:47:44 +02:00
gregoirenovel
c464a6faba [Fix #168] Sort published and archived procedures by publication_date 2017-07-18 13:44:03 +02:00
gregoirenovel
1c1a47d83a publiee_ou_archivee -> publiees_ou_archivees 2017-07-17 15:06:36 +02:00
gregoirenovel
32e0fa9f69 Add Procedure#publiee_ou_archivee? 2017-07-13 17:01:39 +02:00
gregoirenovel
2b7a148540 Remove Procedure#published? 2017-07-13 17:01:38 +02:00
gregoirenovel
36bee67085 Add Procedure#brouillon? 2017-07-13 17:01:38 +02:00
gregoirenovel
9a7d5d1833 Add Procedure#publiee? 2017-07-13 15:44:18 +02:00
gregoirenovel
cfec05506a Rename Procedure#archived? -> #archivee? 2017-07-13 15:32:13 +02:00
gregoirenovel
75aebe4f07 Add the archivees scope on Procedure 2017-07-13 14:46:09 +02:00
gregoirenovel
89feb6cdf7 Add the brouillons scope on Procedure 2017-07-13 14:46:08 +02:00
gregoirenovel
fc2540649f Add the publiees scope on Procedure 2017-07-13 14:46:07 +02:00
gregoirenovel
ab9cf1c351 Rename the published scope on Procedure 2017-07-13 14:40:41 +02:00
Simon Lehericey
693c2a43ac [Fix #592] mutualize sanitize and clean flash messages 2017-07-13 10:14:16 +02:00
Simon Lehericey
4ae9d8ef0d [Fix #592] Convert html_safe to sanitize 2017-07-13 10:14:16 +02:00
Simon Lehericey
da7af28f9f [Fix #592] Remove useless html_safe 2017-07-13 10:14:16 +02:00
gregoirenovel
3d4c93a7fb Autofocus on email fields when relevant 2017-07-13 00:04:52 +02:00
Simon Lehericey
35affd69fc Commentaires: avoid xss injection 2017-07-12 13:53:25 +02:00
Simon Lehericey
2e03f77e4d InfoDossier: avoid xss injection 2017-07-12 13:47:59 +02:00
Simon Lehericey
831ccac685 Turbolinks: do not reload mailjet js on every page 2017-07-11 10:00:29 +02:00
Simon Lehericey
b2e99dd755 Turbolinks: do not reload application js on every page 2017-07-11 10:00:29 +02:00
Simon Lehericey
27cd42a100 fix administration view 2017-07-11 09:09:20 +02:00
gregoirenovel
6a381caaee Add the archived scope to Procedure 2017-07-10 17:24:53 +02:00
gregoirenovel
411c5791c8 Use the not_archived Procedure scope 2017-07-10 17:24:43 +02:00
gregoirenovel
31b23ac74e Add the not_published Procedure scope 2017-07-10 17:24:39 +02:00
gregoirenovel
f480f26bd4 Use the state_not_brouillon Dossier scope 2017-07-10 16:54:02 +02:00
gregoirenovel
5f50f76341 Add the published scope en Procedure 2017-07-10 16:54:01 +02:00
Simon Lehericey
b2ba5c597d [FIX #558] Attestation: fix access with multiple logins 2017-07-10 10:23:15 +02:00
Simon Lehericey
4fad288a8a lastWeekOverview: fix template 2017-07-04 17:33:01 +02:00
Simon Lehericey
82d8871d03 DossierShow: fix unattended bug on @champs_private 2017-07-04 16:37:29 +02:00
Mathieu Magnin
70c7c42e1f [Fix #430] Add delete procedure button 2017-07-04 14:34:26 +02:00
Simon Lehericey
48e881f9ec [FIX #491] Attestation: allow administrateur to change attestation template on a published procedure 2017-07-04 13:59:54 +02:00
Simon Lehericey
8aaf7df579 AttestationTemplate edit: id.nil => new_record? 2017-07-04 13:59:54 +02:00
Simon Lehericey
1d4a0dce56 Header: fix alignement in ff 2017-07-04 13:48:56 +02:00
Mathieu Magnin
dc4decc827 Add profile switcher in header 2017-07-03 14:34:31 +02:00
Mathieu Magnin
5d8c798369 Connexion button is a secondary button 2017-07-03 14:34:31 +02:00
Mathieu Magnin
33af09cae5 Account menu on header 2017-07-03 14:34:31 +02:00
Mathieu Magnin
b7dc511a7d Create a clean application.js file for new design 2017-07-03 14:34:31 +02:00
Mathieu Magnin
649af19443 Add search field in navbar 2017-07-03 14:34:30 +02:00
Simon Lehericey
b1d96f4a94 [FIX #492] switch to new attestation download system 2017-07-03 14:09:14 +02:00
gregoirenovel
38400cc2ce Fix a capitalization mistake 2017-07-03 10:19:45 +02:00
gregoirenovel
0a1543c630 [Fix #523] prioritaites -> prioritaires 2017-07-03 10:19:45 +02:00
Simon Lehericey
fb50606680 Admin: remove useless data in admin creation mail 2017-06-30 17:21:41 +02:00
Simon Lehericey
603e2dd020 ProcedureOverview: reboot model and layout 2017-06-29 16:07:46 +02:00
Simon Lehericey
689d0c2dd7 ProcedureOverview: add layout 2017-06-29 16:07:46 +02:00
Simon Lehericey
26afa24e49 [Fix #512] Crisp: add crisp to homepage 2017-06-29 14:35:24 +02:00
Simon Lehericey
3d99407495 [Fix #499] Attestation: add maxlength to footer 2017-06-27 13:35:01 +02:00
Simon Lehericey
81984d2883 Attestation: remove misleading footer placeholder 2017-06-27 13:34:49 +02:00
Simon Lehericey
c16c19f8e6 [Fix #499] Attestation: footer is now an text_field instead of a text_area 2017-06-27 13:14:47 +02:00
gregoirenovel
0e3ebfd819 [Fix #183] Display “oui” or “non” instead of “true” or “false” 2017-06-26 14:53:38 +02:00
gregoirenovel
96dd853dbb [Fix #396] Don’t submit the publish form after a transfer 2017-06-26 10:51:28 +02:00
gregoirenovel
ed51c77895 Correctly display the success message when transfer was successful 2017-06-26 10:51:28 +02:00
gregoirenovel
12f61b490a Reformat transfer.js.erb 2017-06-26 10:51:28 +02:00
gregoirenovel
8d9ca18406 Improve spacing in _model_transfer.html.haml 2017-06-26 10:51:27 +02:00
gregoirenovel
0e3f431d7d Fix indentation in _modal_transfer.html.haml 2017-06-26 10:51:26 +02:00
gregoirenovel
bd2fcebf95 Change a silly title 2017-06-26 10:51:26 +02:00
gregoirenovel
ba5d816ce6 [Fix #176] Delete useless new_assignement email 2017-06-26 10:49:42 +02:00
gregoirenovel
3d11a35da8 Remove some commented code 2017-06-26 10:49:02 +02:00
Mathieu Magnin
8d008a51d0 [fix #474] display devise errors with flashes 2017-06-21 18:07:58 +02:00
Mathieu Magnin
ac5c00c26f [fix #452] redesign sign up form 2017-06-21 17:38:38 +02:00
Mathieu Magnin
6777b51331 rename login css to auth, since it will also be used by sign up 2017-06-21 17:38:34 +02:00
Mathieu Magnin
f1ab350897 fix turbolinks bug when switching between layouts 2017-06-20 17:34:48 +02:00
Mathieu Magnin
250b858128 json style for hashes 2017-06-20 17:31:58 +02:00
Mathieu Magnin
e51d8965a2 [Fix #468] fix demo login 2017-06-20 17:05:05 +02:00
Mathieu Magnin
482002fe79 Avis sign up should use generic layout 2017-06-20 13:56:49 +02:00
Mathieu Magnin
3f20d6fb9d login should use generic two columns layout 2017-06-20 11:42:54 +02:00
Mathieu Magnin
3388dc0e1f Create generic two-columns layout 2017-06-20 11:13:24 +02:00
Mathieu Magnin
a69915d8b5 standardize form title 2017-06-20 10:24:53 +02:00
Mathieu Magnin
f74462d826 Use generic css for avis_sign_up 2017-06-20 10:03:49 +02:00
Mathieu Magnin
2e795fb2a5 single quote => double quotes 2017-06-20 09:51:18 +02:00
Mathieu Magnin
c944088076 Add procedure overview on login 2017-06-19 18:21:15 +02:00
Mathieu Magnin
8b9eda0f43 No login link on header on login page 2017-06-19 18:21:15 +02:00
Mathieu Magnin
b68a8b37e8 Redesign the login form 2017-06-19 18:21:15 +02:00
Mathieu Magnin
a82994f00f Add inputs & labels to patron 2017-06-19 18:21:15 +02:00
Mathieu Magnin
765be88d6d Add expand button on patron 2017-06-19 18:21:15 +02:00
Mathieu Magnin
90a643d4fb Add /patron page 🎨 2017-06-19 18:21:15 +02:00
gregoirenovel
d0b927857a Add stats for encart motivation 2017-06-19 18:01:59 +02:00
Simon Lehericey
523df76ecb Attestation: fix attestation_template_admin_link 2017-06-16 15:44:40 +02:00
Simon Lehericey
b664709c3d [Fix #196] Attestation: allow vizualisation after the procedure is published 2017-06-16 12:11:10 +02:00
Simon Lehericey
671a0575ce [Fix #196] Recapitulatif: user can download its attestation 2017-06-16 12:11:10 +02:00
Simon Lehericey
c0facbf679 [Fix #196] AttestionTemplate: add preview 2017-06-16 12:11:09 +02:00
Simon Lehericey
fdb4d15bcf [Fix #196] AttestationTemplate: add edition 2017-06-16 12:11:09 +02:00
gregoirenovel
b64c6d8817 Add a separator before the “Reouvrir” button 2017-06-13 15:14:51 +02:00
gregoirenovel
b58c02180c [Fix #197] Allow a gestionnaire to add a motivation 2017-06-13 15:14:50 +02:00
gregoirenovel
88267a990d [Fix #197] Show the motivation on a dossier’s details 2017-06-13 15:14:48 +02:00
gregoirenovel
33944e343a Add Backoffice::DossiersController#process_dossier and use it 2017-06-13 15:05:09 +02:00
gregoirenovel
38e8908986 Fix the colors of the graphs on the Stats page 2017-06-13 10:13:20 +02:00
Mathieu Magnin
41a5ed59f3 [Fix #376] Force every browser to use native input[type=date] on date champ 2017-06-12 14:05:31 +02:00
Mathieu Magnin
2653862fa7 Add a placeholder to help IE users to fill the date input with the right format 2017-06-12 14:05:31 +02:00
Mathieu Magnin
95481e7b85 Move date input in a partial 2017-06-12 14:05:31 +02:00
gregoirenovel
8968675cfb [Fix #388] In avis email, redirect a signed in gest. to the dossier
Instead to the sign in page
2017-06-12 10:54:01 +02:00
gregoirenovel
2a74207d15 you_are_invited_on_dossier -> avis_invitation
- shorter
- clearer
2017-06-12 10:53:59 +02:00
gregoirenovel
3c83cc3c52 In Avis sign up, fix the numero character and add a non-breaking space 2017-06-08 14:08:43 +02:00
gregoirenovel
220b71abfd Fix invite guest email
- fix typo
- add a missing non-breaking space
2017-06-08 14:06:58 +02:00
gregoirenovel
07ad7b4c84 mails -> mail_templates 2017-06-08 12:22:46 +02:00
gregoirenovel
07ea0ceea1 Make MailTemplateConcern.slug a constant 2017-06-08 12:22:44 +02:00
gregoirenovel
5a59115df4 Refactor the TAGS management in MailTemplateConcern 2017-06-08 12:22:36 +02:00
gregoirenovel
ba865215af Use the Chartkick colors option 2017-06-07 14:53:10 +02:00
Mathieu Magnin
9d323fd387 Click on Demander une démo, opens a new tab 2017-06-02 15:38:24 +02:00
Mathieu Magnin
8b92b44ab0 Track ask demo click on home page 2017-06-02 10:05:00 +02:00
gregoirenovel
ab1c19c09b Rename some Dossier scopes 2017-06-01 10:58:08 +02:00
Mathieu Magnin
705a3f3e1b Fix cache bug on stats page 2017-06-01 09:44:22 +02:00
Simon Lehericey
c185f60dd2 Avis: ugly workaround for #375 2017-05-31 16:44:06 +02:00
Simon Lehericey
9e6098dc09 Add the weekly avis answer percentage to Stats 2017-05-31 14:24:33 +02:00
Mathieu Magnin
068b635b7c Add the weekly avis answer time average to Stats 2017-05-31 14:24:32 +02:00
Simon Lehericey
b5f1b898c7 Add the weekly avis usage to Stats 2017-05-31 13:31:19 +02:00
Mathieu Magnin
69a5857322 [Fix #264] Add pie chart to count administrations 2017-05-30 15:36:21 +02:00
gregoirenovel
9585142468 Group the cumulative and monthly charts 2017-05-30 12:05:28 +02:00
gregoirenovel
3215411547 Delete the 30 days flows graphs 2017-05-30 12:05:28 +02:00
gregoirenovel
58aa94359c On the Stats page, move the total numbers at the top of the page 2017-05-30 12:05:27 +02:00
gregoirenovel
e19fb43f01 Only show the mean charts to logged in users 2017-05-30 12:05:27 +02:00
gregoirenovel
e242c5d742 Add caching to the Stats page 2017-05-30 12:05:27 +02:00
gregoirenovel
711f21c458 [Fix #264] Add the mean filling time graph to Stats 2017-05-30 12:05:27 +02:00
gregoirenovel
faa547e891 [Fix #264] Add the mean instruction time graph to Stats 2017-05-30 12:05:27 +02:00
gregoirenovel
ed7ba60cf0 [Fix #264] Add the last 4 months evolution graphs to Stats 2017-05-30 12:05:26 +02:00
gregoirenovel
f82533be19 Use the new_application layout for the Stats page 2017-05-29 15:46:54 +02:00
gregoirenovel
627ce150a7 Capture the Chartkick JS and yield it in the layout
So that we can include all the JS at the bottom of
the page without error
2017-05-29 15:46:54 +02:00
Simon Lehericey
7ac6c81154 AdminProceduresInfoHaml: remove localtime to date 2017-05-29 13:53:14 +02:00
Simon Lehericey
64f7cab3cf Avis: add claimant gestionnaire to track who asks for an avis 2017-05-29 11:44:28 +02:00
Simon Lehericey
23e57f5cc4 Navbar: add deprecation warning for invitations 2017-05-29 11:44:28 +02:00
Simon Lehericey
516a8c28c5 Avis: change invitation mail when the recipient is not tps 2017-05-29 11:44:28 +02:00
Simon Lehericey
aaf155df72 Avis: add sign_up logic for new tps gestionnaire 2017-05-29 11:44:28 +02:00
Mathieu Magnin
efdac753c6 When an Avis is created an email is sent to the Gestionnaire 2017-05-29 11:44:28 +02:00
Simon Lehericey
f6359cb7aa gestionnaire invited on dossier for avis, can update Avis 2017-05-29 11:44:28 +02:00
Mathieu Magnin
d07943a55d Add by_latest scope in Avis 2017-05-29 11:44:28 +02:00
Mathieu Magnin
7c662aa7b2 Gestionnaire invited on dossier for avis, cannot see private form / change dossier state / follow dossier / see invited people / see others avis 2017-05-29 11:44:28 +02:00
Mathieu Magnin
43f481b7ff Gestionnaire can list dossiers where he is invited for avis 2017-05-29 11:44:28 +02:00
Mathieu Magnin
c3bf15d49f Create and list Avis on Dossier detail page 2017-05-29 11:44:28 +02:00
Simon Lehericey
5cc4862983 [Fix #349] NewHeader: the logo is a link to root_path 2017-05-29 11:35:29 +02:00
Simon Lehericey
8dabdcc6c4 GestionnaireMailer: add a last week report 2017-05-23 17:12:18 +02:00
Simon Lehericey
b30cb34fa2 LeftPanelBackofficeDossier: fix a typo 2017-05-22 17:58:12 +02:00
gregoirenovel
ca1a61cd7f Remove an extra character in welcome_email.text.erb 2017-05-22 17:24:44 +02:00
Mathieu Magnin
8af72f7b9a Isolate new design stylesheets 2017-05-17 18:06:53 +02:00
Mathieu Magnin
14bfda2e26 [Fix #251] Fix landing page design on mobile (and add responsive) 2017-05-17 18:06:46 +02:00
gregoirenovel
cd19c17df5 mail -> email 2017-05-16 15:10:44 +02:00
gregoirenovel
e6f866d99e Do not use the email address in emails 2017-05-16 15:10:44 +02:00
gregoirenovel
536591078e In emails, add a comma after the salutation phrase 2017-05-16 15:10:44 +02:00
gregoirenovel
ae7cea369d Move the “please do not reply” message below the signature 2017-05-16 15:10:44 +02:00
gregoirenovel
b77c63605a Add a signature to the emails which don’t have one 2017-05-16 15:10:44 +02:00
gregoirenovel
2796eea39a Improve the formatting of reset_password_instructions.html.erb 2017-05-16 15:10:44 +02:00
gregoirenovel
2984c495e6 Add a parting phrase to emails which don’t have one 2017-05-16 15:10:44 +02:00
gregoirenovel
d8c5db4ac5 End the email parting phrase with a comma 2017-05-16 15:10:44 +02:00
gregoirenovel
d5fce6f7b6 Remove the 3 dashes from the emails signature 2017-05-16 15:10:44 +02:00
Simon Lehericey
df731cb895 Fix localtime on date object 2017-05-16 14:40:44 +02:00
Simon Lehericey
8d6838e8ed Mailjet: fix https errors 2017-05-16 13:44:07 +02:00
Simon Lehericey
f2d9953e59 Fix #295: mailjet script should be in https 2017-05-16 10:27:10 +02:00
Mathieu Magnin
9bec2e9536 Fix #281 Remove unreadable tooltip on procedure libelle 2017-05-15 16:55:24 +02:00
gregoirenovel
a58a8684d9 [Fix #285] Gestionnaire.dossiers_follow -> followed_dossiers 2017-05-15 15:51:51 +02:00
Mathieu Magnin
ac1782256a Fix #282 use disable_with to avoid sending same message twice 2017-05-12 17:34:20 +02:00
Mathieu Magnin
8f5fdfa81f Rename dossier_with_notification_for 2017-05-12 15:42:33 +02:00
gregoirenovel
09ba66dc41 [Fix #274] Change the email signatures
- Equide -> Equipe
- TPS -> Téléprocédures simplifiées
- Remove the email address
2017-05-12 13:51:01 +02:00
Mathieu Magnin
e5ac555a41 fix #245 it should only count dossiers with notifications on followed dossiers 2017-05-12 10:13:51 +02:00
Simon Lehericey
cebb197994 Fix #171 : add localtime to a bunch of date 2017-05-11 15:10:49 +02:00
Simon Lehericey
a312628383 Newsletter: add mailjet widget 2017-05-11 10:11:40 +02:00
Simon Lehericey
c6fd3045e4 Fix #261 : add link to return to dossier list. 2017-05-10 16:24:21 +02:00
Mathieu Magnin
054afb40a4 [Fix #50, fix #239] Install chartkick the right way 2017-05-10 09:28:13 +02:00
gregoirenovel
c6d0ea76bb [Fix #174] Make .default-data-block header titles take the full width 2017-05-09 14:36:33 +02:00
gregoirenovel
1a5f9fd067 [Fix #105] Show the pieces justificative’ descriptions 2017-05-09 12:47:21 +02:00
Simon Lehericey
5d915ada88 Css: add border on header and footer
Remove headers border on homepage
2017-05-09 12:38:57 +02:00
Simon Lehericey
9f1217c843 FlashMessage: center flash message
otherwise the #flash_message.center is useless
2017-05-09 12:28:27 +02:00
Simon Lehericey
9d16c0365a Notification: remove useless notification system 2017-05-05 14:08:36 +02:00
Simon Lehericey
dc371b83b8 CSS: add new application layout + CSS
Without bootstrap!
2017-05-04 18:24:57 +02:00
gregoirenovel
6b25d25a9a The correct app name is “Téléprocédures Simplifiées” 2017-05-04 18:19:13 +02:00
gregoirenovel
9a0df71887 Change the link to a linked dossier depending on the user profile 2017-05-04 17:20:18 +02:00
gregoirenovel
849ab5191a [Fix #204] Add the date_de_decision tag in relevant email templates 2017-05-04 16:17:59 +02:00
gregoirenovel
3bd5e32dff Add a system to restrain the email templates tags to specific templates 2017-05-04 16:17:39 +02:00
gregoirenovel
43ae28de87 Make the email templates tags table occupy the whole width available
It improves the content formatting (no more ugly
line breaks splitting a tag on several lines)
2017-05-04 16:17:38 +02:00
gregoirenovel
f3343f593f Fix some spelling mistakes 2017-05-04 16:15:51 +02:00
gregoirenovel
53e5416627 Remove an unused file 2017-05-04 16:01:41 +02:00
gregoirenovel
402f44c5fd Champs privés -> Annotations privées 2017-05-04 11:35:23 +02:00
gregoirenovel
77dae0462b Utilisateur -> Usager 2017-05-04 11:35:23 +02:00
gregoirenovel
4303dcef2c Organisation -> Organisme 2017-05-04 11:35:22 +02:00
gregoirenovel
d3a84eb20a Démarche -> Procédure 2017-05-04 11:33:26 +02:00
Mathieu Magnin
b6e1526f89 Fix #239, (refresh is needed to load charts) 2017-05-03 18:48:27 +02:00
gregoirenovel
f310f672b6 Extract class attributes from HAML tag attributes 2017-04-26 17:22:31 +02:00
gregoirenovel
7ddcb9aedc Extract id attributes from HAML tag attributes 2017-04-26 17:22:30 +02:00
gregoirenovel
51daa2f498 Use implicit div tags instead of explicit 2017-04-26 17:01:45 +02:00
Mathieu Magnin
6ef6a66c3f Remove @facade_data_view from left_panel view 2017-04-26 16:55:22 +02:00
gregoirenovel
f58a626648 [Fix #99] Improve the info message in _dossier_link.html.haml 2017-04-26 16:47:38 +02:00
gregoirenovel
a6d3ea8536 [Fix #133] Improve the linked dossier informations displayed 2017-04-26 15:59:18 +02:00
gregoirenovel
7173d359d4 [Fix #132] Show the dossier link in the dossier detail for Users
There’s no reason why they couldn’t easily
navigate to it

Also improve the typography of a placeholder
message
2017-04-26 11:57:36 +02:00
gregoirenovel
8deef8e8e3 [Fix #137] Change the dossier link placeholder
Otherwise we don’t know what to enter (words,
numbers…)
2017-04-26 11:46:39 +02:00
gregoirenovel
14b7badfed Eager-load the dossier’s procedure when possible 2017-04-26 09:53:10 +02:00
gregoirenovel
6bb67d639c Use lowercase letters and dashes for CSS classes
As enforced by scss-lint
2017-04-25 15:59:03 +02:00
gregoirenovel
8bea7cb610 Fix a typographic mistake in _dossier_link.html.haml
Sentences should start with an uppercase letter
2017-04-25 15:59:03 +02:00
gregoirenovel
f8cb34a393 Add some spacing in _dossier_link.html.haml 2017-04-25 15:59:03 +02:00
Mathieu Magnin
887512c26c Procedure path can contain dashes and can be longer 2017-04-21 16:32:48 +02:00
gregoirenovel
595ea9bb37 Add a “Call Us” CTA on the landing page 2017-04-21 14:57:54 +02:00
gregoirenovel
03761c1136 Change the testimonials’ order 2017-04-21 14:57:54 +02:00
Mathieu Magnin
7a9fd77af0 Remove archived=false filter from en_construction scope (Fix : archived dossier is not shown to user) 2017-04-21 14:36:50 +02:00
Mathieu Magnin
1a628dc42c Remove DossierListFacade dependency 2017-04-21 14:36:50 +02:00
gregoirenovel
0ddd7ae639 Add the “CTA” part of the landing page 2017-04-20 12:38:00 +02:00
gregoirenovel
663b556766 Add the “Users” part of the landing page 2017-04-20 12:38:00 +02:00
gregoirenovel
f604ccb7d6 Add the “Numbers” part of the landing page 2017-04-20 12:37:59 +02:00
gregoirenovel
4b2baa25b7 Add the “Testimonials” part of the landing page 2017-04-20 12:37:58 +02:00
gregoirenovel
58a7f399c0 Add the “Features” part of the landing page 2017-04-20 12:18:18 +02:00
gregoirenovel
663cd18364 Change the landing page, add the “Hero” part 2017-04-20 12:18:17 +02:00
gregoirenovel
e504531ca0 Use the new_application layout for the landing page 2017-04-20 12:18:16 +02:00
gregoirenovel
f9b4469660 Add the new footer 2017-04-20 12:18:16 +02:00
gregoirenovel
336e6120a6 Add the new header 2017-04-20 12:18:16 +02:00
gregoirenovel
e605be9246 Add the new_application layout 2017-04-20 12:18:15 +02:00
gregoirenovel
c10c2fc31b Selectors must be written in lowercase with hyphens 2017-04-20 10:35:53 +02:00
gregoirenovel
4b39e76c8a Use extend only with placeholders 2017-04-19 17:05:57 +02:00
Simon Lehericey
ce4a23ec7f MandatoryAttachment: show * near mandatory attachment 2017-04-19 15:45:45 +02:00
gregoirenovel
b00eb914da Use case statements instead of if statements where appropriated 2017-04-19 11:57:49 +02:00
gregoirenovel
ddf02ccd6d Use a non-breaking space after the “numéro” contraction 2017-04-19 11:19:53 +02:00
gregoirenovel
aa41349f0c Lowercase the “n” of “numéro” contraction where needed 2017-04-19 11:19:53 +02:00
gregoirenovel
ba4ee68019 Use masculine ordinal indicator instead of the degree sign
It’s the right way to contract “numéro”

We should use the superscript lowercase o but
it’s hard to do in places where only raw text is
available
2017-04-19 11:19:53 +02:00
Simon Lehericey
4cd21580fb DescriptionController: move html_safe to the view
html_safe could not work upon redirection as stated here :
https://groups.google.com/forum/#!topic/rubyonrails-core/z52zgDgUmbs
2017-04-19 10:52:04 +02:00
Simon Lehericey
8e7e7a8ab4 Stats Index: remove useless locale 2017-04-19 10:06:22 +02:00
Simon Lehericey
e49ea2d0e0 PiecesJustificative: add field to set it mandatory
small css to align the fields
2017-04-18 17:48:03 +02:00
gregoirenovel
3abbb0bdcd Use french formatting for numbers on the Stats page 2017-04-18 14:34:56 +02:00
gregoirenovel
21ff863dab [Fix #112] Add favicons 2017-04-17 19:32:26 +02:00
gregoirenovel
d531b02bc5 Order types_de_piece_justificative on Procedure
So that /spec/controllers/api/v1/
dossiers_controller_spec.rb#L163-L179 (on commit
8852431 for example) does not randomly fail due
to unordered types_de_piece_justificative
2017-04-13 14:48:18 +02:00
gregoirenovel
11015787bf Add new total numbers to the Stats page 2017-04-11 16:51:38 +02:00
gregoirenovel
52ea4a1b8d Add new charts and a segmented control to the Stats page 2017-04-11 16:51:38 +02:00
gregoirenovel
9dc4901294 Change the template and style of the Stats page 2017-04-11 15:29:19 +02:00
gregoirenovel
e192038045 Rename the variables in StatsController#index 2017-04-11 15:29:19 +02:00
gregoirenovel
664d821dc0 Add a link to the Stats page in the footer 2017-04-11 15:29:18 +02:00
gregoirenovel
f84cd7f11b Make Stats a public page 2017-04-11 15:29:18 +02:00
gregoirenovel
dd1fd419c7 Require mandatory fields on the frontend side 2017-04-11 14:25:49 +02:00
Simon Lehericey
a324a22ba2 DossierLink: add show template 2017-04-11 13:54:33 +02:00
Simon Lehericey
3228737a87 DossierLink: add edition template 2017-04-11 13:54:33 +02:00
gregoirenovel
57ee3c5b3f Separate ternary operators with spaces on both sides 2017-04-10 17:55:55 +02:00
gregoirenovel
9c04d3ff93 All CSS declarations must end with a semi-colon 2017-04-10 17:55:55 +02:00
gregoirenovel
3797015908 All colons must be followed by a single space 2017-04-10 17:55:55 +02:00
gregoirenovel
97df69bcd8 In HAML files, separate arguments by a comma and a single space 2017-04-10 17:55:55 +02:00
gregoirenovel
6db4a69cb2 Use spaces inside hashes 2017-04-10 17:55:54 +02:00
gregoirenovel
aaaed328fb Remove unnecessary string outputs 2017-04-10 17:55:54 +02:00
gregoirenovel
8d9cdf8e33 Remove a useless string in the gestionnaires list 2017-04-10 17:55:54 +02:00
gregoirenovel
6cb53b5545 Move a comment to avoid a haml-lint MultilineScript warning 2017-04-10 17:55:54 +02:00
gregoirenovel
7a941d3219 Remove a useless id in _list.html.haml 2017-04-10 17:55:54 +02:00
gregoirenovel
aa255e7e2d Use HAML comments in HAML files 2017-04-10 17:55:54 +02:00
gregoirenovel
69ba92009b Separate HAML comments from the leading # by a space 2017-04-10 17:55:54 +02:00
gregoirenovel
a8d2a003c1 Do not define static class names in the attributes hash 2017-04-10 17:55:53 +02:00
gregoirenovel
4788e280f5 Fix the indentation in the drop down list template 2017-04-10 17:55:53 +02:00
gregoirenovel
2d5df47c4e Use implicit div tags in HAML files 2017-04-10 17:55:53 +02:00
gregoirenovel
7e067c2624 Static classes attribute must use the inline tag syntax 2017-04-10 17:55:53 +02:00
gregoirenovel
a3d04fe7a9 Html Ruby evaluation tags must be followed by a single space 2017-04-10 17:55:53 +02:00
gregoirenovel
e7e4e41e12 Haml Ruby evaluation tags must be followed by a space 2017-04-10 17:55:53 +02:00
Mathieu Magnin
b18c09e9fd Download dossiers button exports all dossiers except draft 2017-04-05 11:04:53 +02:00
gregoirenovel
d1e463b7ab Files should end with a single new line 2017-04-04 16:59:39 +02:00
gregoirenovel
d5e7bbd80d Files should end with a new line 2017-04-04 16:59:38 +02:00
gregoirenovel
15802b18ea Files should not start with a new line 2017-04-04 16:59:38 +02:00
gregoirenovel
87ab2ba9eb Remove trailing spaces 2017-04-04 16:59:37 +02:00
gregoirenovel
6cb78acd85 Make the birthday field a date field
And remove the date picker (you can now use the
native one)
2017-04-03 16:03:38 +02:00
gregoirenovel
8126549a0d Make the datepicker french for the auto archive field 2017-04-03 16:03:38 +02:00
Mathieu Magnin
d5e5a7997a Disable turbolinks cache to avoid weird behavior (ex: page change twice after single click) 2017-04-03 15:43:42 +02:00
Mathieu Magnin
08442e64a3 Update turbolinks 2017-04-03 15:43:41 +02:00
Mathieu Magnin
95b83a57c1 Checkbox should be checked when value is 'on' 2017-04-03 10:50:15 +02:00
Mathieu Magnin
e4826b468a Fix departements / pays / regions drop down list 2017-03-29 14:22:23 +02:00
gregoirenovel
c6738bf223 Rename Mr in M. 2017-03-27 15:45:07 +02:00
Mathieu Magnin
c2a27c6f6a Merge branch 'develop' into auto_archive_on_date 2017-03-22 11:32:56 +01:00
Mathieu Magnin
8e91d4ba97 Merge branch 'develop' into select_multiple 2017-03-20 12:30:42 +01:00
Simon Lehericey
a076dc2987 Wording 2017-03-20 12:03:27 +01:00
Simon Lehericey
ce343aac96 Select Multiple: text in placeholder and add separator 2017-03-20 11:36:06 +01:00
Simon Lehericey
3ed14bf1a4 Cleaning 2017-03-15 17:51:34 +01:00
Simon Lehericey
657ce53a60 select_multiple: add multiple_drop_down_list type 2017-03-15 17:51:34 +01:00
Mathieu Magnin
a87b54b168 Typo 2017-03-15 15:28:09 +01:00
Mathieu Magnin
237d4bdc28 Auto archive option is available even if procedure is published 2017-03-15 15:22:29 +01:00
Mathieu Magnin
24d17dc0f3 Sidekiq worker to archive procedures automatically + tests 2017-03-15 12:40:59 +01:00
Simon Lehericey
7596c2424e Explication: do not show explication in _infos_dossier 2017-03-14 13:59:37 +01:00
Simon Lehericey
d250cafccc Explication: add champ in edit formulaire 2017-03-14 13:58:21 +01:00
Simon Lehericey
fcca0bb247 Cleaning 2017-03-14 13:54:31 +01:00
Mathieu Magnin
359807b4f7 Procedure has an auto_archive date 2017-03-14 10:45:59 +01:00
Simon Lehericey
176092c256 Explication: add field and template 2017-03-13 15:02:05 +01:00
Simon Lehericey
ec0092fb3c Cleaning 2017-03-13 15:01:41 +01:00
Mathieu Magnin
ad1250af6f Add confirm popup on important actions 2017-03-09 16:55:47 +01:00
Mathieu Magnin
48d12cfa34 max width in Administration 2017-03-08 14:52:37 +01:00
Simon Lehericey
66cb0c09b1 Stats: wording 2017-03-08 14:26:45 +01:00
Mathieu Magnin
5d4e8622f6 Merge pull request #38 from sgmap/stats
Stats: add adminitrations stats view
2017-03-08 10:59:06 +01:00
Mathieu Magnin
342a6b239e Small css changes 2017-03-08 10:55:24 +01:00
LeSim
78325cc9f9 Merge pull request #34 from sgmap/customize_submission_mail
Customize submission mail
2017-03-07 18:32:55 +01:00
Simon Lehericey
6cb88a995f Stats: add adminitrations stats view 2017-03-07 18:09:09 +01:00
Mathieu Magnin
4ea7635dfc Fix after review 2017-03-07 16:23:44 +01:00
LeSim
2e19dd26b7 Merge pull request #36 from sgmap/remember_me
Add remember me on login
2017-03-07 14:15:37 +01:00
LeSim
9764604430 Merge branch 'develop' into customize_submission_mail 2017-03-07 11:05:04 +01:00
Mathieu Magnin
a88b150c3c Add remember me on login 2017-03-07 10:29:48 +01:00
Simon Lehericey
65e83dd6ec Mails: factorize default and change slug 2017-03-07 10:27:14 +01:00
Simon Lehericey
335caed65e Mail Template: Delete 2017-03-07 10:27:14 +01:00
Simon Lehericey
695dc16b85 Mails: add refused, without_continuation, draft, closed, received mails object 2017-03-07 10:27:05 +01:00
Simon Lehericey
7b336922cc Cleaning 2017-03-07 10:25:34 +01:00
Simon Lehericey
89763ec8d4 MailTemplateController: use new initiated_mail 2017-03-07 10:25:34 +01:00
Simon Lehericey
47fc6e6957 InitiatedEmail: add initiated email 2017-03-07 10:25:28 +01:00
Simon Lehericey
a334888363 Wording 2017-03-06 20:44:25 +01:00
Mathieu Magnin
7e4f473027 When procedure is archived user can update dossier if not in brouillon 2017-03-06 15:03:51 +01:00
Mathieu Magnin
a24980145c Block dossier initiation if procedure is archived 2017-03-06 14:29:01 +01:00
Simon Lehericey
7eb77ba667 Mail Received: remove useless template_decorator 2017-03-05 22:17:17 +01:00
Mathieu Magnin
d03016db9c Merge branch 'develop' into list_dossiers_archived 2017-03-02 16:22:59 +01:00
Simon Lehericey
5cceb9773c Style: simple css for custom emails list 2017-03-02 16:19:05 +01:00
Mathieu Magnin
c77c46bf37 Remove unused title 2017-03-02 11:53:03 +01:00
Mathieu Magnin
e9147a8e76 Fix floating login button 2017-03-02 11:20:20 +01:00
Simon Lehericey
494d5fed5c Dossier_list_controller: renaming 2017-03-01 16:00:39 +01:00
Simon Lehericey
ca799421c9 backoffice dossiers index: simple cleaning 2017-03-01 15:51:02 +01:00
Simon Lehericey
0862f2fc51 Dossier_list_controller: same name pattern 2017-03-01 15:51:02 +01:00
Mathieu Magnin
87865fcf1b Merge branch 'develop' into list_dossiers_archived 2017-03-01 10:35:20 +01:00
LeSim
0da239c657 Merge branch 'develop' into simplify_dossier_workflow 2017-02-28 15:23:25 +01:00
Simon Lehericey
870d3719e1 Dossier: add method to allow gestionnaire to reopen dossier 2017-02-28 15:14:27 +01:00
Simon Lehericey
43e6f15c5f Style: fix backoffice navbar 2017-02-28 15:14:01 +01:00
Mathieu Magnin
67daaa033c Merge pull request #28 from sgmap/simplify_dossier_workflow
Simplify dossier workflow
2017-02-28 14:56:57 +01:00
Mathieu Magnin
fa884f3ed0 Unarchive button & tests 2017-02-28 14:33:05 +01:00
Simon Lehericey
7b877dc28f Style: fix backoffice dossier width for small screen 2017-02-28 13:54:19 +01:00
Mathieu Magnin
ef1d46d30e Fix tests 2017-02-28 11:37:37 +01:00
Mathieu Magnin
6774dd008f List dossiers archived 2017-02-27 17:44:08 +01:00
Mathieu Magnin
4cc6aedfb9 Fix tests after workflow simplication 2017-02-27 11:56:26 +01:00
Mathieu Magnin
10add61bd1 Clean some tests after removing :validated & :submitted states 2017-02-23 17:54:11 +01:00
Mathieu Magnin
3fcf9bf350 Landing is no longer a symlink on prod/staging env, new call to action on landing is a mailto 2017-02-22 16:07:06 +01:00
Mathieu Magnin
cae5b37e38 First step to remove :validated and :submitted states 2017-02-21 18:05:48 +01:00
Mathieu Magnin
6f1243eb7e Do not hide link if procedure is archived 2017-02-21 11:05:11 +01:00
Mathieu Magnin
ab0d8deef1 Modify wording : Procedure can be edited after publication 2017-02-20 15:08:31 +01:00
Mathieu Magnin
ff9c95f18e Merge branch 'develop' into admin_can_modify_procedure_description_after_published 2017-02-16 15:59:49 +01:00
Mathieu Magnin
9fcc0920e6 Css update 2017-02-16 13:59:32 +01:00
Mathieu Magnin
a636d4f98d Filter procedure update parms if procedure is locked 2017-02-15 14:13:02 +01:00
Mathieu Magnin
85608f18ab Description page is accessible, some field are disabled if procedure is locked 2017-02-14 18:13:19 +01:00
Mathieu Magnin
c0ae500aa3 Merge branch 'develop' into remove_cerfa_text 2017-02-14 17:59:41 +01:00
Mathieu Magnin
9986ab1f01 Merge pull request #21 from sgmap/clean_grid
Clean grid
2017-02-14 17:58:15 +01:00
LeSim
7bc6e67e15 Merge pull request #19 from sgmap/clickable-links-in-champs-description
Add clickable links in champ description and use bootstrap layout for…
2017-02-14 17:28:03 +01:00
Simon Lehericey
5359c046e6 Clean grid usage 2017-02-14 17:12:44 +01:00
Simon Lehericey
3b827fa5e3 Remove specific cerfa in favor of default enclosed documents 2017-02-14 16:26:25 +01:00
Mathieu Magnin
11c793a60c Remove custom button code, use bootstrap classes 2017-02-14 16:23:48 +01:00
Mathieu Magnin
6c41cbcc5e Clean css 2017-02-14 16:20:52 +01:00
Mathieu Magnin
1e3c5bf14a Fix engagement field 2017-02-14 15:23:39 +01:00
Mathieu Magnin
f60098311e Fix hidden checkbox bug, address field : full width 2017-02-14 14:55:08 +01:00
Mathieu Magnin
b08a4c5091 Fix style for checkbox and radios 2017-02-14 14:34:00 +01:00
Mathieu Magnin
308a037f19 Add clickable links in champ description and use bootstrap layout for forms 2017-02-14 11:13:48 +01:00
Xavier J
5d733c11fd Delete references @opensimplif 2017-02-13 15:46:28 +01:00
Xavier Julien
3c6ae2d005 Merge pull request #14 from sgmap/customizable-emails
Customizable emails
2017-02-13 15:20:04 +01:00
Mathieu Magnin
5613b896b1 Gestionnaire can archive dossier 2017-02-08 17:35:28 +01:00
Mathieu Magnin
82546a3ad4 Fix merge error 2017-02-08 15:32:49 +01:00
Mathieu Magnin
f15e9ec7da In dev mode, demo buttons link to localhost 2017-02-07 18:12:25 +01:00
Mathieu Magnin
566fd8bc74 Add lien demarche to type de piece justificative 2017-02-07 18:12:25 +01:00
Xavier J
5edd16c30f Fix indentation 2017-02-07 17:52:56 +01:00
Xavier J
7cd08ec3f9 Merge branch 'develop' into print_css_for_dossier_show
# Conflicts:
#	app/views/dossiers/_messagerie.html.haml
2017-02-07 17:38:02 +01:00
Mathieu Magnin
749baedf43 Replace administration with services instructeurs 2017-02-01 18:05:58 +01:00
Mathieu Magnin
e99746639b Merge branch 'send_user_notification_when_invite_send_a_message' into develop 2017-02-01 17:01:34 +01:00