Sam Hemelryk [Sun, 20 Jul 2014 23:42:52 +0000 (11:42 +1200)]
MDL-42909 course: fixed whitespace
Sam Hemelryk [Sun, 20 Jul 2014 23:35:47 +0000 (11:35 +1200)]
Merge branch 'MDL-42909-master' of git://github.com/phalacee/moodle
Sam Hemelryk [Sun, 20 Jul 2014 23:32:09 +0000 (11:32 +1200)]
Merge branch 'MDL40479_Grading_alert_colour' of https://github.com/Dave-B/moodle
Sam Hemelryk [Sun, 20 Jul 2014 23:14:30 +0000 (11:14 +1200)]
Merge branch 'm28_MDL-46406' of https://github.com/totara/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Sam Hemelryk [Sun, 20 Jul 2014 23:12:05 +0000 (11:12 +1200)]
Merge branch 'mdl-46427-master' of git://github.com/deraadt/moodle
Sam Hemelryk [Sun, 20 Jul 2014 22:55:08 +0000 (10:55 +1200)]
Merge branch 'MDL-46159-wip' of https://github.com/willylee/moodle
Sam Hemelryk [Sun, 20 Jul 2014 22:49:25 +0000 (10:49 +1200)]
Merge branch 'MDL-45339-master' of git://github.com/xow/moodle
Sam Hemelryk [Sun, 20 Jul 2014 22:45:33 +0000 (10:45 +1200)]
Merge branch 'master_MDL-46363' of https://github.com/danmarsden/moodle
Michael de Raadt [Fri, 18 Jul 2014 07:30:33 +0000 (15:30 +0800)]
MDL-46427 Course: Correcting dimmed course link class on profile pages.
Jason Fowler [Fri, 18 Jul 2014 00:22:17 +0000 (08:22 +0800)]
MDL-42909 Course: Fix title for move-targets
Jim Thorpe [Wed, 16 Jul 2014 23:57:00 +0000 (11:57 +1200)]
enrol_imsenterprise: MDL-46363 including course lib when create_course is
used
John Okely [Thu, 17 Jul 2014 08:42:42 +0000 (16:42 +0800)]
MDL-45339 Libraries: Add a note to docblock of get_config, set_config, and unset_config to note they are used in lib/db/upgrade.php
Dan Poltawski [Thu, 17 Jul 2014 08:22:43 +0000 (09:22 +0100)]
weekly release 2.8dev
Dan Poltawski [Thu, 17 Jul 2014 08:22:40 +0000 (09:22 +0100)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Sam Hemelryk [Thu, 17 Jul 2014 03:16:07 +0000 (15:16 +1200)]
Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle
Conflicts:
mod/quiz/lib.php
mod/quiz/mod_form.php
mod/quiz/tests/behat/completion_condition_passing_grade.feature
Brian Barnes [Wed, 16 Jul 2014 22:32:05 +0000 (10:32 +1200)]
MDL-46406 core_auth: Placed remember username before submit login form
Sam Hemelryk [Thu, 17 Jul 2014 01:57:29 +0000 (13:57 +1200)]
Revert "MDL-46226 core: pix_icon no longer sets title to the alt text"
This reverts commit
40ebfaeefd0940049ce2ef6e481546d90f19b9af.
Sam Hemelryk [Thu, 17 Jul 2014 01:57:01 +0000 (13:57 +1200)]
Revert "MDL-46226 fix unit tests"
This reverts commit
ffd17daf0a438fa63a32d3c1ba08218e16def46c.
AMOS bot [Thu, 17 Jul 2014 00:52:42 +0000 (00:52 +0000)]
Automatically generated installer lang files
AMOS bot [Thu, 17 Jul 2014 00:52:42 +0000 (00:52 +0000)]
Automatically generated installer lang files
Ray Morris [Fri, 30 May 2014 16:39:42 +0000 (11:39 -0500)]
MDL-37993 Quiz: completion upon all passing grade or attempts exhausted
This patch adds completion options to Quiz similar to what is available in scorm.
One can have the quiz marked complete when either a passing grade is achieved or
all attempts are used up. This will allow a quiz to complete when the user "passes
or fails". (Where "fail" means "using up all attempts without passing".)
David Balch [Thu, 10 Jul 2014 08:45:35 +0000 (09:45 +0100)]
MDL-40479 mod_assign PHPDoc: Fix error, improve consistency.
David Balch [Wed, 16 Jul 2014 07:57:48 +0000 (08:57 +0100)]
MDL-40479 mod_assign: Fix the colour of grading success messages.
Eloy Lafuente (stronk7) [Wed, 16 Jul 2014 07:18:03 +0000 (09:18 +0200)]
Merge branch 'wip-mdl-30431' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Wed, 16 Jul 2014 07:04:55 +0000 (09:04 +0200)]
Merge branch 'MDL-35870' of git://github.com/nobelium/moodle
Nobelium [Wed, 16 Jul 2014 11:51:03 +0000 (11:51 +0000)]
MDL-35870 mod_scorm: Fixing undefined scoid for popup mode
Rajesh Taneja [Wed, 16 Jul 2014 06:56:08 +0000 (14:56 +0800)]
MDL-30431 behat: Use table id for wiki comments in behat
Eloy Lafuente (stronk7) [Wed, 16 Jul 2014 06:52:28 +0000 (08:52 +0200)]
Merge branch 'wip-mdl-44523' of https://github.com/rajeshtaneja/moodle
Rajesh Taneja [Wed, 16 Jul 2014 06:52:13 +0000 (14:52 +0800)]
MDL-30431 behat: Fixed wiki behat
Rajesh Taneja [Wed, 16 Jul 2014 06:05:42 +0000 (14:05 +0800)]
MDL-44523 Behat: Fixed event filter test with change in edulevel
Eloy Lafuente (stronk7) [Tue, 15 Jul 2014 23:19:13 +0000 (01:19 +0200)]
MDL-30431 mod_wiki: whitespace fix
Eloy Lafuente (stronk7) [Tue, 15 Jul 2014 23:16:04 +0000 (01:16 +0200)]
Merge branch 'MDL-30431_wiki_comments' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jul 2014 23:06:23 +0000 (01:06 +0200)]
MDL-46290 Completion: document the deprecation
Eloy Lafuente (stronk7) [Tue, 15 Jul 2014 22:57:47 +0000 (00:57 +0200)]
Merge branch 'MDL-46290_remove_unused_get_incomplete_criteria' of https://github.com/MorrisR2/moodle
Sam Hemelryk [Tue, 15 Jul 2014 21:04:01 +0000 (09:04 +1200)]
Merge branch 'wip-mdl-45991' of https://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Tue, 15 Jul 2014 16:30:29 +0000 (18:30 +0200)]
Merge branch 'MDL-35870' of git://github.com/nobelium/moodle
Nobelium [Tue, 15 Jul 2014 16:05:40 +0000 (16:05 +0000)]
MDL-35870 mod_scorm : fix for debug.js.php not found error
Rajesh Taneja [Tue, 15 Jul 2014 08:10:29 +0000 (16:10 +0800)]
MDL-45991 behat: fixed deprecated behat steps used
Sam Hemelryk [Tue, 15 Jul 2014 00:07:05 +0000 (12:07 +1200)]
Merge branch 'wip-MDL-37812-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 23:45:23 +0000 (01:45 +0200)]
MDL-35870 mod_scorm : Bump version
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 23:41:07 +0000 (01:41 +0200)]
MDL-35870 mod_scorm : whitespace fixes
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 23:06:53 +0000 (01:06 +0200)]
Merge branch 'MDL-35870' of git://github.com/nobelium/moodle
Sam Hemelryk [Mon, 14 Jul 2014 22:32:28 +0000 (10:32 +1200)]
Merge branch 'MDL-46346_blog' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 21:29:07 +0000 (23:29 +0200)]
Merge branch 'MDL-46080' of https://github.com/jonof/moodle
Sam Hemelryk [Mon, 14 Jul 2014 21:10:17 +0000 (09:10 +1200)]
MDL-37993 mod_quiz: fixed deprecated behat step
Sam Hemelryk [Mon, 14 Jul 2014 20:48:55 +0000 (08:48 +1200)]
Merge branch 'MDL-37993-quiz-completion-pass-attempts' of git://github.com/MorrisR2/moodle
Sam Hemelryk [Mon, 14 Jul 2014 20:39:37 +0000 (08:39 +1200)]
Merge branch 'MDL-42179-003-master' of https://github.com/dbezborodovrp/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 16:13:18 +0000 (18:13 +0200)]
Merge branch 'master_MDL-31366' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 16:06:52 +0000 (18:06 +0200)]
Merge branch 'MDL-44523_master' of git://github.com/dmonllao/moodle
Ray Morris [Fri, 30 May 2014 16:39:42 +0000 (11:39 -0500)]
MDL-37993 Quiz: completion upon all passing grade or attempts exhausted
This patch adds completion options to Quiz similar to what is available in scorm.
One can have the quiz marked complete when either a passing grade is achieved or
all attempts are used up. This will allow a quiz to complete when the user "passes
or fails". (Where "fail" means "using up all attempts without passing".)
Dan Poltawski [Mon, 14 Jul 2014 15:06:13 +0000 (16:06 +0100)]
Merge branch 'MDL-42752-master' of git://github.com/phalacee/moodle
Dan Poltawski [Mon, 14 Jul 2014 14:49:20 +0000 (15:49 +0100)]
MDL-46226 fix unit tests
Dan Poltawski [Mon, 14 Jul 2014 14:33:12 +0000 (15:33 +0100)]
Merge branch 'MDL-46218_disabled2' of https://github.com/andyjdavis/moodle
Eloy Lafuente (stronk7) [Mon, 14 Jul 2014 13:54:52 +0000 (15:54 +0200)]
Merge branch 'm28_MDL-46197' of https://github.com/totara/moodle
Dan Poltawski [Mon, 14 Jul 2014 14:13:32 +0000 (15:13 +0100)]
Merge branch 'm28_MDL-46226' of https://github.com/totara/moodle
Dan Poltawski [Mon, 14 Jul 2014 12:12:43 +0000 (13:12 +0100)]
Merge branch 'm28_MDL-46250' of https://github.com/totara/moodle
Dan Poltawski [Mon, 14 Jul 2014 11:33:59 +0000 (12:33 +0100)]
Merge branch 'MDL-46286-master' of https://github.com/lucisgit/moodle
Damien Bezborodov [Wed, 25 Jun 2014 06:02:25 +0000 (15:32 +0930)]
MDL-42179 mod_assign: Time remaining issue for group assignment
Sam Hemelryk [Mon, 14 Jul 2014 03:27:16 +0000 (15:27 +1200)]
Merge branch 'MDL-42214_popup_blocked' of https://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 14 Jul 2014 03:19:21 +0000 (15:19 +1200)]
Merge branch 'MDL-45991_master' of https://github.com/Syxton/moodle
Sam Hemelryk [Mon, 14 Jul 2014 03:14:49 +0000 (15:14 +1200)]
Merge branch 'MDL-46073_master' of https://github.com/totara/openbadges
Andrew Davis [Sun, 13 Jul 2014 10:43:09 +0000 (18:43 +0800)]
MDL-46346 blog: coding style fixes
Andrew Davis [Thu, 10 Jul 2014 02:57:39 +0000 (10:57 +0800)]
MDL-46218 reshuffled access checks in blog and notes
Andrew Davis [Fri, 27 Jun 2014 02:10:55 +0000 (10:10 +0800)]
MDL-42214 core_message:prevented popup notifications of messages from blocked users
Sam Hemelryk [Mon, 14 Jul 2014 00:09:29 +0000 (12:09 +1200)]
Merge branch 'MDL-45765-master' of https://github.com/StudiUM/moodle
Sam Hemelryk [Sun, 13 Jul 2014 23:55:02 +0000 (11:55 +1200)]
Merge branch 'wip-MDL-46247-master' of https://github.com/mackensen/moodle
Andrew Davis [Mon, 30 Jun 2014 02:36:10 +0000 (10:36 +0800)]
MDL-30431 mod_wiki: clarified the logic around editing and deleting wiki comments and added behat tests
Sam Hemelryk [Sun, 13 Jul 2014 22:50:42 +0000 (10:50 +1200)]
MDL-46138 post integratino phpdoc fixes
Sam Hemelryk [Sun, 13 Jul 2014 22:39:54 +0000 (10:39 +1200)]
Merge branch 'MDL-46138-master' of git://github.com/damyon/moodle
Sam Hemelryk [Sun, 13 Jul 2014 22:32:28 +0000 (10:32 +1200)]
Merge branch 'wip-MDL-46280-master' of git://github.com/marinaglancy/moodle
Sam Hemelryk [Sun, 13 Jul 2014 22:21:13 +0000 (10:21 +1200)]
Merge branch 'MDL-22469-master' of https://github.com/StudiUM/moodle
Sam Hemelryk [Sun, 13 Jul 2014 22:12:16 +0000 (10:12 +1200)]
Merge branch 'MDL-31089_master' of git://github.com/dmonllao/moodle
Tony Butler [Mon, 7 Jul 2014 16:21:08 +0000 (17:21 +0100)]
MDL-46286 lib_htmlpurifier: Add allowed URI scheme for RTMP
Signed-off-by: Tony Butler <tonyjbutler@gmail.com>
David Monllao [Mon, 30 Jun 2014 08:55:57 +0000 (16:55 +0800)]
MDL-31089 mod_forum: Filtering non-visible groups
Simey Lameze [Fri, 11 Jul 2014 04:58:26 +0000 (12:58 +0800)]
MDL-45562 blog: fixed issues when creating/editing an external blog.
David Monllao [Thu, 3 Jul 2014 06:29:07 +0000 (14:29 +0800)]
MDL-44523 events: Changing edulevels to make them consistent with other events
Damyon Wiese [Fri, 11 Jul 2014 01:43:32 +0000 (09:43 +0800)]
MDL-46138 tasks: The adhoc task is being too helpful with json_encoding/decoding.
Dan Marsden [Fri, 11 Jul 2014 01:24:05 +0000 (13:24 +1200)]
MDL-31366 Feedback: decode htmlchars on output to excel
Brian Barnes [Mon, 30 Jun 2014 01:15:12 +0000 (13:15 +1200)]
MDL-46197 core_calendar: Added label text to durations in minutes field
Ray Morris [Tue, 8 Jul 2014 18:09:30 +0000 (13:09 -0500)]
MDL-46290 Completion: Remove unused function get_incomplete_criteria(), it doesn't work
Brian Barnes [Wed, 2 Jul 2014 04:22:26 +0000 (16:22 +1200)]
MDL-46226 core: pix_icon no longer sets title to the alt text
Jean-Philippe Gaudreau [Fri, 4 Jul 2014 16:02:34 +0000 (12:02 -0400)]
MDL-45765 Calendar import: Fix undefined variable in cron when updating calendar subscriptions
Gilles-Philippe Leblanc [Mon, 7 Jul 2014 21:14:40 +0000 (17:14 -0400)]
MDL-22469 auth_cas: CAS module : parameter authCAS=NOCAS not properly handled
Syxton [Thu, 10 Jul 2014 19:44:21 +0000 (15:44 -0400)]
MDL-45991 groups: Auto-create ignore grouped users
MDL-45991 groups: Auto-create groups with ungrouped users only
When using auto-create groups, sometimes it is needed to only create
groups with users that are not already inside a course group. This
patch creates a checkbox that will ignore users that are in already
existing groups. It alters the groups_get_potential_members function so
that the eligible users are retrieved entirely though sql.
Eloy Lafuente (stronk7) [Thu, 10 Jul 2014 17:15:18 +0000 (19:15 +0200)]
weekly release 2.8dev
Eloy Lafuente (stronk7) [Thu, 10 Jul 2014 17:15:06 +0000 (19:15 +0200)]
Merge branch 'install_master' of https://git.in.moodle.com/amosbot/moodle-install
Nobelium [Thu, 10 Jul 2014 15:40:39 +0000 (15:40 +0000)]
MDL-35870 mod_scorm : Adding phpdocs for new functions
get_scorm_default in scorm_12lib.php
get_scorm_default in scorm_13lib.php
get_scorm_default in aicclib.php
scorm_isset in locallib.php
scorm_empty in locallib.php
Nobelium [Thu, 10 Jul 2014 14:17:32 +0000 (14:17 +0000)]
MDL-35870 mod_scorm : Removing loaddatamodel.php
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.
Andrew Nicols [Tue, 27 May 2014 09:21:25 +0000 (17:21 +0800)]
MDL-38990 mod_forum: Restrict ability to post to all groups in a forum
In order to post to all groups in a forum, you must have the
moodle/site:accessallgroups capability.
Thanks to Jakob Ackermann <jackermann@onlineschool.ca> for part of the fix
on this one.
Russell Smith [Wed, 9 Jul 2014 07:47:19 +0000 (17:47 +1000)]
MDL-46193 phpunit: Replace value in component config.
There are two phpunit.xml build locations, one for overall
and another for individual components. To reduce id changes
when running different components, we use the same initial ID
in all component files when building.
Damyon Wiese [Thu, 10 Jul 2014 03:35:47 +0000 (11:35 +0800)]
MDL-46148 questions: Added missing allow_commit for transaction
Damyon Wiese [Thu, 10 Jul 2014 01:57:06 +0000 (09:57 +0800)]
Merge branch 'MDL-19270_master' of https://github.com/nadavkav/moodle
Conflicts:
lib/graphlib.php
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.
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.
Nadav Kavalerchik [Wed, 9 Jul 2014 11:57:31 +0000 (14:57 +0300)]
MDL-19270 - Quiz graph - Fix reverse display of Hebrew legend text in RTL mode
Tim Hunt [Wed, 9 Jul 2014 11:56:18 +0000 (12:56 +0100)]
MDL-46148 qtype_calculated: removed unused method.
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.
David Mudrák [Wed, 9 Jul 2014 08:21:16 +0000 (10:21 +0200)]
MDL-46223 Improve the display of marking guide validation message
Dan Poltawski [Wed, 9 Jul 2014 07:22:18 +0000 (08:22 +0100)]
MDL-46227 fix typo