Commit graph

2288 commits

Author SHA1 Message Date
Mathieu Magnin
c3fa1e01b9 [Fix #577] Restrict comment creation to Users/Gestionnaires allowed on dossier 2017-07-11 11:01:06 +02:00
Mathieu Magnin
2985623bec Merge pull request #570 from sgmap/fix_only_allowed_users_can_create_invitation
When user or gestionnaire has no access to dossier, he cannot create …
2017-07-11 10:59:44 +02:00
Mathieu Magnin
065719ea06 [Fix #576] When user or gestionnaire has no access to dossier, he cannot create an invitation 2017-07-11 10:43:33 +02:00
LeSim
fa4ade0872 Merge pull request #574 from sgmap/fix_turbolinks_in_new_design
Fix turbolinks in new design
2017-07-11 10:26:32 +02:00
Simon Lehericey
831ccac685 Turbolinks: do not reload mailjet js on every page 2017-07-11 10:00:29 +02:00
Simon Lehericey
b2e99dd755 Turbolinks: do not reload application js on every page 2017-07-11 10:00:29 +02:00
Mathieu Magnin
671ec231e7 Merge pull request #573 from sgmap/fix_admninistration_view
fix administration view
2017-07-11 09:41:14 +02:00
Simon Lehericey
27cd42a100 fix administration view 2017-07-11 09:09:20 +02:00
gregoirenovel
3efbb99421 Merge pull request #571 from sgmap/cleanup
Cleanup
2017-07-10 17:31:15 +02:00
gregoirenovel
6a381caaee Add the archived scope to Procedure 2017-07-10 17:24:53 +02:00
gregoirenovel
411c5791c8 Use the not_archived Procedure scope 2017-07-10 17:24:43 +02:00
gregoirenovel
31b23ac74e Add the not_published Procedure scope 2017-07-10 17:24:39 +02:00
gregoirenovel
811723e5fb Use the state_nouveaux Dossier scope 2017-07-10 16:54:02 +02:00
gregoirenovel
3a602b05a4 Use the archived and not_archived Dossier scopes 2017-07-10 16:54:02 +02:00
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
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
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