Commit graph

7898 commits

Author SHA1 Message Date
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
d00b5b5ac3 Merge pull request #326 from sgmap/use_filter
Refactor: use select block to select stuff
2017-05-17 11:55:30 +02:00
Simon Lehericey
a213032f28 Refactor: use select block to select stuff 2017-05-17 11:18:01 +02:00
gregoirenovel
a412823257 Merge pull request #303 from sgmap/emails
Emails
2017-05-17 10:17:54 +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
c670d6ff26 Merge branch 'staging' 2017-05-16 14:55:16 +02:00
Simon Lehericey
cf1bf569af Merge branch 'develop' into staging 2017-05-16 14:48:11 +02:00
Mathieu Magnin
3b2b506dec Merge pull request #309 from sgmap/Fix_localetime_on_date
Fix localtime on date object
2017-05-16 14:47:16 +02:00
Simon Lehericey
df731cb895 Fix localtime on date object 2017-05-16 14:40:44 +02:00
Simon Lehericey
e912699807 Merge branch 'staging' 2017-05-16 14:01:30 +02:00
Simon Lehericey
cce56eddef Merge branch 'develop' into staging 2017-05-16 13:50:37 +02:00
LeSim
1121fc4211 Merge pull request #308 from sgmap/Fix_mailjet_https
Mailjet: fix https errors
2017-05-16 13:48:30 +02:00
Simon Lehericey
8d6838e8ed Mailjet: fix https errors 2017-05-16 13:44:07 +02:00
gregoirenovel
b8a10b91c1 Merge branch 'staging' 2017-05-16 11:28:42 +02:00
gregoirenovel
88a38ea9d5 Merge branch 'develop' into staging 2017-05-16 10:42:48 +02:00
gregoirenovel
972d1dc5b4 Merge pull request #296 from sgmap/Fix295_use_https_for_mailjet
Fix #295: mailjet script should be in https
2017-05-16 10:30:01 +02:00
Simon Lehericey
f2d9953e59 Fix #295: mailjet script should be in https 2017-05-16 10:27:10 +02:00
gregoirenovel
e2893545b2 Merge branch 'develop' into staging 2017-05-16 10:03:18 +02:00
gregoirenovel
f5a17ea1ab Merge pull request #293 from sgmap/281_remove_tooltip
Fix #281 Remove unreadable tooltip on procedure libelle
2017-05-15 16:57:32 +02:00
Mathieu Magnin
9bec2e9536 Fix #281 Remove unreadable tooltip on procedure libelle 2017-05-15 16:55:24 +02:00
gregoirenovel
bce8fd42bc Merge pull request #291 from sgmap/dossiers-follow
[Fix #285] Use has_many and rename Gestionnaire#dossiers_follow
2017-05-15 15:52:17 +02:00
gregoirenovel
a58a8684d9 [Fix #285] Gestionnaire.dossiers_follow -> followed_dossiers 2017-05-15 15:51:51 +02:00
gregoirenovel
f67aa63766 [Fix #285] Use a has_many through for Gestionnaire#dossiers_follow 2017-05-15 15:51:51 +02:00
LeSim
318a14dfe2 Merge pull request #292 from sgmap/fix_locales
Locales: fix wrong indentation in yaml
2017-05-15 15:37:46 +02:00
Simon Lehericey
48a7f8aaf2 Locales: fix wrong indentation in yaml 2017-05-15 15:14:03 +02:00
gregoirenovel
bd31cf2146 Merge pull request #289 from sgmap/binstubs
[Ref #288] Remove /bin from .gitignore, add binstubs
2017-05-12 17:40:58 +02:00
gregoirenovel
2b25a17af1 [Ref #288] Remove /bin from .gitignore, add binstubs 2017-05-12 17:40:22 +02:00
Mathieu Magnin
325d250540 Merge pull request #283 from sgmap/fix_282
[Fix #282] use disable_with to avoid sending same message twice
2017-05-12 17:39: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
4b1c96cdff Merge pull request #290 from sgmap/mutualise-email
Mutualize the email address in a localised string
2017-05-12 17:04:00 +02:00
gregoirenovel
8ba55a0d5d Mutualize the email address in a localised string 2017-05-12 16:53:03 +02:00
gregoirenovel
7f9c271938 Merge pull request #287 from sgmap/commentaire-refactor
Commentaire refactor
2017-05-12 16:52:32 +02:00
gregoirenovel
8a5420301c Add Commentaire#notify to dispatch notifications 2017-05-12 16:31:03 +02:00
gregoirenovel
1235fce34a Refactor Commentaire#notify_user 2017-05-12 16:31:02 +02:00
gregoirenovel
c07b83b266 Commentaire#notify_user_with_mail -> #notify_user 2017-05-12 16:31:02 +02:00
gregoirenovel
9c3cde2b2e Move CommentairesController#notify_user_user_with_mail to Commentaire 2017-05-12 16:31:02 +02:00
gregoirenovel
cae3e1f420 Commentaire#internal_notification => #notify_gestionnaires 2017-05-12 16:31:02 +02:00
gregoirenovel
c65b1e232a Merge pull request #284 from sgmap/rename_and_refactor_dossier_with_notification_for
[Fix #276] Rename and refactor dossier_with_notification_for
2017-05-12 16:30:40 +02:00
Mathieu Magnin
58abd9eaf1 Fix #276 Rewrite #dossiers_with_notifications_count_for_procedure and add tests 2017-05-12 15:42:33 +02:00
Mathieu Magnin
8f5fdfa81f Rename dossier_with_notification_for 2017-05-12 15:42:33 +02:00
gregoirenovel
339b8791f1 Merge pull request #280 from sgmap/fix-198
[Fix #198] Add a Commentaire when we send a Notification email to a user
2017-05-12 14:08:11 +02:00