Commit graph

2154 commits

Author SHA1 Message Date
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
Simon Lehericey
a26965f41b Cable: remove useless js logic 2017-05-05 14:37:59 +02:00
LeSim
c6598f36d6 Merge pull request #254 from sgmap/remove_notification_system
Notification: remove useless notification system
2017-05-05 14:23:45 +02:00
Simon Lehericey
9d16c0365a Notification: remove useless notification system 2017-05-05 14:08:36 +02:00
gregoirenovel
7a597a802c Merge pull request #152 from sgmap/fix-stats
Fix stats
2017-05-05 12:04:32 +02:00
gregoirenovel
02a8cf3fe1 Use the initialisation date for the cumulative dossiers
We want to show when dossiers were published, not
created
2017-05-05 12:03:54 +02:00
gregoirenovel
06714b5fc3 Add a date_attribute argument to StatsController#cumulative_hash 2017-05-05 12:03:53 +02:00
gregoirenovel
dbf891b333 Use the initialisation date for the dossiers 30 days flow
We want to show when dossiers were published, not
created
2017-05-05 12:03:53 +02:00
gregoirenovel
c7999b9691 Add a date_attribute argument to StatsController#thirty_days_flow 2017-05-05 12:03:53 +02:00
gregoirenovel
4f8e5ed309 Merge pull request #240 from sgmap/new_style
New style
2017-05-04 18:26:40 +02:00
Simon Lehericey
dc371b83b8 CSS: add new application layout + CSS
Without bootstrap!
2017-05-04 18:24:57 +02:00
Simon Lehericey
aee17c5b19 CSS: CSS filenames should not contain dashes 2017-05-04 18:24:39 +02:00
Simon Lehericey
e7383c7c85 CSS: add Meyer's reset.scss 2017-05-04 18:24:14 +02:00
Simon Lehericey
38dcf5c74d Application.scss: replace require_tree by explicit import
Change needed for futur new_application.scss and corresponding style
2017-05-04 18:23:55 +02:00
gregoirenovel
6b25d25a9a The correct app name is “Téléprocédures Simplifiées” 2017-05-04 18:19:13 +02:00
Mathieu Magnin
4591f2fdbe TéléProcédure Simplifiée => TéléProcédures Simplifiées 2017-05-04 18:07:55 +02:00
gregoirenovel
99b232947e Merge pull request #232 from sgmap/fix-dossier-link
Change the link to a linked dossier depending on the user profile
2017-05-04 17:46:06 +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
29eed8227a Merge pull request #236 from sgmap/remove-as-csv
[Fix #126] Remove the now useless as_csv gem
2017-05-04 17:01:51 +02:00
gregoirenovel
250c47e145 [Fix #126] Remove the now useless as_csv gem 2017-05-04 17:01:24 +02:00
gregoirenovel
d563366ba7 Merge pull request #235 from sgmap/fix-204
[Fix #204] Add the date_de_decision tag
2017-05-04 16:21:06 +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
2582b44f07 [Fix #204] Add the date_de_decision tag 2017-05-04 16:17:53 +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
30cf475485 Add missing brackets in mail_template_concern.rb 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
f389bbeb53 Fix indentation in mail_template_concern.rb 2017-05-04 16:17:38 +02:00
gregoirenovel
ba5a649f6b Merge pull request #156 from sgmap/spelling
Fix some spelling mistakes
2017-05-04 16:16:46 +02:00
gregoirenovel
f3343f593f Fix some spelling mistakes 2017-05-04 16:15:51 +02:00