Commit graph

21048 commits

Author SHA1 Message Date
gregoirenovel
f480f26bd4 Use the state_not_brouillon Dossier scope 2017-07-10 16:54:02 +02:00
gregoirenovel
09d596eec1 Remove a useless call to all 2017-07-10 16:54:02 +02:00
gregoirenovel
5f50f76341 Add the published scope en Procedure 2017-07-10 16:54:01 +02:00
Simon Lehericey
3816209562 Merge branch 'dev' 2017-07-10 11:21:09 +02:00
LeSim
7bfe83e072 Merge pull request #557 from sgmap/attestation_allow_interlaced_png
Attestation: uninterlaced png file to be compatible with Prawn
2017-07-10 10:57:51 +02:00
Simon Lehericey
9d48249660 Attestation: uninterlaced png file to be compatible with Prawn 2017-07-10 10:52:27 +02:00
LeSim
1645ea4a9d Merge pull request #560 from sgmap/fix_attestation_acces_in_multiple_login
[FIX #558] Attestation: fix access with multiple logins
2017-07-10 10:49:29 +02:00
Simon Lehericey
b2ba5c597d [FIX #558] Attestation: fix access with multiple logins 2017-07-10 10:23:15 +02:00
gregoirenovel
a8528b2749 Merge pull request #555 from sgmap/fix_554
[Fix #554] If procedure is hidden, then don't crash
2017-07-06 15:29:19 +02:00
Mathieu Magnin
aa929bb5b2 [Fix #554] If procedure is hidden, then don't crash 2017-07-06 14:40:06 +02:00
gregoirenovel
62832f079a Merge pull request #546 from sgmap/fix-76
[Fix #76] The develop branch is now dev
2017-07-05 14:54:48 +02:00
gregoirenovel
0fbc54e140 [Fix #76] The develop branch is now dev 2017-07-05 14:41:00 +02:00
gregoirenovel
bd4810c42d Merge branch 'develop' 2017-07-05 11:19:10 +02:00
gregoirenovel
c8a090ad80 Merge pull request #542 from sgmap/fix_weekly_mail
lastWeekOverview: fix template
2017-07-04 17:47:50 +02:00
Simon Lehericey
4fad288a8a lastWeekOverview: fix template 2017-07-04 17:33:01 +02:00
Mathieu Magnin
2971629f83 Merge pull request #540 from sgmap/fix_circle_ci_fails_when_comparing_datetimes
Fix tests that often fail on circle ci when comparing datetimes
2017-07-04 17:30:54 +02:00
Mathieu Magnin
e51e5afe55 Fix tests that often fail on circle ci when comparing datetimes 2017-07-04 17:17:14 +02:00
gregoirenovel
0dbccd3af9 Merge pull request #541 from sgmap/dont_know_why_it_happens
DossierShow: fix unattended bug on champs_private
2017-07-04 16:46:03 +02:00
Simon Lehericey
82d8871d03 DossierShow: fix unattended bug on @champs_private 2017-07-04 16:37:29 +02:00
Mathieu Magnin
6357a112c6 Merge pull request #514 from sgmap/430_admin_can_delete_procedure
#430 admin can delete procedure
2017-07-04 15:07:46 +02:00
Mathieu Magnin
ce171208da Fix redirect loop for gestionnaire if hidden procedure is saved in procedure_filter 2017-07-04 14:34:26 +02:00
Mathieu Magnin
70c7c42e1f [Fix #430] Add delete procedure button 2017-07-04 14:34:26 +02:00
Mathieu Magnin
be3304f71e Add a scope to Dossier to check if procedure is not hidden 2017-07-04 14:34:16 +02:00
Mathieu Magnin
760efcdad3 Add hidden_at on procedure 2017-07-04 14:33:40 +02:00
LeSim
e9491da5c5 Merge pull request #517 from sgmap/add_metadata_to_log
[FIX 433] Add Raven Metadata on the current user/gestionnaire/admin ...
2017-07-04 14:28:06 +02:00
Simon Lehericey
12c12953d6 [FIX #433] Add Raven Metadata on the current user/gestionnaire/admin ... 2017-07-04 14:18:46 +02:00
gregoirenovel
351bb9afe8 Merge pull request #534 from sgmap/fix-529
[Fix #529] Add missing JS file to new_design/application.js
2017-07-04 14:12:16 +02:00
gregoirenovel
4ee17e44dc [Fix #529] Add missing JS file to new_design/application.js 2017-07-04 14:11:06 +02:00
LeSim
1e91867995 Merge pull request #519 from sgmap/change_attestation_on_published_procedure
Change attestation on published procedure
2017-07-04 14:10:15 +02:00
Simon Lehericey
48e881f9ec [FIX #491] Attestation: allow administrateur to change attestation template on a published procedure 2017-07-04 13:59:54 +02:00
Simon Lehericey
8aaf7df579 AttestationTemplate edit: id.nil => new_record? 2017-07-04 13:59:54 +02:00
gregoirenovel
97fa7d811a Merge pull request #537 from sgmap/fix_home_header
Header: fix alignement in ff
2017-07-04 13:52:13 +02:00
Simon Lehericey
1d4a0dce56 Header: fix alignement in ff 2017-07-04 13:48:56 +02:00
gregoirenovel
f27a390da9 Merge pull request #535 from sgmap/fix-528
[Fix #528] Fix a spelling mistake
2017-07-04 12:28:01 +02:00
gregoirenovel
84751cdedf [Fix #528] Fix a spelling mistake 2017-07-04 12:18:13 +02:00
Mathieu Magnin
b3796af470 Merge branch 'new_design' into develop 2017-07-03 14:39:09 +02:00
Mathieu Magnin
dc4decc827 Add profile switcher in header 2017-07-03 14:34:31 +02:00
Mathieu Magnin
5d8c798369 Connexion button is a secondary button 2017-07-03 14:34:31 +02:00
Mathieu Magnin
33af09cae5 Account menu on header 2017-07-03 14:34:31 +02:00
Mathieu Magnin
b7dc511a7d Create a clean application.js file for new design 2017-07-03 14:34:31 +02:00
Mathieu Magnin
649af19443 Add search field in navbar 2017-07-03 14:34:30 +02:00
Mathieu Magnin
ff5cfafd6d Merge pull request #515 from sgmap/new_routes_hierarchy
New routes hierarchy
2017-07-03 14:21:55 +02:00
Simon Lehericey
b1d96f4a94 [FIX #492] switch to new attestation download system 2017-07-03 14:09:14 +02:00
Simon Lehericey
4e6a8c5939 New Routes: add new_gestionnaire/dossier_controller attestation 2017-07-03 14:09:14 +02:00
Simon Lehericey
94f8fb748f New Routes: add new_gestionnaire/procedures_controller 2017-07-03 14:09:14 +02:00
Simon Lehericey
3eec07ac08 New Routes: add new_gestionnaire/gestionnaire_controller 2017-07-03 14:09:14 +02:00
Simon Lehericey
1e661fa686 New Routes: add new_user/dossier_controller attestation 2017-07-03 14:09:14 +02:00
Simon Lehericey
15b16f36b7 New Routes: add new_user/dossier_controller 2017-07-03 14:09:14 +02:00
Simon Lehericey
081ed90968 New Routes: add new_user/user_controller 2017-07-03 14:09:13 +02:00
gregoirenovel
8f40261b68 Merge pull request #524 from sgmap/fix-523
Fix #523
2017-07-03 10:20:05 +02:00