James Pratt [Wed, 11 Dec 2013 10:58:33 +0000 (17:58 +0700)]
MDL-41754 (3) quiz statistics : need to escape core_php_time_limit
after MDL-42084 was merged into upstream, introducing
core_php_time_limit, this branch that moved a reference to
core_php_time_limit to a new namespace was broken.
James Pratt [Tue, 19 Nov 2013 13:07:05 +0000 (20:07 +0700)]
MDL-41754 (2) quiz statistics : using Sam's new progress classes
James Pratt [Fri, 15 Nov 2013 05:18:06 +0000 (12:18 +0700)]
MDL-41754 (1) Progress tracking : moved from backup and restore to core
James Pratt [Fri, 13 Dec 2013 08:51:07 +0000 (15:51 +0700)]
MDL-43369 : quiz statistics - average across attempts where item seen
and not across all attempts for subqs.
Eloy Lafuente (stronk7) [Thu, 23 Jan 2014 11:38:19 +0000 (12:38 +0100)]
weekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 23 Jan 2014 11:38:06 +0000 (12:38 +0100)]
Merge branch 'install_master' of git://git.moodle.org/moodle-install
Damyon Wiese [Thu, 23 Jan 2014 09:13:18 +0000 (17:13 +0800)]
Revert "MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close."
This reverts commit
ed3d1ee60d1e48ade21438fd98fef2deb63ecb5f.
This reverts commit
ed8eebeecefa98e17c96084b72fe2cd923cc051d.
This reverts commit
f664a9387818b5b359df4696040da0aea07b926a.
This reverts commit
9d2276572372f5d249cde8c61d0976e25f0fa4a8.
Dan Marsden [Thu, 23 Jan 2014 07:38:01 +0000 (20:38 +1300)]
MDL-43247 SCORM: use window.closed property instead of window.opener for IE
Damyon Wiese [Thu, 23 Jan 2014 02:49:56 +0000 (10:49 +0800)]
MDL-43247 Scorm: Fix for undefined js variable when popup is blocked.
Damyon Wiese [Thu, 23 Jan 2014 02:27:18 +0000 (10:27 +0800)]
Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
Dan Poltawski [Thu, 23 Jan 2014 01:32:36 +0000 (09:32 +0800)]
Merge branch 'MDL-43670' of git://github.com/timhunt/moodle
Dan Marsden [Wed, 22 Jan 2014 08:53:26 +0000 (21:53 +1300)]
MDL-43247 SCORM: convert some js to YUI
Tim Hunt [Wed, 22 Jan 2014 08:32:10 +0000 (08:32 +0000)]
MDL-43670 fix quiz backup.
Damyon Wiese [Wed, 22 Jan 2014 02:00:43 +0000 (10:00 +0800)]
MDL-26680: Reset my moodle page - add sesskey check.
Damyon Wiese [Wed, 22 Jan 2014 01:52:38 +0000 (09:52 +0800)]
Merge branch 'MDL-26680-master' of git://github.com/micaherne/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Dan Poltawski [Wed, 22 Jan 2014 01:15:52 +0000 (09:15 +0800)]
Merge branch 'w03_MDL-43661_m27_edulevel' of https://github.com/skodak/moodle
Michael Aherne [Wed, 25 Jul 2012 12:33:29 +0000 (13:33 +0100)]
MDL-26680 my page My Moodle "reset to default" button
Dan Poltawski [Tue, 21 Jan 2014 15:29:20 +0000 (23:29 +0800)]
Merge branch 'MDL-41506-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Petr Škoda [Mon, 13 Jan 2014 01:44:35 +0000 (09:44 +0800)]
MDL-43661 use new edulevel in all existing events
Petr Škoda [Mon, 13 Jan 2014 01:15:52 +0000 (09:15 +0800)]
MDL-43661 change event property level to edulevel
Level is a reserved word in sql, sorry.
Dan Poltawski [Tue, 21 Jan 2014 07:21:17 +0000 (15:21 +0800)]
Merge branch 'mdl34020-master' of https://github.com/tlock/moodle
Dan Poltawski [Tue, 21 Jan 2014 06:49:26 +0000 (14:49 +0800)]
Merge branch '43714-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 21 Jan 2014 06:28:50 +0000 (14:28 +0800)]
Merge branch 'MDL-43760-master' of git://github.com/damyon/moodle
Damyon Wiese [Tue, 21 Jan 2014 05:47:39 +0000 (13:47 +0800)]
Merge branch 'MDL-43725-master' of git://github.com/ankitagarwal/moodle
Damyon Wiese [Tue, 21 Jan 2014 05:17:05 +0000 (13:17 +0800)]
Merge branch 'wip-MDL-43294-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Tue, 21 Jan 2014 05:06:30 +0000 (13:06 +0800)]
Merge branch 'MDL-41810_master' of https://github.com/totara/openbadges
Conflicts:
badges/upgrade.txt
Damyon Wiese [Tue, 21 Jan 2014 04:57:05 +0000 (12:57 +0800)]
Merge branch 'master_MDL-43247' of git://github.com/danmarsden/moodle
Dan Poltawski [Tue, 21 Jan 2014 04:24:38 +0000 (12:24 +0800)]
Merge branch 'wip-MDL-43700-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Tue, 21 Jan 2014 04:19:34 +0000 (12:19 +0800)]
Merge branch 'MDL-43717_master' of git://github.com/dmonllao/moodle
Dan Poltawski [Tue, 21 Jan 2014 03:58:40 +0000 (11:58 +0800)]
MDL-43670 quiz: improve code comments a little
Dan Poltawski [Tue, 21 Jan 2014 03:25:38 +0000 (11:25 +0800)]
Merge branch 'MDL-43670' of git://github.com/timhunt/moodle
Dan Poltawski [Tue, 21 Jan 2014 03:21:52 +0000 (11:21 +0800)]
Merge branch 'MDL-43693-master' of https://github.com/lucisgit/moodle
Damyon Wiese [Tue, 21 Jan 2014 02:41:40 +0000 (10:41 +0800)]
Merge branch 'wip-mdl-40917' of https://github.com/rajeshtaneja/moodle
Dan Poltawski [Tue, 21 Jan 2014 02:37:01 +0000 (10:37 +0800)]
Merge branch 'MDL-42955_b' of git://github.com/rwijaya/moodle
Damyon Wiese [Tue, 21 Jan 2014 01:35:21 +0000 (09:35 +0800)]
Merge branch 'MDL-41688-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Tue, 21 Jan 2014 01:28:54 +0000 (09:28 +0800)]
Merge branch 'MDL-43732' of github.com:merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:59:50 +0000 (01:59 +0100)]
Merge branch 'wip-MDL-43333-master' of git://github.com/marinaglancy/moodle
Eric Merrill [Wed, 15 Jan 2014 23:15:05 +0000 (18:15 -0500)]
MDL-43732 quiz Fix styles so that question div doesn't overlap controls.
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:54:00 +0000 (01:54 +0100)]
Merge branch 'wip-MDL-43211-master' of git://github.com/marinaglancy/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:46:16 +0000 (01:46 +0100)]
Merge branch 'MDL-43401-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:43:13 +0000 (01:43 +0100)]
Merge branch 'MDL-43480_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 21 Jan 2014 00:13:04 +0000 (01:13 +0100)]
Merge branch 'MDL-41693-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 23:20:28 +0000 (00:20 +0100)]
Merge branch 'MDL-39684-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 23:17:31 +0000 (00:17 +0100)]
Merge branch 'MDL-40533-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 23:05:03 +0000 (00:05 +0100)]
Merge branch 'MDL-43743_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Mon, 20 Jan 2014 22:59:27 +0000 (23:59 +0100)]
Merge branch 'MDL-41362-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Frederic Massart [Tue, 14 Jan 2014 14:24:13 +0000 (15:24 +0100)]
MDL-41688 gradebook: Improved grading layout on bootstrapbase themes
Damyon Wiese [Mon, 20 Jan 2014 09:24:04 +0000 (17:24 +0800)]
MDL-39756 qtype_essay : Make defaults match upgrade (and php) for responserequired field
Damyon Wiese [Mon, 20 Jan 2014 09:10:38 +0000 (17:10 +0800)]
Merge branch 'MDL-43632-master' of https://github.com/lucisgit/moodle
Damyon Wiese [Mon, 20 Jan 2014 08:20:15 +0000 (16:20 +0800)]
Merge branch 'MDL-39756-essay' of https://github.com/ktemkin/moodle
Damyon Wiese [Mon, 20 Jan 2014 08:02:54 +0000 (16:02 +0800)]
Merge branch 'MDL-32523' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Jan 2014 07:29:15 +0000 (15:29 +0800)]
Merge branch 'wip-MDL-41062-master' of git://github.com/marinaglancy/moodle
Dan Poltawski [Mon, 20 Jan 2014 07:25:46 +0000 (15:25 +0800)]
Merge branch '42682-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 20 Jan 2014 06:24:38 +0000 (14:24 +0800)]
Merge branch 'MDL-43690' of git://github.com/timhunt/moodle
Rossiani Wijaya [Mon, 20 Jan 2014 06:00:29 +0000 (14:00 +0800)]
MDL-42955: Removed scrollbar from block's action menu
Damyon Wiese [Mon, 20 Jan 2014 05:37:51 +0000 (13:37 +0800)]
MDL-43760 Potential fix for fletcher scott issues with fullname.
Damyon Wiese [Mon, 20 Jan 2014 05:21:58 +0000 (13:21 +0800)]
Merge branch 'MDL-42495-m' of git://github.com/micaherne/moodle
Dan Poltawski [Mon, 20 Jan 2014 04:56:17 +0000 (12:56 +0800)]
Merge branch 'MDL-42980' of git://github.com/rwijaya/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Marina Glancy [Tue, 14 Jan 2014 06:54:00 +0000 (14:54 +0800)]
MDL-41062 gradebook: corrections to grade_item upgrade script, more tests
Damyon Wiese [Mon, 20 Jan 2014 03:27:07 +0000 (11:27 +0800)]
Merge branch 'MDL-39683-master' of git://github.com/FMCorz/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Mon, 20 Jan 2014 03:22:27 +0000 (11:22 +0800)]
MDL-40051 Add mnet test folder to phpunit.xml.dist
Damyon Wiese [Mon, 20 Jan 2014 02:57:30 +0000 (10:57 +0800)]
Merge branch '43675-27' of git://github.com/samhemelryk/moodle
Dan Poltawski [Mon, 20 Jan 2014 02:53:50 +0000 (10:53 +0800)]
Merge branch 'MDL-43671_message' of https://github.com/andyjdavis/moodle
Damyon Wiese [Mon, 20 Jan 2014 02:41:36 +0000 (10:41 +0800)]
Merge branch 'MDL-40051_master' of https://github.com/markn86/moodle
Dan Poltawski [Mon, 20 Jan 2014 02:33:36 +0000 (10:33 +0800)]
Merge branch 'MDL-40139-master' of git://github.com/FMCorz/moodle
Mark Nelson [Sun, 1 Dec 2013 00:16:42 +0000 (16:16 -0800)]
MDL-40051 core_lib: replaced add_to_log call when failing to send email with an event
Mark Nelson [Fri, 29 Nov 2013 20:58:40 +0000 (12:58 -0800)]
MDL-40051 core_mnet: replaced add_to_log calls with events
Ankit Agarwal [Fri, 17 Jan 2014 06:38:50 +0000 (14:38 +0800)]
MDL-43725 report_loglive: Fixing undefined variable error
AMOS BEGIN
CPY [page,report_log],[page,report_loglive]
AMOS END
Damyon Wiese [Mon, 20 Jan 2014 02:02:40 +0000 (10:02 +0800)]
Merge branch 'MDL-43733' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 20 Jan 2014 01:45:43 +0000 (09:45 +0800)]
Merge branch 'wip-mdl-43306-m' of git://github.com/rajeshtaneja/moodle
David Monllao [Mon, 20 Jan 2014 01:29:37 +0000 (09:29 +0800)]
MDL-43743 mod_scorm: Adding package disclaimer
As the package is licensed under CC 3.0 we should
be compliant with attribution.
Dan Poltawski [Mon, 20 Jan 2014 01:24:53 +0000 (09:24 +0800)]
Merge branch 'MDL-40752-master' of git://github.com/phalacee/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
AMOS bot [Mon, 20 Jan 2014 00:41:21 +0000 (00:41 +0000)]
Automatically generated installer lang files
AMOS bot [Sun, 19 Jan 2014 00:41:55 +0000 (00:41 +0000)]
Automatically generated installer lang files
Tim Hunt [Fri, 17 Jan 2014 16:58:13 +0000 (16:58 +0000)]
MDL-43733 use any auto-saved responses when questions are finished.
Before this, autosave was only working to save data when a student went
back in to continue an attempt. If the student, having crashed out,
never went back in and continued the attempt, their auto-saved responses
were not used when the attempt was automatically finished. That was a
rather bad oversight, which should now be fixed.
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.
Tim Hunt [Mon, 13 Jan 2014 18:25:39 +0000 (18:25 +0000)]
MDL-43670 quiz_question_instances to match coding guidelines.
Some columns needed to be renamed:
* quiz -> quizid
* question -> questionid
* grade -> maxmark
Then all the places that refer to those needed to be fixed.
Tim Hunt [Wed, 15 Jan 2014 14:20:27 +0000 (14:20 +0000)]
MDL-32523 question behat tests: distinctive question names
This means that, if you are watching the tests run, it is easier to see
which test is currently being executed.
M Kassaei [Mon, 4 Nov 2013 16:35:27 +0000 (16:35 +0000)]
MDL-32523 Duplicate questions in question bank
David Monllao [Fri, 17 Jan 2014 09:39:25 +0000 (17:39 +0800)]
MDL-43743 behat: Lightweight scorm package
The previous used package were adding a second iframe
inside the scorm iframe and was slow loading it;
this patch replaces it for a simple one without any
extra iframe.
Dan Poltawski [Tue, 14 Jan 2014 06:53:03 +0000 (14:53 +0800)]
MDL-41062 gradebook: remove sortorder duplicates
* Upgrade function to remove duplicates from the grade item duplicates
column. Duplicates were causing sorting to fail in some cases.
* Add some unit tests which simulate sort order duplicate data and
verify that they have been removed.
Marina Glancy [Fri, 10 Jan 2014 03:59:43 +0000 (11:59 +0800)]
MDL-43333 blocks: move activity icon in social and main menu
Marina Glancy [Thu, 9 Jan 2014 09:02:36 +0000 (17:02 +0800)]
MDL-43211 blocks: style edit icons in main menu and social activities
Marina Glancy [Thu, 9 Jan 2014 09:01:58 +0000 (17:01 +0800)]
MDL-43211 course: do not return indent icon if not needed
rwijaya [Thu, 16 Jan 2014 09:57:42 +0000 (17:57 +0800)]
MDL-42980 clean theme: fixed add/cancel buttons position for safari on iPhone with ios7.
Adrian Greeve [Mon, 13 Jan 2014 07:44:49 +0000 (15:44 +0800)]
MDL-43294 mod_lesson: Unit test for essay_assessed event.
Adrian Greeve [Thu, 9 Jan 2014 07:11:08 +0000 (15:11 +0800)]
MDL-43294 events: New Event for essay submission in lesson.
David Monllao [Mon, 13 Jan 2014 06:30:53 +0000 (14:30 +0800)]
MDL-43480 behat: Switching @_only_local and @_alerts to @_file_upload and @_alert
David Monllao [Thu, 9 Jan 2014 07:23:28 +0000 (15:23 +0800)]
MDL-43480 behat: Removing @_only_local tags from steps where it is not necessary
David Monllao [Thu, 16 Jan 2014 06:55:02 +0000 (14:55 +0800)]
MDL-43717 behat: Replacing 2050 for a date eariler than the max timestamp 32bit limit
All credit goes to Michael de Raadt.
AMOS bot [Fri, 17 Jan 2014 00:48:05 +0000 (00:48 +0000)]
Automatically generated installer lang files
Andrew Davis [Thu, 16 Jan 2014 23:32:12 +0000 (07:32 +0800)]
MDL-43671 message: removed an overly cautious check
Sam Hemelryk [Thu, 16 Jan 2014 21:50:18 +0000 (10:50 +1300)]
MDL-43714 blocks: fixed coding style of ajax/blocks.php
Sam Hemelryk [Thu, 16 Jan 2014 21:45:23 +0000 (10:45 +1300)]
MDL-43714 blocks: fixed notice when moving to an empty region
Sam Hemelryk [Mon, 13 Jan 2014 23:29:36 +0000 (12:29 +1300)]
MDL-43675 navigation: courses branch is now recognised as expandable
Sam Hemelryk [Thu, 9 Jan 2014 01:58:28 +0000 (14:58 +1300)]
MDL-42682 theme_bootstrapbase: fixed styling of discussion selector
Sam Hemelryk [Thu, 9 Jan 2014 00:50:55 +0000 (13:50 +1300)]
MDL-42682 theme_bootstrapbase: fixed forum search alignment
Dan Marsden [Sun, 5 Jan 2014 20:43:39 +0000 (09:43 +1300)]
MDL-43247 SCORM: improve pop-up handling and redirect to homepage on close.
Eloy Lafuente (stronk7) [Thu, 16 Jan 2014 17:50:54 +0000 (18:50 +0100)]
weekly release 2.7dev
Eloy Lafuente (stronk7) [Thu, 16 Jan 2014 17:50:54 +0000 (18:50 +0100)]
NOBUG: Fixed file access permissions