Dan Poltawski [Tue, 5 Feb 2013 02:47:15 +0000 (10:47 +0800)]
Merge branch 'MDL-36986' of git://github.com/moodlerooms/moodle
Dan Poltawski [Tue, 5 Feb 2013 02:25:57 +0000 (10:25 +0800)]
Merge branch 'wip-MDL-36322-m25' of https://github.com/samhemelryk/moodle
Dan Poltawski [Tue, 5 Feb 2013 01:57:00 +0000 (09:57 +0800)]
MDL-37357 - fix trailing whitespace
Dan Poltawski [Tue, 5 Feb 2013 01:56:16 +0000 (09:56 +0800)]
Merge branch 'MDL-37357_hidden_rank' of git://github.com/andyjdavis/moodle
Dan Poltawski [Tue, 5 Feb 2013 01:29:25 +0000 (09:29 +0800)]
Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle
Jason Fowler [Tue, 5 Feb 2013 01:23:54 +0000 (09:23 +0800)]
MDL-35847 - Documentation - removing doc block param for on error_text
Dan Poltawski [Tue, 5 Feb 2013 00:35:32 +0000 (08:35 +0800)]
MDL-37574 - Fix navigation tests: remove title
We are no longer setting it, to improve accessibility
Eloy Lafuente (stronk7) [Tue, 5 Feb 2013 00:28:35 +0000 (01:28 +0100)]
Merge branch 'MDL-36472-master' of git://github.com/FMCorz/moodle
Eloy Lafuente (stronk7) [Tue, 5 Feb 2013 00:14:07 +0000 (01:14 +0100)]
Merge branch 'MDL-37566-m' of git://github.com/andrewnicols/moodle
Eloy Lafuente (stronk7) [Tue, 5 Feb 2013 00:06:40 +0000 (01:06 +0100)]
Merge branch 'w04_MDL-37780_m25_wintests' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 5 Feb 2013 00:01:14 +0000 (01:01 +0100)]
Merge branch 'MDL-37801_glossary_links' of git://github.com/davosmith/moodle
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 23:57:20 +0000 (00:57 +0100)]
Merge branch 'MDL-37775_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 23:35:24 +0000 (00:35 +0100)]
Merge branch 'MDL-37785_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 23:28:10 +0000 (00:28 +0100)]
Merge branch 'MDL-37523_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 23:13:48 +0000 (00:13 +0100)]
Merge branch 'MDL-37518_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 23:08:44 +0000 (00:08 +0100)]
Merge branch 'wip-MDL-35847-master' of git://github.com/phalacee/moodle
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 22:58:41 +0000 (23:58 +0100)]
Merge branch 'master_MDL-33078' of git://github.com/danmarsden/moodle
Eloy Lafuente (stronk7) [Mon, 4 Feb 2013 21:54:50 +0000 (22:54 +0100)]
Merge branch 'MDL-37847' of git://github.com/timhunt/moodle
Tim Hunt [Mon, 4 Feb 2013 12:54:10 +0000 (12:54 +0000)]
MDL-37847 plain text essays were screwing up HTML special chars.
This was incorrect use of PARAM_CLEANHTML for these inputs.
This fix also adds some unit tests to try to verify that this does not
break again in future.
Dan Marsden [Mon, 4 Feb 2013 09:04:06 +0000 (22:04 +1300)]
MDL-33078 SCORM: rebuild toc when calling LMSCommit to improve pre-req handling
Damyon Wiese [Mon, 4 Feb 2013 08:18:00 +0000 (16:18 +0800)]
Merge branch 'MDL-37781-workshop-schedule' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 4 Feb 2013 08:11:11 +0000 (16:11 +0800)]
Merge branch 'MDL-37574-m' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 4 Feb 2013 08:02:57 +0000 (16:02 +0800)]
Merge branch 'MDL-37422' of git://github.com/colchambers/moodle
Dan Poltawski [Mon, 4 Feb 2013 07:54:43 +0000 (15:54 +0800)]
Merge branch 'master_MDL-29207' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 4 Feb 2013 07:12:30 +0000 (15:12 +0800)]
Revert "MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests"
This reverts commit
88df34abeddb5819e82e588b3b909c0de813d6b4.
Dan Poltawski [Mon, 4 Feb 2013 06:30:07 +0000 (14:30 +0800)]
Merge branch 'MDL-32076_unlimited2' of git://github.com/andyjdavis/moodle
Dan Poltawski [Mon, 4 Feb 2013 05:54:27 +0000 (13:54 +0800)]
Merge branch 'wip-mdl-30144' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Mon, 4 Feb 2013 05:49:23 +0000 (13:49 +0800)]
Merge branch 'MDL-37646-master' of git://github.com/damyon/moodle
Jason Fowler [Thu, 31 Jan 2013 03:02:49 +0000 (11:02 +0800)]
MDL-35847 - Accessibility - Adding warning icon to the login error message
Barbara Ramiro [Thu, 31 Jan 2013 02:55:18 +0000 (10:55 +0800)]
MDL-35847 - Usability - Adding new warning icons
Damyon Wiese [Mon, 4 Feb 2013 04:48:42 +0000 (12:48 +0800)]
Merge branch 'MDL-37806-workshop-next' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 4 Feb 2013 04:12:11 +0000 (12:12 +0800)]
Merge branch 'MDL-37710-master' of git://github.com/damyon/moodle
Dan Poltawski [Mon, 4 Feb 2013 03:56:45 +0000 (11:56 +0800)]
Merge branch 'MDL-37635-master' of git://github.com/damyon/moodle
Mark Nelson [Mon, 4 Feb 2013 03:09:56 +0000 (11:09 +0800)]
MDL-37518 blocks: described the introduction of the myaddinstance capability in upgrade.txt
Damyon Wiese [Mon, 4 Feb 2013 03:35:54 +0000 (11:35 +0800)]
Merge branch 'master_MDL-36800' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 4 Feb 2013 03:29:22 +0000 (11:29 +0800)]
Merge branch 'MDL-32652_master' of git://github.com/pauln/moodle
Dan Poltawski [Mon, 4 Feb 2013 03:22:41 +0000 (11:22 +0800)]
MDL-35823 - fix trailing whitespace
Dan Poltawski [Mon, 4 Feb 2013 03:23:41 +0000 (11:23 +0800)]
Merge branch 'wip-MDL-35823-master' of git://github.com/phalacee/moodle
Damyon Wiese [Mon, 4 Feb 2013 03:12:45 +0000 (11:12 +0800)]
Merge branch 'MDL-37177-master' of git://github.com/FMCorz/moodle
Dan Poltawski [Mon, 4 Feb 2013 02:26:32 +0000 (10:26 +0800)]
Merge branch 'MDL-37645-m' of git://github.com/andrewnicols/moodle
Dan Poltawski [Mon, 4 Feb 2013 02:17:36 +0000 (10:17 +0800)]
Merge branch 'MDL-37746' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 4 Feb 2013 02:12:54 +0000 (10:12 +0800)]
Merge branch 'MDL-25853-master' of git://github.com/FMCorz/moodle
Mary Evans [Sun, 3 Feb 2013 23:35:05 +0000 (23:35 +0000)]
MDL-37523 theme_mymobile: Removed a renderer from mymobile/renderers.php and added it to theme/mymobile/renderers/mod_choice_renderer.php. Then added a conditional statement to theme/mymobile/renderers.php in order to call mymobile/renderers/mod_choice_renderer.php.
Dan Marsden [Sun, 3 Feb 2013 07:00:18 +0000 (20:00 +1300)]
MDL-29207: SCORM prereq callback is pure js - move it to module.js so it can be cached better.
Dan Marsden [Sun, 3 Feb 2013 06:55:32 +0000 (19:55 +1300)]
MDL-29207 SCORM: Auto-continue doesn't work with Pre-req due to JS errors
Dan Marsden [Thu, 31 Jan 2013 22:33:54 +0000 (11:33 +1300)]
MDL-36800 SCORM: Fix Yui().use calls - thanks to Nancy Cheng for the fix
Colin Chambers [Mon, 28 Jan 2013 10:36:30 +0000 (10:36 +0000)]
MDL-37422 Quiz: Group fields related to 'Settings for multiple tries.'
Andrew Robert Nicols [Mon, 28 Jan 2013 23:30:45 +0000 (23:30 +0000)]
MDL-37574 Remove default link title from navigation items
Andrew Robert Nicols [Mon, 28 Jan 2013 23:52:48 +0000 (23:52 +0000)]
MDL-37566 AJAX Only set max-height for chooser dialogues
If we set height as well as max-height then there is a potential for
whitespace to be shown at the bottom of the list of choices.
This commit stops removing the height option so that we only rely upon
max-height for dialogue heigh calculation.
Andrew Robert Nicols [Wed, 10 Oct 2012 10:03:00 +0000 (11:03 +0100)]
MDL-37645 Generalise style for moodle-core-dialogues
Michael Hughes [Fri, 1 Feb 2013 06:49:55 +0000 (14:49 +0800)]
MDL-30144 Assignment 2.2: Download all as zip should only contain submission from active enroled users
Damyon Wiese [Fri, 1 Feb 2013 05:20:33 +0000 (13:20 +0800)]
MDL-37635 Assign: Prevent errors when viewing a feedback for an assignment with no gradeitem in gradebook
Also adds unit tests to verify that:
Feedback is visible even if there is no grade
The grade is not shown if the gradeitem is hidden unless you have mod/assign:grade capability
Jason Fowler [Wed, 30 Jan 2013 01:07:43 +0000 (09:07 +0800)]
MDL-35823 - Accessibility - Converted the help popup header from H1 to H2 to improve the over all DOM
Andrew Davis [Thu, 10 Jan 2013 07:58:16 +0000 (15:58 +0800)]
MDL-37357 core_grade: fixed the showing and hiding of rank on the overview report
Andrew Davis [Sat, 26 Jan 2013 01:39:48 +0000 (09:39 +0800)]
MDL-32076 core_grade: fixed ajax handling of unlimited grades and added some unit tests
Sam Hemelryk [Wed, 30 Jan 2013 00:59:17 +0000 (13:59 +1300)]
MDL-36322 cache: implemented cache_store::create_clone
Sam Hemelryk [Wed, 30 Jan 2013 00:39:45 +0000 (13:39 +1300)]
MDL-36322 cache: clarified docs for initialise and construct
Sam Hemelryk [Thu, 24 Jan 2013 02:41:06 +0000 (15:41 +1300)]
MDL-36322 cache: cache stores now test connections during construction
Matteo Scaramuccia [Sat, 17 Nov 2012 22:13:22 +0000 (23:13 +0100)]
MDL-36322 Errors when updating a Moodle instance with some misconfigured cache stores
David Mudrák [Thu, 31 Jan 2013 17:15:52 +0000 (18:15 +0100)]
MDL-37806 Display 'Save and show next' button when assessing workshop submissions
The button is displayed only when there is a pending (that is not
assessed yet) submission to assess.
AMOS BEGIN
CPY [savenext,mod_assign],[saveandshownext,mod_workshop]
AMOS END
David Mudrák [Thu, 31 Jan 2013 17:13:26 +0000 (18:13 +0100)]
MDL-37806 Add new workshop class method to return pending assessments
This is a simple wrapper around workshop::get_assessments_by_reviewer()
that filters assigned assessments and returns just those that were not
graded by the reviewer yet.
Davo Smith [Thu, 31 Jan 2013 12:52:26 +0000 (12:52 +0000)]
MDL-37801 mod_glossary - encode / decode links to 'showentry' pages during backup & restore
Tim Hunt [Tue, 29 Jan 2013 10:05:28 +0000 (10:05 +0000)]
MDL-37746 qtype_shortanser: avoid normalizer_normalize dangers.
When an error occurs, normalizer_normalize just silently returns null,
which is dangerous. Here, we wrap it in a safe helper function.
David Mudrák [Thu, 31 Jan 2013 02:31:57 +0000 (03:31 +0100)]
MDL-37781 Allocate workshop submissions without waiting for cron
Now we are checking for the need to execute the allocator every time the
main view.php is displayed to any user. Previously this was done by cron
only.
David Mudrák [Thu, 31 Jan 2013 02:25:56 +0000 (03:25 +0100)]
MDL-37781 Check for switching the workshop phase without waiting for cron
Now we are checking for the need to switch the phase when the main
view.php is displayed to any user (previously this was done via cron
only). To give our subplugins (such as the scheduled allocation method)
a chance to do what they need to do, the workshop_viewed event is
triggered before the phase is actually switched.
Eloy Lafuente (stronk7) [Thu, 31 Jan 2013 09:59:41 +0000 (10:59 +0100)]
weekly release 2.5dev
Mary Evans [Thu, 31 Jan 2013 08:17:45 +0000 (08:17 +0000)]
MDL-37775 theme_canvas: Changed ADD a block from center align to left in style/blocks.css
Dan Poltawski [Thu, 31 Jan 2013 07:34:46 +0000 (15:34 +0800)]
Merge branch 'MDL-37789_master' of git://github.com/dmonllao/moodle
David Monllao [Thu, 31 Jan 2013 07:26:08 +0000 (15:26 +0800)]
MDL-37789 behat: Fixing unit test in windows
The directory separator was specified with
the slash character which is not good when
running the tests on windows
Frederic Massart [Mon, 21 Jan 2013 01:51:52 +0000 (09:51 +0800)]
MDL-36472 files: Improved file area uploads error messages.
Dan Poltawski [Thu, 31 Jan 2013 07:02:12 +0000 (15:02 +0800)]
Revert "MDL-37613 mod: changed generalbox class in table to generaltable class in mod/feedback (2 files);mod/glossary (3 files);mod/wiki (1 file)."
This reverts commit
0434dd24820e8c89e7f03d01c797ca65d211121a.
Frederic Massart [Thu, 31 Jan 2013 04:24:37 +0000 (12:24 +0800)]
MDL-37177 navigation: Prevent exception when viewing a profile
When viewing a profile as a non-authenticated user, an exception
was raised because we were trying to fetch the context of this user.
Dan Poltawski [Thu, 31 Jan 2013 02:17:16 +0000 (10:17 +0800)]
Revert "MDL-33105 flexible apply_units() function"
This reverts commit
c2ba17858c1994d9654a5ca64cb9fb22780654c1.
Dan Poltawski [Thu, 31 Jan 2013 02:14:46 +0000 (10:14 +0800)]
Merge branch 'master_MDL-34231' of git://github.com/danmarsden/moodle
Mary Evans [Thu, 31 Jan 2013 01:02:55 +0000 (01:02 +0000)]
MDL-37785 theme_base: remove duplicate .dir-rtl file-picker css rules from styke/core.css
Sam Hemelryk [Wed, 30 Jan 2013 23:16:08 +0000 (12:16 +1300)]
MDL-36363 cache: added unit tests for muliple loaders
Dan Marsden [Wed, 30 Jan 2013 21:45:11 +0000 (10:45 +1300)]
MDL-34231 SCORM: calculate correct number of attemptsleft when entering an attempt.
Petr Škoda [Wed, 30 Jan 2013 21:30:28 +0000 (22:30 +0100)]
MDL-37780 hack around some unicode date formatting issues on Windows
Petr Škoda [Wed, 30 Jan 2013 20:23:29 +0000 (21:23 +0100)]
MDL-37780 make sure there are no windows line endings in test files
Sam Hemelryk [Wed, 30 Jan 2013 20:10:57 +0000 (09:10 +1300)]
MDL-36363 cache: fixed issue with double parsing keys for stacked loaders
Petr Škoda [Wed, 30 Jan 2013 19:28:06 +0000 (20:28 +0100)]
MDL-37780 fix 1.9 restore on windows
Eloy Lafuente (stronk7) [Wed, 30 Jan 2013 09:27:11 +0000 (10:27 +0100)]
Merge branch 'wip-MDL-37644-m25' of git://github.com/samhemelryk/moodle
Dan Poltawski [Wed, 30 Jan 2013 01:18:57 +0000 (09:18 +0800)]
Merge branch 'w04_MDL-37726_m25_prevnext_int' of git://github.com/skodak/moodle
Frederic Massart [Wed, 30 Jan 2013 00:59:11 +0000 (08:59 +0800)]
MDL-25853 calendar: Fixed broken previous/next links
Eloy Lafuente (stronk7) [Wed, 30 Jan 2013 00:11:20 +0000 (01:11 +0100)]
Merge branch 'w04_MDL-37734_m25_marshack' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Tue, 29 Jan 2013 23:51:01 +0000 (00:51 +0100)]
Merge branch 'w04_MDL-37767_m25_pgsocket' of git://github.com/skodak/moodle
Petr Škoda [Tue, 29 Jan 2013 23:40:03 +0000 (00:40 +0100)]
MDL-37767 allow empty host in enrol_database which is required for default pg socket
Eloy Lafuente (stronk7) [Tue, 29 Jan 2013 23:28:35 +0000 (00:28 +0100)]
MDL-32420 anomaly theme: bump version
Eloy Lafuente (stronk7) [Tue, 29 Jan 2013 22:38:43 +0000 (23:38 +0100)]
Merge branch 'wip-MDL-32420_master' of git://github.com/lazydaisy/moodle
Eloy Lafuente (stronk7) [Tue, 29 Jan 2013 22:33:22 +0000 (23:33 +0100)]
Merge branch 'MDL-37526-m' of git://github.com/andrewnicols/moodle
Petr Škoda [Sun, 27 Jan 2013 11:37:30 +0000 (12:37 +0100)]
MDL-37726 remove PREVIOUS/NEXT from all install.xml files
YAY!
Petr Škoda [Sun, 27 Jan 2013 11:19:29 +0000 (12:19 +0100)]
MDL-37726 stop using PREVIOUS/NEXT in install.xml files
Sam Hemelryk [Tue, 29 Jan 2013 21:28:34 +0000 (10:28 +1300)]
MDL-37474 cache: fixed bug with definition cleaning
Eloy Lafuente (stronk7) [Tue, 29 Jan 2013 18:19:29 +0000 (19:19 +0100)]
Merge branch 'MDL-37465' of git://github.com/colchambers/moodle
Eloy Lafuente (stronk7) [Tue, 29 Jan 2013 14:35:05 +0000 (15:35 +0100)]
Merge branch 'MDL-37533-master' of git://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Tue, 29 Jan 2013 14:24:59 +0000 (15:24 +0100)]
MDL-37101 donot use donot.
Eloy Lafuente (stronk7) [Tue, 29 Jan 2013 14:19:11 +0000 (15:19 +0100)]
Merge branch 'MDL-37101-master' of git://github.com/ankitagarwal/moodle
Conflicts:
calendar/tests/externallib_tests.php
Eloy Lafuente (stronk7) [Tue, 29 Jan 2013 11:06:33 +0000 (12:06 +0100)]
Merge branch 'wip-MDL-36363-m25' of https://github.com/samhemelryk/moodle
David Monllao [Fri, 25 Jan 2013 07:48:35 +0000 (15:48 +0800)]
MDL-37662 behat: Add blocks definition
David Monllao [Fri, 25 Jan 2013 08:00:14 +0000 (16:00 +0800)]
MDL-37661 behat: Test to add activities to courses