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 |
|
Simon Lehericey
|
a312628383
|
Newsletter: add mailjet widget
|
2017-05-11 10:11:40 +02:00 |
|
LeSim
|
a16b13464a
|
Merge pull request #270 from sgmap/back_to_dossier
Fix #261 : add link to return to dossier list.
|
2017-05-10 16:54:04 +02:00 |
|
Simon Lehericey
|
c6fd3045e4
|
Fix #261 : add link to return to dossier list.
|
2017-05-10 16:24:21 +02:00 |
|
gregoirenovel
|
ac0904b0d6
|
Merge branch 'staging'
|
2017-05-10 09:43:52 +02:00 |
|
gregoirenovel
|
dd69c73b46
|
Merge branch 'develop' into staging
|
2017-05-10 09:31:05 +02:00 |
|
gregoirenovel
|
f6704dd4c7
|
Merge pull request #266 from sgmap/fix_chartkick_not_initialized
Install chartkick the right way
|
2017-05-10 09:29:35 +02:00 |
|
Mathieu Magnin
|
054afb40a4
|
[Fix #50, fix #239] Install chartkick the right way
|
2017-05-10 09:28:13 +02:00 |
|
gregoirenovel
|
2699b77dca
|
Merge pull request #265 from sgmap/dead-code
Remove dead code
|
2017-05-09 18:15:39 +02:00 |
|
gregoirenovel
|
38480ef3ed
|
Remove dead code
|
2017-05-09 16:39:39 +02:00 |
|
gregoirenovel
|
73bd852e20
|
Merge branch 'develop' into staging
|
2017-05-09 15:39:58 +02:00 |
|
gregoirenovel
|
f3cf0c39c5
|
Merge pull request #259 from sgmap/fix-174
[Fix #174] Make .default-data-block header titles take the full width
|
2017-05-09 15:39:24 +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
|
9e86f7934b
|
Merge pull request #253 from sgmap/fix-105
[Fix #105] Show the pieces justificative’ descriptions
|
2017-05-09 14:35:54 +02:00 |
|
gregoirenovel
|
1a5f9fd067
|
[Fix #105] Show the pieces justificative’ descriptions
|
2017-05-09 12:47:21 +02:00 |
|
gregoirenovel
|
ecca3b3f37
|
Add a missing test for _pieces_justificatives.html.haml
|
2017-05-09 12:47:20 +02:00 |
|
LeSim
|
30d3702a69
|
Merge pull request #260 from sgmap/border_on_header_and_footer
Css: add border on header and footer
|
2017-05-09 12:43:34 +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 |
|
LeSim
|
d447148fca
|
Merge pull request #255 from sgmap/fix_centered_flash_message
FlashMessage: center flash message
|
2017-05-09 12:38:18 +02:00 |
|
Simon Lehericey
|
9f1217c843
|
FlashMessage: center flash message
otherwise the #flash_message.center is useless
|
2017-05-09 12:28:27 +02:00 |
|
LeSim
|
f8b83d6b7c
|
Merge pull request #262 from sgmap/fix_colors_import_for_alert
Css: fix color import
|
2017-05-09 12:22:31 +02:00 |
|
Simon Lehericey
|
029186fdf7
|
Css: fix color import
|
2017-05-09 12:18:52 +02:00 |
|
LeSim
|
2acf71ce97
|
Merge pull request #258 from sgmap/add_alert_in_new_style
Css: add alert css to new style
|
2017-05-09 11:59:46 +02:00 |
|
Simon Lehericey
|
bf68814f7a
|
Css: add alert css to new style
|
2017-05-09 11:59:21 +02:00 |
|
LeSim
|
09e2b4ebfd
|
Merge pull request #257 from sgmap/add_center_in_new_style
Css: add center class in new style
|
2017-05-09 10:11:28 +02:00 |
|
Simon Lehericey
|
2668b036b4
|
Css: add center class in new style
|
2017-05-05 14:59:00 +02:00 |
|
LeSim
|
dfc7872b63
|
Merge pull request #256 from sgmap/remove_useless_cable_logic
Cable: remove useless js logic
|
2017-05-05 14:43:15 +02:00 |
|