Commit graph

4712 commits

Author SHA1 Message Date
gregoirenovel
cf9b28708a Correctly filter date columns 2017-12-06 17:26:14 +01:00
gregoirenovel
42b011df8b Merge branch 'dev' 2017-12-06 16:25:25 +01:00
LeSim
3ed67b5457
Merge pull request #1048 from sgmap/fix_1047
[fix #1047] Fix encoding problem in carto with IE
2017-12-06 16:22:00 +01:00
Simon Lehericey
cf9303bd7e [fix #1047] Fix encoding problem in carto with IE
We could have also use encodeURIComponent(url)
2017-12-06 16:17:13 +01:00
Simon Lehericey
85de08262b Merge branch 'dev' 2017-12-05 17:18:14 +01:00
gregoirenovel
885a479f32
Merge pull request #1034 from sgmap/fix-963
[Fix #963] Add a "personnes impliquées" tab
2017-12-05 17:14:33 +01:00
gregoirenovel
d75a3872d1 [Fix #963] Add a "personnes impliquées" tab 2017-12-05 17:04:17 +01:00
gregoirenovel
407a788558
Merge pull request #1032 from sgmap/fix_1013_logo_and_ie11
[fix #1013] fix logo on ie11
2017-12-05 11:40:59 +01:00
Simon Lehericey
e709b773b1 Logo: add a11y 2017-12-05 11:33:44 +01:00
Simon Lehericey
6c73766e0d [fix #1013] fix logo on ie11 2017-12-05 11:17:34 +01:00
gregoirenovel
a759f3e3e5
Merge pull request #1035 from sgmap/kill-sgmap
Delete the SGMAP link from the footer
2017-12-05 11:06:56 +01:00
gregoirenovel
407c578f68 Delete the SGMAP link from the footer 2017-12-04 16:47:05 +01:00
gregoirenovel
11bce91db5
Merge pull request #1029 from sgmap/kill-newrelic
Remove the newrelic gem and configuration
2017-12-04 10:40:12 +01:00
gregoirenovel
2e5a0f5026 Remove the newrelic gem and configuration 2017-12-04 10:33:41 +01:00
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