Commit graph

2515 commits

Author SHA1 Message Date
LeSim
8f767b3f76 Merge pull request #506 from sgmap/Enhanced_week_overview
Enhanced week overview
2017-06-29 16:50:40 +02:00
Simon Lehericey
149c1ba459 ProcedureOverview: change email title 2017-06-29 16:07:46 +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
gregoirenovel
c8456904c8 Merge pull request #513 from sgmap/add_crisp_to_homepage
[Fix #512] Crisp: add crisp to homepage
2017-06-29 15:20:25 +02:00
Simon Lehericey
26afa24e49 [Fix #512] Crisp: add crisp to homepage 2017-06-29 14:35:24 +02:00
gregoirenovel
ff8df96547 Merge pull request #510 from sgmap/add_dossier_id_to_attestation
[FIX 509] add dossier id tag in attestation template
2017-06-28 11:06:07 +02:00
Simon Lehericey
ee415c4aa6 [FIX #509] add dossier id tag in attestation template 2017-06-28 10:59:14 +02:00
gregoirenovel
545b28c2c0 Merge pull request #497 from sgmap/fix-170
[Fix #170] Keep drop down menu values for annot. privées when cloning
2017-06-27 14:32:18 +02:00
gregoirenovel
aeeb0dd22f [Fix #170] Keep drop down menu values for annot. privées when cloning 2017-06-27 14:31:33 +02:00
gregoirenovel
e3cf1d373b Merge pull request #498 from sgmap/fix-318
[Fix #318] Add annotations privées to exported files
2017-06-27 14:30:48 +02:00
gregoirenovel
556359cd05 [Fix #318] Add annotations privées to exported files 2017-06-27 14:27:02 +02:00
gregoirenovel
41d02e0f9a Merge pull request #495 from sgmap/fix-352
[Fix #352] Downcase admin emails when transferring a procedure
2017-06-27 14:26:43 +02:00
gregoirenovel
bb57002eff [Fix #352] Downcase admin emails when transferring a procedure
See config/initializers/devise.rb:L44
config.case_insensitive_keys = [ :email ]

We therefore need to downcase the email before
looking for an admin by its email address
2017-06-27 14:25:56 +02:00
gregoirenovel
47e50e3731 Merge pull request #500 from sgmap/add-published-at
Add published at
2017-06-27 13:59:03 +02:00
gregoirenovel
cf5398fe99 Record published_at when publishing a procedure 2017-06-27 13:55:17 +02:00
gregoirenovel
1b808d9abe Add the AddPublishedAtToProcedure migration 2017-06-27 13:55:17 +02:00
gregoirenovel
99ee68451a Add proper tests for Procedure#publish! 2017-06-27 13:55:15 +02:00
gregoirenovel
68b9cd209d Remove tests that were just testing if Rails worked 2017-06-27 13:55:06 +02:00
gregoirenovel
8d24f08f4c Merge pull request #501 from sgmap/attestation_force_footer_to_fit_on_one_line
Attestation force footer to fit on one line and limit its length
2017-06-27 13:41:40 +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
LeSim
03b735800b Merge pull request #481 from sgmap/add_inline_address_to_etablissement
Add inline address to etablissement
2017-06-27 11:28:54 +02:00
Simon Lehericey
84e3d8fbe0 Attestation_template: use etablissement inline_adresse 2017-06-27 11:15:25 +02:00
Simon Lehericey
d69d0f8a78 Etablissement: add inline_adresse 2017-06-27 11:15:25 +02:00
gregoirenovel
eb0ddbdba6 Merge pull request #489 from sgmap/fix-183
[Fix #183] Display “oui” or “non” instead of “true” or “false”
2017-06-27 10:53:25 +02:00
gregoirenovel
0e3ebfd819 [Fix #183] Display “oui” or “non” instead of “true” or “false” 2017-06-26 14:53:38 +02:00
gregoirenovel
859a821ee7 Merge pull request #485 from sgmap/fix-396
[Fix #396] Don’t submit the publish form after a transfer
2017-06-26 10:51:42 +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
0ea29d131f Refactor Admin::ProceduresController#transfer 2017-06-26 10:51:28 +02:00
gregoirenovel
a3e3284c5d Fix a spelling mistake 2017-06-26 10:51:27 +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
a0e0cf4e40 Merge pull request #482 from sgmap/fix-440
[Fix #440] Show the current month only if logged in as superadmin
2017-06-26 10:51:00 +02:00
gregoirenovel
469f0aed4b [Fix #440] Show the current month only if logged in as superadmin 2017-06-26 10:50:31 +02:00
gregoirenovel
6d8f22409b Merge pull request #477 from sgmap/fix-176
Delete useless new_assignement email
2017-06-26 10:50:06 +02:00
gregoirenovel
ba5d816ce6 [Fix #176] Delete useless new_assignement email 2017-06-26 10:49:42 +02:00
gregoirenovel
a2b17604e5 Merge pull request #476 from sgmap/remove-commented-code
Remove some commented code
2017-06-26 10:49:22 +02:00
gregoirenovel
3d11a35da8 Remove some commented code 2017-06-26 10:49:02 +02:00
Mathieu Magnin
c5300232a5 Merge pull request #475 from sgmap/474_display_devise_errors_with_flashes
474 display devise errors with flashes
2017-06-22 10:30:46 +02:00
Mathieu Magnin
3f90e82d09 [Fix #327] flashes messages can deal with Arrays 2017-06-21 18:08:05 +02:00
Mathieu Magnin
8d008a51d0 [fix #474] display devise errors with flashes 2017-06-21 18:07:58 +02:00
gregoirenovel
2f9f74aa9f Merge pull request #473 from sgmap/452_redesign_sign_up
[fix #452] redesign sign up form
2017-06-21 17:39:45 +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
0084d836dd Merge pull request #472 from sgmap/fix_turbolinks_multiple_layout_bug
Fix turbolinks multiple layouts bug
2017-06-21 15:04:53 +02:00