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 |
|
gregoirenovel
|
70f637f088
|
[Fix #198] Add a Commentaire when we send a Notification email to a user
|
2017-05-12 14:03:48 +02:00 |
|
gregoirenovel
|
49d1a1c0b8
|
Merge pull request #279 from sgmap/fix-274
Homogéinisation des signatures / changement de l'adresse email d'envoi
|
2017-05-12 14:03:20 +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 |
|
gregoirenovel
|
84ae1a0c0b
|
Change the email address we send emails with
Also add a display name, so that we don't show
just a dumb email address
|
2017-05-12 13:50:42 +02:00 |
|
gregoirenovel
|
e14d1a6c15
|
Remove useless from parameter in mailers
We already defined a default one in
ApplicationMailer
|
2017-05-12 13:50:41 +02:00 |
|
Mathieu Magnin
|
503f174f4b
|
Merge pull request #273 from sgmap/fix_notifications_count
Fix notifications count
|
2017-05-12 10:26:46 +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 |
|
Mathieu Magnin
|
cfba1af7a4
|
Ensure that read notifications are not counted
|
2017-05-12 10:13:51 +02:00 |
|
Mathieu Magnin
|
459c2afe33
|
remove empty line
|
2017-05-11 18:18:28 +02:00 |
|
Mathieu Magnin
|
05d7c96f5e
|
Merge pull request #277 from sgmap/Fix_171_wrong_date
Fix #171 : add localtime to a bunch of date
|
2017-05-11 18:07:27 +02:00 |
|
Simon Lehericey
|
cebb197994
|
Fix #171 : add localtime to a bunch of date
|
2017-05-11 15:10:49 +02:00 |
|
gregoirenovel
|
72fac9a731
|
Merge pull request #275 from sgmap/remove_dead_code
Clean: remove dead code
|
2017-05-11 14:40:58 +02:00 |
|
Simon Lehericey
|
07dfec9236
|
Clean: remove dead code
|
2017-05-11 12:45:01 +02:00 |
|
LeSim
|
7fdcb0271d
|
Merge pull request #269 from sgmap/newsletter
Newsletter: add mailjet widget #263
|
2017-05-11 10:16:37 +02:00 |
|