Commit graph

4529 commits

Author SHA1 Message Date
gregoirenovel
bf775b4b2b Merge pull request #595 from sgmap/remove_html_safe
Remove html safe
2017-07-13 10:38:09 +02:00
Simon Lehericey
c68b4e9cf6 [Fix #592] Rubocop: add rule to forbid html_safe 2017-07-13 10:14:16 +02:00
Simon Lehericey
693c2a43ac [Fix #592] mutualize sanitize and clean flash messages 2017-07-13 10:14:16 +02:00
Simon Lehericey
4ae9d8ef0d [Fix #592] Convert html_safe to sanitize 2017-07-13 10:14:16 +02:00
Simon Lehericey
da7af28f9f [Fix #592] Remove useless html_safe 2017-07-13 10:14:16 +02:00
gregoirenovel
1234d028d7 Merge pull request #583 from sgmap/autofocus-on-forms
Autofocus on email fields when relevant
2017-07-13 09:34:15 +02:00
gregoirenovel
3d4c93a7fb Autofocus on email fields when relevant 2017-07-13 00:04:52 +02:00
Simon Lehericey
7f10900d62 Merge branch 'dev' 2017-07-12 16:31:59 +02:00
LeSim
77f5e761c4 Merge pull request #590 from sgmap/fix_injection
Fix injection
2017-07-12 15:13:29 +02:00
Simon Lehericey
35affd69fc Commentaires: avoid xss injection 2017-07-12 13:53:25 +02:00
Simon Lehericey
2e03f77e4d InfoDossier: avoid xss injection 2017-07-12 13:47:59 +02:00
gregoirenovel
093101d240 Merge branch 'dev' 2017-07-12 11:25:32 +02:00
gregoirenovel
7c3b9ecfa9 Merge pull request #581 from sgmap/procedure-timestamps
Procedure timestamps
2017-07-12 10:22:46 +02:00
gregoirenovel
bb10e13e2f [Ref #145] Don't use Procedure.archived anymore 2017-07-11 15:03:35 +02:00
gregoirenovel
f55b7914cf [Ref #144] Don't use Procedure.published anymore 2017-07-11 14:51:43 +02:00
Mathieu Magnin
f0273d6512 Merge branch 'dev' 2017-07-11 11:41:37 +02:00
Mathieu Magnin
c2459da05b Merge pull request #572 from sgmap/fix_anybody_can_post_a_comment_on_a_dossier
Restrict comment creation to Users/Gestionnaires allowed on dossier
2017-07-11 11:30:35 +02:00
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
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