moodle.git
7 years agoMoodle release 2.4.11 MOODLE_24_STABLE v2.4.11
Eloy Lafuente (stronk7) [Sat, 12 Jul 2014 17:10:21 +0000 (19:10 +0200)]
Moodle release 2.4.11

7 years agoMerge branch 'MOODLE_24_STABLE' into install_24_STABLE
AMOS bot [Fri, 11 Jul 2014 00:44:37 +0000 (00:44 +0000)]
Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

7 years agoMDL-46148 qtype_calculated: low-level defence against bad formulas
Ankit Agarwal [Thu, 10 Jul 2014 09:44:59 +0000 (17:44 +0800)]
MDL-46148 qtype_calculated: low-level defence against bad formulas

This catches things like:
 * Malicious equations coming from backup files.
 * Malicious equations in old questions in the database.

7 years agoMDL-46148 questions: Added missing allow_commit for transaction
Damyon Wiese [Thu, 10 Jul 2014 03:35:47 +0000 (11:35 +0800)]
MDL-46148 questions: Added missing allow_commit for transaction

7 years agoMDL-46148 qtype_calculatedsimple: fix notice
Tim Hunt [Wed, 9 Jul 2014 12:47:40 +0000 (13:47 +0100)]
MDL-46148 qtype_calculatedsimple: fix notice

... when adding a dataset with a formula error.

7 years agoMDL-46148 qtype_calculated: fix validation when importing.
Tim Hunt [Wed, 9 Jul 2014 12:35:09 +0000 (13:35 +0100)]
MDL-46148 qtype_calculated: fix validation when importing.

In order to do this in a sane way, I cleaned up a lot of old mess,
inclduing:

1. Previously, qtype_calcuated used ->answeres when importing, and
->answer when saving the form. This was crazy, so I fixed it, and
stripped out the code that made the alternative variable name work.

2. Similarly, it could handle ->answer being either an array, such as
you would get form the HTML editor, or a simple string, which is what
you get form the form. I simplified that too.

3. Finally, I made import use a transaction around saving each
question, so we don't get half questions in the database when an error
occurs.

7 years agoMDL-46148 qtype_calculated: removed unused method.
Tim Hunt [Wed, 9 Jul 2014 11:56:18 +0000 (12:56 +0100)]
MDL-46148 qtype_calculated: removed unused method.

7 years agoMDL-46223 Fix frequently used comments in the marking guide
David Mudrák [Wed, 9 Jul 2014 08:28:56 +0000 (10:28 +0200)]
MDL-46223 Fix frequently used comments in the marking guide

When the frequently used comment contains a character like >, re-use it
directly instead of its HTML entitiy.

7 years agoMDL-46223 Improve the display of marking guide validation message
David Mudrák [Wed, 9 Jul 2014 08:21:16 +0000 (10:21 +0200)]
MDL-46223 Improve the display of marking guide validation message

7 years agoMDL-45471 javascript: Escape content of exception dialogs
Frederic Massart [Thu, 8 May 2014 08:12:52 +0000 (16:12 +0800)]
MDL-45471 javascript: Escape content of exception dialogs

7 years agoMDL-43948 forms: setting types to filemanager and editor elements
Marina Glancy [Tue, 8 Jul 2014 02:11:40 +0000 (10:11 +0800)]
MDL-43948 forms: setting types to filemanager and editor elements

7 years agoMDL-46223 Improve the marking guide output
David Mudrák [Mon, 7 Jul 2014 07:52:37 +0000 (09:52 +0200)]
MDL-46223 Improve the marking guide output

7 years agoMDL-46223 Improve the rubric output
David Mudrák [Mon, 7 Jul 2014 04:38:47 +0000 (06:38 +0200)]
MDL-46223 Improve the rubric output

7 years agoMDL-45760 make sure to check permission before setting header
Marina Glancy [Fri, 4 Jul 2014 02:40:13 +0000 (10:40 +0800)]
MDL-45760 make sure to check permission before setting header

7 years agoMDL-46148 qtype_calculated: fix formula validation.
Tim Hunt [Thu, 26 Jun 2014 09:48:02 +0000 (10:48 +0100)]
MDL-46148 qtype_calculated: fix formula validation.

7 years agoMDL-45417 mod_imscp: Prevent entity injections from package content
Frederic Massart [Fri, 13 Jun 2014 07:40:15 +0000 (15:40 +0800)]
MDL-45417 mod_imscp: Prevent entity injections from package content

7 years agoMDL-45463 mod_lti: Prevent XML entity injections from provider
Frederic Massart [Tue, 10 Jun 2014 04:53:43 +0000 (12:53 +0800)]
MDL-45463 mod_lti: Prevent XML entity injections from provider

7 years agoMDL-45616 repositories: use json encoding instead of serialization
Marina Glancy [Thu, 26 Jun 2014 00:53:25 +0000 (08:53 +0800)]
MDL-45616 repositories: use json encoding instead of serialization

7 years agoMDL-45616 repositories: more clearly distinguish when we use source and when reference
Marina Glancy [Wed, 25 Jun 2014 06:40:27 +0000 (14:40 +0800)]
MDL-45616 repositories: more clearly distinguish when we use source and when reference

Function repository::get_moodle_file() should always be called on packed reference and not on the source received from user.
Also added phpdocs to some other methods that were confusing source and reference

7 years agoMDL-45485 auth_shibboleth: User taking over other user's session
Rex Lorenzo [Fri, 16 May 2014 22:26:25 +0000 (15:26 -0700)]
MDL-45485 auth_shibboleth: User taking over other user's session

Replacing code with call to complete_user_login() since it calls session_regenerate_id().

7 years agoMDL-43848 messages: do not display message content in popups
Dan Poltawski [Thu, 3 Jul 2014 14:52:31 +0000 (15:52 +0100)]
MDL-43848 messages: do not display message content in popups

The user is not in control of when these popups show up and it
may not be appropiate to have part of this content display whilst
in the presence of other users.

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 4 Jul 2014 00:44:43 +0000 (00:44 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 2 Jul 2014 00:45:02 +0000 (00:45 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Sun, 29 Jun 2014 00:43:15 +0000 (00:43 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 25 Jun 2014 00:45:49 +0000 (00:45 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 25 Jun 2014 00:45:49 +0000 (00:45 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Sat, 21 Jun 2014 00:43:57 +0000 (00:43 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 19 Jun 2014 00:43:12 +0000 (00:43 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 18 Jun 2014 00:42:48 +0000 (00:42 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Sun, 15 Jun 2014 00:43:07 +0000 (00:43 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 12 Jun 2014 00:43:56 +0000 (00:43 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 30 May 2014 01:24:59 +0000 (01:24 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 30 May 2014 01:24:59 +0000 (01:24 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 23 May 2014 00:53:12 +0000 (00:53 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 22 May 2014 01:08:33 +0000 (01:08 +0000)]
Automatically generated installer lang files

7 years agoMoodle release 2.4.10 v2.4.10
Eloy Lafuente (stronk7) [Sat, 10 May 2014 16:30:28 +0000 (18:30 +0200)]
Moodle release 2.4.10

7 years agoMerge branch 'MOODLE_24_STABLE' into install_24_STABLE
AMOS bot [Fri, 9 May 2014 00:41:12 +0000 (00:41 +0000)]
Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

7 years agoMDL-45332 repository_url: URL parameter is using PARAM_URL
Frederic Massart [Thu, 8 May 2014 07:05:05 +0000 (15:05 +0800)]
MDL-45332 repository_url: URL parameter is using PARAM_URL

7 years agoMDL-44750 Assign: Do not reveal student identities to screen readers
Damyon Wiese [Tue, 25 Mar 2014 05:01:01 +0000 (13:01 +0800)]
MDL-44750 Assign: Do not reveal student identities to screen readers

7 years agoMDL-45126 do not allow guests see name and summary of hidden course
Marina Glancy [Wed, 16 Apr 2014 06:35:20 +0000 (14:35 +0800)]
MDL-45126 do not allow guests see name and summary of hidden course

7 years agoMDL-43119 Add valid until dates for tokens created by login/token.php
Juan Leyva [Wed, 7 May 2014 07:49:28 +0000 (15:49 +0800)]
MDL-43119 Add valid until dates for tokens created by login/token.php

3 months were decided

Conflicts:
login/token.php

7 years agoMDL-43877 blocks: Files from blocks in my/ were accessible to the world
Frederic Massart [Thu, 20 Mar 2014 08:14:03 +0000 (16:14 +0800)]
MDL-43877 blocks: Files from blocks in my/ were accessible to the world

7 years agoMDL-44606 Assign: Some grading functions are missing sesskey protection
Damyon Wiese [Thu, 13 Mar 2014 08:14:45 +0000 (16:14 +0800)]
MDL-44606 Assign: Some grading functions are missing sesskey protection

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 2 May 2014 00:39:26 +0000 (00:39 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 23 Apr 2014 00:38:22 +0000 (00:38 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 22 Apr 2014 11:15:24 +0000 (11:15 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 10 Apr 2014 22:38:54 +0000 (22:38 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 7 Apr 2014 22:40:03 +0000 (22:40 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 3 Apr 2014 09:28:26 +0000 (09:28 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 27 Mar 2014 00:48:36 +0000 (00:48 +0000)]
Automatically generated installer lang files

7 years agoMoodle release 2.4.9 v2.4.9
Eloy Lafuente (stronk7) [Fri, 7 Mar 2014 17:51:34 +0000 (18:51 +0100)]
Moodle release 2.4.9

7 years agoMerge branch 'MOODLE_24_STABLE' into install_24_STABLE
AMOS bot [Fri, 7 Mar 2014 00:54:52 +0000 (00:54 +0000)]
Merge branch 'MOODLE_24_STABLE' into install_24_STABLE

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 5 Mar 2014 00:54:50 +0000 (00:54 +0000)]
Automatically generated installer lang files

7 years agoMDL-43146 enrol_imsenterprise: missing sesskey protection
Dan Poltawski [Tue, 28 Jan 2014 07:20:02 +0000 (15:20 +0800)]
MDL-43146 enrol_imsenterprise: missing sesskey protection

7 years agoMDL-29409 repository_alfresco: Drop support for URL/link
Frederic Massart [Thu, 30 Jan 2014 04:02:09 +0000 (12:02 +0800)]
MDL-29409 repository_alfresco: Drop support for URL/link

The current solution has two major issues. Firstly, it is using the
session key in the file URL, allowing anyone with the link to steal
the identify of the poster. Secondly, the links are not presistent
and become broken as soon as the server is restarted. Let's not
support this any more until a proper solution is found in MDL-26454.

7 years agoMDL-39990 wiki: more detailed validation of view/edit access
Marina Glancy [Fri, 28 Feb 2014 09:53:43 +0000 (17:53 +0800)]
MDL-39990 wiki: more detailed validation of view/edit access

7 years agoMDL-44082 mod_chat: added a security check for users already in the chat activity
Andrew Davis [Mon, 3 Mar 2014 04:15:54 +0000 (12:15 +0800)]
MDL-44082 mod_chat: added a security check for users already in the chat activity

7 years agoMDL-43656 mod_feedback: availablity date logic incorrect
Tomasz Muras [Mon, 3 Mar 2014 03:23:44 +0000 (11:23 +0800)]
MDL-43656 mod_feedback: availablity date logic incorrect

7 years agoMDL-43690 quiz_question_tostring missing s().
Tim Hunt [Tue, 14 Jan 2014 13:40:11 +0000 (13:40 +0000)]
MDL-43690 quiz_question_tostring missing s().

This meant that the edit quiz page sometimes had invalid HTML.

7 years agoMDL-43916 - Email addresses incorrectly displayed
Maria Torres [Mon, 3 Mar 2014 02:35:00 +0000 (10:35 +0800)]
MDL-43916 - Email addresses incorrectly displayed

When capabilities and settings do not allow it.

7 years agoMerge branch 'w06_MDL-43344_m24_flow' of https://github.com/skodak/moodle into MOODLE...
Dan Poltawski [Mon, 3 Mar 2014 02:07:30 +0000 (10:07 +0800)]
Merge branch 'w06_MDL-43344_m24_flow' of https://github.com/skodak/moodle into MOODLE_24_STABLE

7 years agoAutomatically generated installer lang files
AMOS bot [Sat, 1 Mar 2014 00:56:08 +0000 (00:56 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 21 Feb 2014 00:45:34 +0000 (00:45 +0000)]
Automatically generated installer lang files

7 years agoweekly release 2.4.8+
Eloy Lafuente (stronk7) [Thu, 20 Feb 2014 11:43:14 +0000 (12:43 +0100)]
weekly release 2.4.8+

7 years agoMerge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_2...
Eloy Lafuente (stronk7) [Thu, 20 Feb 2014 11:43:10 +0000 (12:43 +0100)]
Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

7 years agoMerge branch 'MDL-44018_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
Damyon Wiese [Wed, 19 Feb 2014 02:25:00 +0000 (10:25 +0800)]
Merge branch 'MDL-44018_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

7 years agoMDL-44118 new environment check are all quiz attempts upgraded.
Tim Hunt [Thu, 13 Feb 2014 12:26:32 +0000 (12:26 +0000)]
MDL-44118 new environment check are all quiz attempts upgraded.

In Moodle 2.1, there was a major DB upgrade relating to questions, and
it was possible to delay some of that upgrade. Now, those DB tables are
changing again, and the time has come to insist that all the updata has
been upgraded (or deleted).

7 years agoAutomatically generated installer lang files
AMOS bot [Sat, 15 Feb 2014 00:43:55 +0000 (00:43 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 12 Feb 2014 00:42:56 +0000 (00:42 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 11 Feb 2014 00:42:15 +0000 (00:42 +0000)]
Automatically generated installer lang files

7 years agoMDL-44018 quesiton variant was not backed up or restored.
Tim Hunt [Thu, 6 Feb 2014 09:50:30 +0000 (09:50 +0000)]
MDL-44018 quesiton variant was not backed up or restored.

7 years agoAutomatically generated installer lang files
AMOS bot [Sun, 2 Feb 2014 00:42:21 +0000 (00:42 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Fri, 31 Jan 2014 00:43:06 +0000 (00:43 +0000)]
Automatically generated installer lang files

7 years agoMDL-43344 upgrade to latest Flowplayer
Petr Skoda [Thu, 30 Jan 2014 02:33:40 +0000 (10:33 +0800)]
MDL-43344 upgrade to latest Flowplayer

7 years agoAutomatically generated installer lang files
AMOS bot [Wed, 22 Jan 2014 00:55:32 +0000 (00:55 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 21 Jan 2014 00:41:41 +0000 (00:41 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Mon, 20 Jan 2014 00:41:25 +0000 (00:41 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Sun, 19 Jan 2014 00:41:59 +0000 (00:41 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 16 Jan 2014 00:43:20 +0000 (00:43 +0000)]
Automatically generated installer lang files

7 years agoAutomatically generated installer lang files
AMOS bot [Tue, 14 Jan 2014 00:45:42 +0000 (00:45 +0000)]
Automatically generated installer lang files

7 years agoMoodle release 2.4.8 v2.4.8
Eloy Lafuente (stronk7) [Sat, 11 Jan 2014 14:57:17 +0000 (15:57 +0100)]
Moodle release 2.4.8

7 years agoweekly release 2.4.7+
Damyon Wiese [Fri, 10 Jan 2014 06:19:59 +0000 (14:19 +0800)]
weekly release 2.4.7+

7 years agoMerge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_2...
Damyon Wiese [Fri, 10 Jan 2014 06:19:55 +0000 (14:19 +0800)]
Merge branch 'install_24_STABLE' of git://git.moodle.org/moodle-install into MOODLE_24_STABLE

7 years agoMDL-36721 make upgrade queries cross-db
Eloy Lafuente (stronk7) [Fri, 10 Jan 2014 00:03:23 +0000 (01:03 +0100)]
MDL-36721 make upgrade queries cross-db

7 years agoAutomatically generated installer lang files
AMOS bot [Thu, 9 Jan 2014 00:42:16 +0000 (00:42 +0000)]
Automatically generated installer lang files

7 years agoMerge branch 'wip-MDL-42310-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE
Eloy Lafuente (stronk7) [Wed, 8 Jan 2014 00:52:58 +0000 (01:52 +0100)]
Merge branch 'wip-MDL-42310-24' of git://github.com/abgreeve/moodle into MOODLE_24_STABLE

7 years agoMerge branch 'm24_MDL-43508_Invalid_String_Identifier' of https://github.com/scara...
Eloy Lafuente (stronk7) [Tue, 7 Jan 2014 23:46:31 +0000 (00:46 +0100)]
Merge branch 'm24_MDL-43508_Invalid_String_Identifier' of https://github.com/scara/moodle into MOODLE_24_STABLE

7 years agoMerge branch 'm24_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github...
Dan Poltawski [Tue, 7 Jan 2014 09:20:57 +0000 (17:20 +0800)]
Merge branch 'm24_MDL-43482_Lot_Of_Passed_By_Reference_Messages' of https://github.com/scara/moodle into MOODLE_24_STABLE

7 years agoMDL-43411 JavaScript: Correct checks for section support to use helper function
Andrew Nicols [Mon, 23 Dec 2013 01:26:25 +0000 (09:26 +0800)]
MDL-43411 JavaScript: Correct checks for section support to use helper function

7 years agoMerge branch 'm24_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Cont...
Dan Poltawski [Tue, 7 Jan 2014 04:43:34 +0000 (12:43 +0800)]
Merge branch 'm24_MDL-40379_Prevent_Some_Mobile_Network_Providers_From_Modifying_Content' of https://github.com/scara/moodle into MOODLE_24_STABLE

7 years agoMDL-42643 course: Member in same group should only loginas
Rajesh Taneja [Wed, 20 Nov 2013 00:32:06 +0000 (08:32 +0800)]
MDL-42643 course: Member in same group should only loginas

If course groupmode is set to SEPARATEGROUPS, and user doesn't have
site:accessallgroups capability than only allow user to loginas if
current user is in same group as loginas user

7 years agoMDL-43373 core_enrol: Display enrolments dimmed if outside of start or end times
Tony Butler [Fri, 13 Dec 2013 15:03:27 +0000 (15:03 +0000)]
MDL-43373 core_enrol: Display enrolments dimmed if outside of start or end times

7 years agoMerge branch 'MDL-43448_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE
Damyon Wiese [Tue, 7 Jan 2014 01:15:08 +0000 (09:15 +0800)]
Merge branch 'MDL-43448_24' of git://github.com/timhunt/moodle into MOODLE_24_STABLE

7 years agoMDL-43448 Links to the gradebook not fixed on restore.
Tim Hunt [Wed, 18 Dec 2013 19:02:39 +0000 (19:02 +0000)]
MDL-43448 Links to the gradebook not fixed on restore.

Note we can only fix certain generic links, we can't handle ones like
/grade/report/{reportname}/index.php, but fortunately, we were only
using the generic ones.

I added a couple of other likely things too (badges and participants
list).

7 years agoMerge branch 'w01_MDL-36721_m24_passlog' of https://github.com/skodak/moodle into...
Damyon Wiese [Mon, 6 Jan 2014 06:49:39 +0000 (14:49 +0800)]
Merge branch 'w01_MDL-36721_m24_passlog' of https://github.com/skodak/moodle into MOODLE_24_STABLE

7 years agoMerge branch '43349-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE
Dan Poltawski [Mon, 6 Jan 2014 06:21:50 +0000 (14:21 +0800)]
Merge branch '43349-24' of git://github.com/samhemelryk/moodle into MOODLE_24_STABLE

7 years agoMDL-42883 Administration: Check sessionkey before taking action on user profile fields
Rajesh Taneja [Thu, 14 Nov 2013 02:58:27 +0000 (10:58 +0800)]
MDL-42883 Administration: Check sessionkey before taking action on user profile fields

7 years agoMerge branch 'MDL-37962_beep_24' of https://github.com/andyjdavis/moodle into MOODLE_...
Sam Hemelryk [Sun, 5 Jan 2014 22:17:47 +0000 (11:17 +1300)]
Merge branch 'MDL-37962_beep_24' of https://github.com/andyjdavis/moodle into MOODLE_24_STABLE

7 years agoMerge branch 'MDL-42212-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE
Sam Hemelryk [Sun, 5 Jan 2014 21:29:55 +0000 (10:29 +1300)]
Merge branch 'MDL-42212-24' of git://github.com/FMCorz/moodle into MOODLE_24_STABLE

7 years agoMDL-42310 feedback mod - Enable filtering of multichoice and multichoice rated controls
Michael Milette [Tue, 24 Dec 2013 17:00:44 +0000 (12:00 -0500)]
MDL-42310 feedback mod - Enable filtering of multichoice and multichoice rated controls

Conflicts:
mod/feedback/item/multichoice/lib.php
mod/feedback/item/multichoicerated/lib.php

Signed-off-by: Michael Milette <michael.milette@instruxmedia.com>