Commit graph

11498 commits

Author SHA1 Message Date
gregoirenovel
702a7f6f0a
Merge pull request #1028 from sgmap/improve_perf_dossier_show
Remove N+1 query on Dossier#show
2017-12-01 17:58:57 +01:00
Mathieu Magnin
9bc5545bdd Remove N+1 query on Dossier#show 2017-12-01 17:45:57 +01:00
gregoirenovel
24545bae25 Merge branch 'dev' 2017-12-01 14:42:14 +01:00
gregoirenovel
7203dead28
Merge pull request #1022 from sgmap/fix-1018
Fix #1018
2017-12-01 14:38:27 +01:00
gregoirenovel
cabfee44db Rename a class to better reflect its contents 2017-12-01 14:28:07 +01:00
gregoirenovel
2d9313b10b Rename the close icon to refuse 2017-12-01 14:28:07 +01:00
gregoirenovel
dd47f96424 Improve the names of some parameters in DossiersController 2017-12-01 14:28:07 +01:00
gregoirenovel
684dafb6d4 Remove now obsolete code 2017-12-01 14:28:07 +01:00
gregoirenovel
a04af24cbf Add DossiersController#terminer 2017-12-01 14:28:07 +01:00
gregoirenovel
a5b4b20a7d Add DossiersController#repasser_en_construction 2017-12-01 14:28:07 +01:00
gregoirenovel
eb55dfc0c8 Add and use DossiersController#passer_en_instruction 2017-12-01 14:28:07 +01:00
Mathieu Magnin
56ba310e89
Merge pull request #1026 from sgmap/fix_1023_with_task
[Fix #1023] Fix task to sanitize filenames
2017-12-01 14:24:26 +01:00
Mathieu Magnin
7481e24b88 [Fix #1023] Fix task to sanitize filenames 2017-12-01 14:13:35 +01:00
LeSim
57328eadaa
Merge pull request #1027 from sgmap/fix_#992_dossier_order_in_excel
[fix #992] export: dossiers are order by initiated_at
2017-12-01 13:50:12 +01:00
Simon Lehericey
e2bbd2a37a [fix #992] export: dossiers are order by initiated_at 2017-12-01 13:45:53 +01:00
Mathieu Magnin
479a7ca0d0
Merge pull request #1004 from sgmap/fix_1002
[Fix #1002] Use partial in print view, and style messagerie in print …
2017-12-01 12:47:37 +01:00
Mathieu Magnin
a3b93229e9 [Fix #1002] Use partial in print view, and style messagerie in print mode to display all messages 2017-12-01 12:30:16 +01:00
Mathieu Magnin
9002cb70fc
Merge pull request #990 from sgmap/fix_775
[Fix #775] Dans une attestation les champs doivent être affichés correctement
2017-12-01 12:29:01 +01:00
Mathieu Magnin
53bb7b07da [Fix #775] If champ type is a multiple drop down list then display it properly 2017-12-01 12:23:19 +01:00
gregoirenovel
560ce3d04a
Merge pull request #1020 from sgmap/accompagnateur
In new UI CSS and templates, backoffice -> accompagnateur
2017-12-01 12:15:07 +01:00
gregoirenovel
d23c3c42a2 In new UI CSS and templates, backoffice -> accompagnateur 2017-12-01 11:53:48 +01:00
LeSim
968576ca57
Merge pull request #1025 from sgmap/fix_872_api_entreprise_v2
[fix #872] apientrpise: use v2 endpoints
2017-12-01 11:51:26 +01:00
Simon Lehericey
fe9ac727de [fix #872] apientrepise: use v2 endpoints 2017-12-01 11:26:40 +01:00
gregoirenovel
cbbaf867ee Merge branch 'dev' 2017-12-01 10:42:48 +01:00
Mathieu Magnin
f279341737
Merge pull request #1024 from sgmap/fix_1023
[Fix #1023] If old commentaire.PJ is present, then display it
2017-12-01 10:33:59 +01:00
Mathieu Magnin
19a951d103 [Fix #1023] If old commentaire.PJ is present, then display it 2017-12-01 10:14:02 +01:00
gregoirenovel
61b1bccbca
Merge pull request #1021 from sgmap/simplify
Simplify code in NewGestionnaire::DossiersController
2017-11-30 17:29:28 +01:00
gregoirenovel
6c785d71b4 Simplify code in NewGestionnaire::DossiersController
We already have procedure: it is given by
ProceduresController, which this controller
inherits form
2017-11-30 17:18:32 +01:00
LeSim
825486ea8e
Merge pull request #1007 from sgmap/fix_997_messagerie
[fix #997] New Style: allow new line in messagerie
2017-11-30 16:13:43 +01:00
Simon Lehericey
bbcf350d7d [fix #997] New Style: allow new line in messagerie 2017-11-30 16:07:48 +01:00
Mathieu Magnin
2a5f92ffaf
Merge pull request #1006 from sgmap/improve_tests_reliability
Tests: add (or group) Timecop.return to resume time in specs
2017-11-29 17:00:52 +01:00
Simon Lehericey
d90e22e332 Tests: add (or group) Timecop.return to resume time in specs 2017-11-29 16:07:39 +01:00
gregoirenovel
c49ef0d6f2 Merge branch 'dev' 2017-11-29 15:39:01 +01:00
gregoirenovel
aa33cb9470
Merge pull request #996 from sgmap/small-fixes
Small fixes
2017-11-29 14:13:49 +01:00
gregoirenovel
e42a0d55e7 Do not center data in tables 2017-11-29 14:12:15 +01:00
gregoirenovel
835567f129 Correctly display the notification column header in Chrome 2017-11-29 14:12:15 +01:00
gregoirenovel
98bd0f3553 [Fix #994] Correctly display the archive button in Chrome 2017-11-29 14:12:15 +01:00
LeSim
646fa0d83f
Merge pull request #982 from sgmap/extended_motivation
[fix #873] add motivation in case of refused or without continuation …
2017-11-29 14:11:31 +01:00
Simon Lehericey
68682fe78d [fix #873] add motivation in case of refused or without continuation dossier 2017-11-29 14:06:32 +01:00
gregoirenovel
8a5241f16d Merge branch 'dev' 2017-11-29 11:43:46 +01:00
gregoirenovel
a5cf9cd6d6
Merge pull request #1001 from sgmap/fix-print-crasher
Fix print page crasher
2017-11-29 11:43:01 +01:00
gregoirenovel
2c901efbb1 Fix print page crasher
A partial was renamed in #937 but the renaming
was not reflected in this template
2017-11-29 11:38:14 +01:00
Mathieu Magnin
dcbbe9a914 Merge branch 'dev' 2017-11-29 11:24:39 +01:00
gregoirenovel
1d2c409cd2
Merge pull request #985 from sgmap/fix-164
[Fix #164] Make the organisme field mandatory
2017-11-29 10:42:30 +01:00
gregoirenovel
dc439933d8 Make the procedures’ table organisation column not null 2017-11-29 10:36:22 +01:00
gregoirenovel
731e1b6787 [Fix #164] Make the organisme field mandatory 2017-11-29 10:36:22 +01:00
Mathieu Magnin
d88b82eebf
Merge pull request #999 from sgmap/fix_missing_body_in_commentaire
Fix missing body when migrating commentaire
2017-11-28 17:01:22 +01:00
Mathieu Magnin
e4d9b7f960 Fix missing body when migrating commentaire 2017-11-28 16:53:59 +01:00
Mathieu Magnin
9a7e57e0b5
Merge pull request #998 from sgmap/fix_task_for_missing_pj
If pj is missing do not crash
2017-11-28 16:14:09 +01:00
Mathieu Magnin
30d9f4721b If pj is missing do not crash 2017-11-28 16:06:19 +01:00