Dan Poltawski [Fri, 12 Apr 2013 03:08:28 +0000 (11:08 +0800)]
Merge branch 'MDL-39054' of git://github.com/jacks92/moodle
Dan Poltawski [Fri, 12 Apr 2013 02:45:00 +0000 (10:45 +0800)]
Merge branch 'MDL-39011_master' of github.com:totara/openbadges
Dan Poltawski [Fri, 12 Apr 2013 02:30:10 +0000 (10:30 +0800)]
Merge branch 'MDL-39049_master' of github.com:totara/openbadges
Dan Poltawski [Fri, 12 Apr 2013 02:26:05 +0000 (10:26 +0800)]
Merge branch 'MDL-37537' of git://github.com/srynot4sale/moodle
Dan Poltawski [Fri, 12 Apr 2013 02:08:45 +0000 (10:08 +0800)]
Merge branch 'MDL-38637-master' of github.com:StudiUM/moodle
Dan Poltawski [Fri, 12 Apr 2013 01:59:49 +0000 (09:59 +0800)]
Merge branch 'integration_MDL-38997' of github.com:totara/moodle
Jean-Philippe Gaudreau [Thu, 11 Apr 2013 13:02:37 +0000 (09:02 -0400)]
MDL-38637 CAS Authentication: Undefined index: QUERY_STRING when executing cron
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:44:47 +0000 (16:44 +0200)]
Merge branch 'MDL-38828_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:32:32 +0000 (16:32 +0200)]
Merge branch 'MDL-38961_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:30:08 +0000 (16:30 +0200)]
Merge branch 'MDL-38963_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 14:11:40 +0000 (16:11 +0200)]
Merge branch 'MDL-38940_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 13:56:45 +0000 (15:56 +0200)]
Merge branch 'MDL-38957_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 13:52:53 +0000 (15:52 +0200)]
Merge branch 'MDL-38958_master' of git://github.com/dmonllao/moodle
Jayesh Anandani [Wed, 10 Apr 2013 19:44:32 +0000 (01:14 +0530)]
MDL-39054 quiz statistics: move hard-coded text to lang file
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 10:38:46 +0000 (12:38 +0200)]
on demand release 2.5beta+
Eloy Lafuente (stronk7) [Thu, 11 Apr 2013 10:32:32 +0000 (12:32 +0200)]
Merge branch 'install_master' of git://git.moodle.cz/moodle-install
David Monllao [Thu, 11 Apr 2013 07:58:56 +0000 (15:58 +0800)]
MDL-38961 behat: New test
According to MDLQA-110, edited wiki
pages may be previewed before saving.
David Monllao [Thu, 11 Apr 2013 07:41:47 +0000 (15:41 +0800)]
MDL-38963 behat: New test
According to MDLQA-113, a teacher can
set a wiki to be collaborative or
individual.
David Monllao [Thu, 11 Apr 2013 02:47:10 +0000 (10:47 +0800)]
MDL-38940 behat: New test
According to MDLQA-32, glossary entries
can be searched or browsed by alphabet,
category, date or author.
David Monllao [Thu, 11 Apr 2013 06:35:32 +0000 (14:35 +0800)]
MDL-38957 behat: New test
According to MDLQA-94, a teacher can
sort questions in the question bank.
David Monllao [Thu, 11 Apr 2013 03:44:48 +0000 (11:44 +0800)]
MDL-38958 behat: New test
According to MDLQA-91, a teacher can
edit questions in the question bank.
Dan Poltawski [Thu, 11 Apr 2013 08:52:25 +0000 (16:52 +0800)]
Revert "MDL-38254 Assignment Module: add avaialble message to all assignment types"
This reverts commit
2612e21bd4450bf94b7e5ac259e2d0b0b3bbcf7b.
David Monllao [Thu, 11 Apr 2013 05:34:22 +0000 (13:34 +0800)]
MDL-38958 behat: Step definitions to interact with popup windows
David Monllao [Thu, 11 Apr 2013 03:44:16 +0000 (11:44 +0800)]
MDL-38958 behat: Step definition to add questions
David Monllao [Thu, 11 Apr 2013 02:46:11 +0000 (10:46 +0800)]
MDL-38940 behat: Step definition to create glossary categories
Dan Poltawski [Thu, 11 Apr 2013 02:19:10 +0000 (10:19 +0800)]
Merge branch 'm25_MDL-39061_Trivial_incorrect_MD' of https://github.com/scara/moodle
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 22:56:45 +0000 (00:56 +0200)]
Merge branch 'MDL-38525-master' of https://github.com/damyon/moodle
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 22:43:59 +0000 (00:43 +0200)]
Merge branch 'MDL-38937_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 22:32:40 +0000 (00:32 +0200)]
Merge branch 'MDL-38939_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 22:22:42 +0000 (00:22 +0200)]
Merge branch 'MDL-38970_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Wed, 10 Apr 2013 13:45:16 +0000 (15:45 +0200)]
Merge branch 'w15_MDL-38989_m25_ttfinal' of git://github.com/skodak/moodle
David Monllao [Tue, 9 Apr 2013 03:56:18 +0000 (11:56 +0800)]
MDL-38970 behat: New test
According to MDLQA-65, a teacher can
prevent or allow assignment submission
changes.
David Monllao [Wed, 10 Apr 2013 08:51:35 +0000 (16:51 +0800)]
MDL-38939 behat: New test
According to MDLQA-33, a teacher can set
whether glossary entries are always editable.
David Monllao [Wed, 10 Apr 2013 08:50:52 +0000 (16:50 +0800)]
MDL-38939 behat: Allow admin setting to be set in non-JS sessions
David Monllao [Wed, 10 Apr 2013 08:44:35 +0000 (16:44 +0800)]
MDL-38937 behat: New test
According to MDLQA-39, a teacher can
choose whether to provide a printer-friendly
glossary entries list
Damyon Wiese [Wed, 10 Apr 2013 08:09:56 +0000 (16:09 +0800)]
MDL-38525: Assignment upgrade - Error with comments for unenrolled students.
Students with comments on 'upload' assignments cause errors for the upgrade
tool if they are no longer enrolled. The solution is to allow siteadmin to
see student submissions even if the student is not currently enrolled (you
must be siteadmin to run the upgrade tool).
Petr Škoda [Wed, 10 Apr 2013 07:49:19 +0000 (09:49 +0200)]
MDL-38989 add missing test timeout reset
Petr Škoda [Wed, 10 Apr 2013 07:43:47 +0000 (09:43 +0200)]
MDL-38989 detect changed timeout in tests
The trouble is that PHPUnit should ideally test mostly low level libraries that should not change the timeouts.
Dan Poltawski [Wed, 10 Apr 2013 06:48:49 +0000 (14:48 +0800)]
Merge branch 'MDL-38973-master' of https://github.com/damyon/moodle
Ryan Panning [Wed, 10 Apr 2013 06:38:05 +0000 (14:38 +0800)]
MDL-38525: Assignment - print exception message when assignment upgrade fails.
Change to use getMessage() from the Exception class will prevent "{$a}" when
$e->error is null.
Dan Poltawski [Wed, 10 Apr 2013 06:10:37 +0000 (14:10 +0800)]
Merge branch 'MDL-19072' of git://github.com/jmvedrine/moodle
Damyon Wiese [Wed, 10 Apr 2013 05:44:42 +0000 (13:44 +0800)]
MDL-38973 Assignment - Attempt history not displaying for blind marking
This change makes the attempt history display for teachers and students
even when there is no grade (e.g. blind marking). It also will show the previous
attempt in the grading table when a submission has been newly reopened (instead
of a blank submission).
Mark Nelson [Wed, 10 Apr 2013 03:18:17 +0000 (11:18 +0800)]
MDL-26649 forms: ensure that both necessary variables are set before altering calendar image
Dan Poltawski [Wed, 10 Apr 2013 04:16:23 +0000 (12:16 +0800)]
Merge branch 'wip-mdl-35883' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 10 Apr 2013 04:08:46 +0000 (12:08 +0800)]
Merge branch 'MDL-38254' of git://github.com/rwijaya/moodle
Dan Poltawski [Wed, 10 Apr 2013 03:57:49 +0000 (11:57 +0800)]
Merge branch 'MDL-39041-master' of git://github.com/damyon/moodle
Damyon Wiese [Wed, 10 Apr 2013 03:30:41 +0000 (11:30 +0800)]
MDL-39041 Assignment - Fix regression in "allow submission changes".
A typo was introduced in the assignment attempt history feature that broke
unlock submissions. This was detected by the new behat test in MDL-38970 (yay).
Damyon Wiese [Wed, 10 Apr 2013 03:17:31 +0000 (11:17 +0800)]
Merge branch 'MDL-38935' of git://github.com/timhunt/moodle
Dan Poltawski [Wed, 10 Apr 2013 03:11:47 +0000 (11:11 +0800)]
Merge branch 'MDL-38030-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Wed, 10 Apr 2013 03:09:05 +0000 (11:09 +0800)]
Merge branch 'MDL-38933-master' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:58:32 +0000 (10:58 +0800)]
Merge branch 'MDL-22153' of git://github.com/stronk7/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:55:45 +0000 (10:55 +0800)]
Merge branch 'MDL-39059-workshop-settype' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:37:29 +0000 (10:37 +0800)]
Merge branch 'MDL-37410-master' of git://github.com/mouneyrac/moodle
Dan Poltawski [Wed, 10 Apr 2013 02:35:40 +0000 (10:35 +0800)]
Merge branch 'MDL-38999' of git://github.com/stronk7/moodle
Yuliya Bozhko [Tue, 9 Apr 2013 23:00:08 +0000 (11:00 +1200)]
Fix error when awarding a badge from recipients page
Petr Škoda [Tue, 9 Apr 2013 21:48:59 +0000 (23:48 +0200)]
MDL-38912 fix incorrect timeout reset
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:43:46 +0000 (23:43 +0200)]
Merge branch 'MDL-38938_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:42:59 +0000 (23:42 +0200)]
Merge branch 'MDL-38950_master' of git://github.com/dmonllao/moodle
Matteo Scaramuccia [Tue, 9 Apr 2013 21:40:18 +0000 (23:40 +0200)]
MDL-39061 Cache: (trivial) incorrect MD sublisting
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:30:43 +0000 (23:30 +0200)]
Merge branch 'MDL-38954_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:30:30 +0000 (23:30 +0200)]
Merge branch 'MDL-38952_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:29:59 +0000 (23:29 +0200)]
Merge branch 'MDL-38953_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:13:44 +0000 (23:13 +0200)]
Merge branch 'MDL-38942_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:13:32 +0000 (23:13 +0200)]
Merge branch 'MDL-38969_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 21:13:21 +0000 (23:13 +0200)]
Merge branch 'MDL-38967_master' of git://github.com/dmonllao/moodle
David Mudrák [Tue, 9 Apr 2013 19:46:18 +0000 (21:46 +0200)]
MDL-39059 Set explicit boolean type of a hidden field in workshop random allocator form
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 18:24:17 +0000 (20:24 +0200)]
Merge branch 'MDL-38945_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 18:23:38 +0000 (20:23 +0200)]
Merge branch 'MDL-38944_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 18:22:59 +0000 (20:22 +0200)]
Merge branch 'MDL-38943_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 18:00:34 +0000 (20:00 +0200)]
Merge branch 'MDL-38822_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 17:59:45 +0000 (19:59 +0200)]
Merge branch 'MDL-38820_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 17:55:29 +0000 (19:55 +0200)]
Merge branch 'MDL-39012_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 17:40:39 +0000 (19:40 +0200)]
Merge branch 'MDL-38965_master' of git://github.com/dmonllao/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 17:37:08 +0000 (19:37 +0200)]
MDL-26649 forms: temp disable problematic call
The new version of the dateselector is causing JS to stop
working completely in a lot of forms, so I've disabled
temporarily the ofending call to allow other stuff to be
integrated and tested.
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 15:36:57 +0000 (17:36 +0200)]
Merge branch 'MDL-39056-download-api-version' of git://github.com/mudrd8mz/moodle
David Mudrák [Tue, 9 Apr 2013 15:07:30 +0000 (17:07 +0200)]
MDL-39056 Use new version of API when fetching available updates info
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 12:33:31 +0000 (14:33 +0200)]
Merge branch 'MDL-38792' of https://github.com/ppichet/moodle
Eloy Lafuente (stronk7) [Tue, 9 Apr 2013 08:28:24 +0000 (10:28 +0200)]
MDL-38887 block nav: reshifter module
David Monllao [Tue, 9 Apr 2013 08:02:16 +0000 (16:02 +0800)]
MDL-38938 behat: New test
According to MDLQA-38, a teacher can
choose whether to allow duplicate
entries in a glossary.
David Monllao [Tue, 9 Apr 2013 08:01:43 +0000 (16:01 +0800)]
MDL-38938 behat: Step definition to add glossary entries
Dan Poltawski [Tue, 9 Apr 2013 07:39:57 +0000 (15:39 +0800)]
Merge branch 'wip-MDL-38442-m25' of git://github.com/samhemelryk/moodle
Damyon Wiese [Tue, 9 Apr 2013 07:13:21 +0000 (15:13 +0800)]
Merge branch 'MDL-26649_master' of https://github.com/markn86/moodle
David Monllao [Tue, 9 Apr 2013 07:02:11 +0000 (15:02 +0800)]
MDL-38950 behat: New tests
According to MDLQA-1765, a selected
file can be cancelled. Also adding
a test for repository_recent.
David Monllao [Tue, 9 Apr 2013 07:01:16 +0000 (15:01 +0800)]
MDL-38950 behat: Step definition to add files from recent files repo
David Monllao [Tue, 9 Apr 2013 06:59:31 +0000 (14:59 +0800)]
MDL-38950 behat: File manager elements contextual menu
Modified to work with both file manager elements
and file/folder elements inside modal windows.
Dan Poltawski [Tue, 9 Apr 2013 06:58:47 +0000 (14:58 +0800)]
Merge branch 'w14_MDL-38927_m25_rolelocalisation' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 9 Apr 2013 06:57:08 +0000 (14:57 +0800)]
Merge branch 'w14_MDL-39004_m25_roledocs' of git://github.com/skodak/moodle
Mark Nelson [Thu, 4 Apr 2013 07:33:16 +0000 (15:33 +0800)]
MDL-26649 forms: added a calendar icon that will display the calendar pop-up when clicked rather than the select boxes triggering the event
Dan Poltawski [Tue, 9 Apr 2013 06:49:07 +0000 (14:49 +0800)]
Merge branch 'wip-MDL-38682-master' of git://github.com/marinaglancy/moodle
Petr Škoda [Tue, 9 Apr 2013 06:31:25 +0000 (08:31 +0200)]
MDL-38927 use role->localname to get real role name
Aparup Banerjee [Tue, 9 Apr 2013 06:30:52 +0000 (14:30 +0800)]
Merge branch 'w14_MDL-38798_m25_php55' of git://github.com/skodak/moodle
Aparup Banerjee [Tue, 9 Apr 2013 06:21:22 +0000 (14:21 +0800)]
Merge branch 'wip-MDL-38887-m25' of git://github.com/marinaglancy/moodle
Marina Glancy [Tue, 9 Apr 2013 06:16:21 +0000 (16:16 +1000)]
MDL-38682 removed auto page type, created issue MDL-39045 to address this
Damyon Wiese [Tue, 9 Apr 2013 06:09:27 +0000 (14:09 +0800)]
MDL-31969 Grader report - bump version for capabilities and settings.
Damyon Wiese [Tue, 9 Apr 2013 06:09:14 +0000 (14:09 +0800)]
Merge branch 'wip-mdl-31969' of git://github.com/rajeshtaneja/moodle
Conflicts:
version.php
Rajesh Taneja [Wed, 27 Mar 2013 02:14:10 +0000 (10:14 +0800)]
MDL-31969 grades: Added user preference to show/hide/export suspended users.
User with course:viewsuspendedusers capability can now show/hide/export
enrolled users whose enrolment is suspended or enrolment time is expired.
Damyon Wiese [Tue, 9 Apr 2013 05:55:18 +0000 (13:55 +0800)]
MDL-35608 Completion status block - use html_writer::link
Just changing 2 calls from html_writer::tag to html_writer::link.
Damyon Wiese [Tue, 9 Apr 2013 05:59:45 +0000 (13:59 +0800)]
Merge branch 'wip-MDL-35608-master' of git://github.com/phalacee/moodle
Dan Poltawski [Tue, 9 Apr 2013 05:49:09 +0000 (13:49 +0800)]
Merge branch 'MDL-39005' of git://github.com/stronk7/moodle
Aparup Banerjee [Tue, 9 Apr 2013 05:27:56 +0000 (13:27 +0800)]
Merge branch 'MDL-38508-m' of git://github.com/andrewnicols/moodle
