Dan Poltawski [Mon, 14 Oct 2013 04:11:23 +0000 (12:11 +0800)]
Merge branch 'MDL-41672-text-mail-links' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Mon, 14 Oct 2013 04:07:54 +0000 (12:07 +0800)]
Merge branch 'MDL-42167-workshop-update-record' of git://github.com/mudrd8mz/moodle
Eloy Lafuente (stronk7) [Sun, 13 Oct 2013 22:13:26 +0000 (00:13 +0200)]
Merge branch 'wip-mdl-41843' of git://github.com/rajeshtaneja/moodle
Eloy Lafuente (stronk7) [Sun, 13 Oct 2013 21:32:30 +0000 (23:32 +0200)]
Merge branch 'MDL-37181_master' of https://github.com/markn86/moodle
Eloy Lafuente (stronk7) [Sun, 13 Oct 2013 21:19:18 +0000 (23:19 +0200)]
Merge branch 'w42_MDL-42243_m26_filtersettings' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Oct 2013 21:09:53 +0000 (23:09 +0200)]
Merge branch 'w42_MDL-42292_m26_blockversion' of https://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Sun, 13 Oct 2013 16:30:49 +0000 (18:30 +0200)]
Merge branch 'w42_MDL-41935_m26_timediff' of https://github.com/skodak/moodle
Petr Škoda [Thu, 10 Oct 2013 14:30:54 +0000 (16:30 +0200)]
MDL-41935 attempt to work around random time comparison test failures
Petr Škoda [Thu, 10 Oct 2013 07:09:17 +0000 (09:09 +0200)]
MDL-42243 fix filter settings regression and support standard settings.php
Petr Škoda [Fri, 11 Oct 2013 07:53:12 +0000 (09:53 +0200)]
MDL-42292 fix blockversion reading after migration to config table
Eloy Lafuente (stronk7) [Fri, 11 Oct 2013 11:20:42 +0000 (13:20 +0200)]
weekly release 2.6dev
Eloy Lafuente (stronk7) [Fri, 11 Oct 2013 11:20:42 +0000 (13:20 +0200)]
NOBUG: Fixed file access permissions
Damyon Wiese [Fri, 11 Oct 2013 08:33:17 +0000 (16:33 +0800)]
Merge branch 'MDL-41792_intmaster' of https://github.com/markn86/moodle
Mark Nelson [Wed, 9 Oct 2013 08:39:53 +0000 (16:39 +0800)]
MDL-41792 core_calendar: fixed issues when using multiple calendar types
1) No longer assume that the end of the current month in Gregorian will be
the end of the month for the calendar type being used.
2) Need to take into account the hours and minutes a calendar type may vary
in order to generate timestamps.
3) When generating the previous and next month links start at the beginning
of the month, not the current day.
4) Need to convert to Gregorian when creating timestamps during calendar
exports.
Damyon Wiese [Fri, 11 Oct 2013 08:06:40 +0000 (16:06 +0800)]
MDL-31830 category management: Fix coding_error when moving 0 courses
Marina Glancy [Fri, 11 Oct 2013 02:32:14 +0000 (13:32 +1100)]
Merge branch 'wip-MDL-42238-master' of git://github.com/abgreeve/moodle
Sam Hemelryk [Thu, 10 Oct 2013 20:34:06 +0000 (09:34 +1300)]
MDL-42072 badges: fixed cookie use
Eloy Lafuente (stronk7) [Thu, 10 Oct 2013 23:33:21 +0000 (01:33 +0200)]
Merge branch 'MDL-41604-master-5' of git://github.com/mouneyrac/moodle
Eloy Lafuente (stronk7) [Thu, 10 Oct 2013 22:47:30 +0000 (00:47 +0200)]
Merge branch 'w41_MDL-41953_m26_componentnumbers' of https://github.com/skodak/moodle
Petr Škoda [Thu, 10 Oct 2013 22:09:04 +0000 (00:09 +0200)]
MDL-41953 add more tests for invalid plugin names
Petr Škoda [Fri, 4 Oct 2013 13:56:37 +0000 (15:56 +0200)]
MDL-41953 allow plugin names to end with multiple digits
David Monllao [Thu, 10 Oct 2013 10:33:27 +0000 (18:33 +0800)]
MDL-42013 behat: Uncommenting @core_files test
David Monllao [Thu, 10 Oct 2013 06:22:51 +0000 (14:22 +0800)]
MDL-42013 behat: I should (not)? see checking visibility
Only for non-Javascript tests. If the step
is named I should/should not see whatever
is makes sense that has to be visible.
Matteo Scaramuccia [Sun, 6 Oct 2013 12:13:31 +0000 (14:13 +0200)]
MDL-42167 Update workshop assessment record only when really changed
Under certain conditions there is nothing to actually update here. The
$DB->update_record() would throw an exception here.
Adrian Greeve [Thu, 10 Oct 2013 06:06:33 +0000 (14:06 +0800)]
MDL-42238 - mod_quiz: Slight change to the logic to fix Alt. name messages.
Adrian Greeve [Thu, 10 Oct 2013 06:05:53 +0000 (14:05 +0800)]
MDL-42238 - Groups: Alternate name sql update to groups_get_potential_members().
Damyon Wiese [Thu, 10 Oct 2013 06:04:47 +0000 (14:04 +0800)]
Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle
Adrian Greeve [Thu, 10 Oct 2013 05:18:11 +0000 (13:18 +0800)]
MDL-42238 - mod_wiki: Alternate name sql update to wiki_print_recent_activity
Adrian Greeve [Thu, 10 Oct 2013 04:37:54 +0000 (12:37 +0800)]
MDL-42238 - mod_forum: Alternate name sql update to forum_print_recent_activity.
Jason Fowler [Thu, 10 Oct 2013 05:47:10 +0000 (13:47 +0800)]
MDL-42091 Atto - fixing on click indication
Damyon Wiese [Thu, 10 Oct 2013 04:05:49 +0000 (12:05 +0800)]
MDL-41838 Backup: Fix undefined variable
Nice spotting Ankit!
Damyon Wiese [Thu, 10 Oct 2013 03:25:51 +0000 (11:25 +0800)]
MDL-42039 Backup: Fix whitespace
Damyon Wiese [Thu, 10 Oct 2013 03:11:12 +0000 (11:11 +0800)]
Merge branch 'MDL-42039-master' of git://github.com/sammarshallou/moodle.git
Sam Hemelryk [Thu, 10 Oct 2013 03:06:40 +0000 (16:06 +1300)]
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
sam marshall [Thu, 3 Oct 2013 16:50:47 +0000 (17:50 +0100)]
MDL-42039 Restore: Add progress tracking while creating question files
If a backup contains a large number of questions, the
create_question_files function can take a very long time. This
change adds progress reporting during that function.
sam marshall [Tue, 1 Oct 2013 17:01:31 +0000 (18:01 +0100)]
MDL-42039 Restore: Add progress tracking while creating users
When restoring a backup that contains a large number of users
to a different server where those users don't already exist,
creating users can take a significant time. This change adds
progress reporting so that it doesn't time out and shows
activity in the user interface while doing the creation.
sam marshall [Tue, 1 Oct 2013 12:46:28 +0000 (13:46 +0100)]
MDL-42039 Restore: Add progress tracking in restore controller load
In the case of a very large backup with many activities, simply loading
the restore controller (specifically, building the plan) can take a long
time and cause timeouts. This change adds progress reporting while the
restore controller is being loaded.
(This also reduces the time between first going to the page, and the
progress bar appearing, making a slightly better user experience.)
Conflicts:
backup/restore.php
sam marshall [Tue, 1 Oct 2013 12:14:04 +0000 (13:14 +0100)]
MDL-42039 Restore: Avoid unnecessary archive file copy at start
Change the start of restore process so that the archive file can
be passed as a pathnamehash pointing to the Moodle file object,
rather than only as a filename in the temporary directory. This
avoids making an unnecessary copy of the archive file, which can
take a long time (and potentially cause a timeout) in the case
of multi-gigabyte backups.
sam marshall [Mon, 30 Sep 2013 12:06:42 +0000 (13:06 +0100)]
MDL-42039 Restore: Add progress reporting to directory deletion
Deleting directories at the end of backup can take a long time if
there are many directories (potentially up to 65536 file
directories). This change reports progress while deleting
directories to avoid timeout.
sam marshall [Mon, 30 Sep 2013 10:31:21 +0000 (11:31 +0100)]
MDL-42039 Restore: Add progress reporting between files in resource
When a resource contains a very large number of (presumably small)
files, we should display progress between each file so that it
doesn't time out.
Eric Merrill [Thu, 10 Oct 2013 02:56:29 +0000 (22:56 -0400)]
MDL-41940 files Additional behat cleanup
Fixing components and Given/When/Then styling.
sam marshall [Fri, 27 Sep 2013 17:16:21 +0000 (18:16 +0100)]
MDL-42039 Restore: Prevent adding too many form fields at once
This change relates to the Moodle forms used to select activities
in the restore process.
If you add too many form fields at once, it takes a very long time
during which we can't report progress. But adding fields in smaller
groups takes longer overall, so it's a tough balance. This change
splits the adds into groups of 1,000, reporting progress between each.
Damyon Wiese [Thu, 10 Oct 2013 02:49:11 +0000 (10:49 +0800)]
Merge branch 'MDL-41838-master' of git://github.com/sammarshallou/moodle
Conflicts:
lib/upgrade.txt
Dan Poltawski [Thu, 10 Oct 2013 02:31:44 +0000 (10:31 +0800)]
Merge branch 'MDL-41379_outcomes' of https://github.com/andyjdavis/moodle
Conflicts:
theme/bootstrapbase/style/moodle.css
Marina Glancy [Thu, 10 Oct 2013 01:52:28 +0000 (12:52 +1100)]
Merge branch 'MDL-37153_master' of https://github.com/pauln/moodle
Sam Hemelryk [Thu, 10 Oct 2013 01:40:02 +0000 (14:40 +1300)]
Merge branch 'wip-mdl-41744' of https://github.com/rajeshtaneja/moodle
Damyon Wiese [Thu, 10 Oct 2013 01:31:33 +0000 (09:31 +0800)]
Merge branch 'MDL-38196-master' of git://github.com/sammarshallou/moodle
Conflicts:
backup/backup.php
theme/bootstrapbase/style/moodle.css
Damyon Wiese [Thu, 10 Oct 2013 01:11:25 +0000 (09:11 +0800)]
Merge branch 'MDL-42091-master' of git://github.com/phalacee/moodle
Jason Fowler [Thu, 3 Oct 2013 06:34:22 +0000 (14:34 +0800)]
MDL-42091 atto - fixing on hover and active states of buttons
Marina Glancy [Thu, 10 Oct 2013 00:23:06 +0000 (11:23 +1100)]
Merge branch 'wip-mdl-38155' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Thu, 10 Oct 2013 00:18:28 +0000 (08:18 +0800)]
Merge branch 'wip-MDL-42020-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 10 Oct 2013 00:12:35 +0000 (11:12 +1100)]
Merge branch 'MDL-42143-master' of git://github.com/danpoltawski/moodle
Marina Glancy [Fri, 27 Sep 2013 05:49:24 +0000 (15:49 +1000)]
MDL-42020 course: performance improvement in course listings
- better performance when get_course_count() OR search_course_count() are called by themselves
- better performance in displaying course contacts
Dan Poltawski [Wed, 9 Oct 2013 23:20:18 +0000 (07:20 +0800)]
Merge branch '42057-26' of git://github.com/samhemelryk/moodle
Marina Glancy [Wed, 9 Oct 2013 22:36:30 +0000 (09:36 +1100)]
Merge branch 'MDL-41993-master-fix1' of git://github.com/damyon/moodle
Sam Hemelryk [Wed, 9 Oct 2013 19:37:03 +0000 (08:37 +1300)]
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
Sam Hemelryk [Wed, 9 Oct 2013 19:34:11 +0000 (08:34 +1300)]
Merge branch 'MDL-32188' of git://github.com/timhunt/moodle
Alain Corbière [Wed, 9 Oct 2013 13:40:38 +0000 (15:40 +0200)]
MDL-41672 Fix html2text processing of multiple occurrences of the same URL
David Mudrák [Wed, 9 Oct 2013 13:38:21 +0000 (15:38 +0200)]
MDL-41672 Add html2text unit test for multiple occurrences of the same URL
Eric Merrill [Wed, 9 Oct 2013 11:45:01 +0000 (07:45 -0400)]
MDL-41940 files Fixes for behat tests
Commented out second test pending MDL-42013 visibiliy checking.
Dan Poltawski [Wed, 9 Oct 2013 10:16:56 +0000 (18:16 +0800)]
Merge branch 'w41_MDL-42054_m26_phpmailertesting_i' of https://github.com/skodak/moodle
Petr Škoda [Sun, 29 Sep 2013 21:28:50 +0000 (23:28 +0200)]
MDL-42054 fix incorrect email redirection in unit tests
Dan Poltawski [Wed, 9 Oct 2013 09:23:44 +0000 (17:23 +0800)]
Merge branch 'wip-mdl-42222' of git://github.com/rajeshtaneja/moodle
Jerome Mouneyrac [Wed, 9 Oct 2013 08:58:37 +0000 (16:58 +0800)]
MDL-41604 Moodle should also fallback to the default theme when a parent theme is invalid.
Dan Poltawski [Wed, 9 Oct 2013 09:01:10 +0000 (17:01 +0800)]
Merge branch 'MDL-40493-master-fix1' of git://github.com/damyon/moodle
Dan Poltawski [Wed, 9 Oct 2013 08:54:02 +0000 (16:54 +0800)]
Merge branch 'MDL-39776-master' of git://github.com/phalacee/moodle
Rajesh Taneja [Wed, 9 Oct 2013 08:37:01 +0000 (16:37 +0800)]
MDL-42222 Assignment: Added type check before checking mimetype
Online submission type pass string in files, so added check
to see if file is of type stored_file then check mimetype
Damyon Wiese [Wed, 9 Oct 2013 08:53:21 +0000 (16:53 +0800)]
MDL-40493 Question: Explain why setAdminUser is needed for tests
Dan Poltawski [Wed, 9 Oct 2013 08:46:56 +0000 (16:46 +0800)]
Merge branch 'm26_MDL-40226_Add_JNLP_MIME_Type_Support' of https://github.com/scara/moodle
Conflicts:
lib/db/upgrade.php
version.php
Dan Poltawski [Wed, 9 Oct 2013 08:28:53 +0000 (16:28 +0800)]
Merge branch 'MDL-41986-master' of git://github.com/andrewnicols/moodle
Dan Poltawski [Wed, 9 Oct 2013 08:27:50 +0000 (16:27 +0800)]
Merge branch 'MDL-41985-master' of git://github.com/andrewnicols/moodle
Tim Hunt [Wed, 9 Oct 2013 08:14:24 +0000 (09:14 +0100)]
MDL-32188 fix type in question/engine/upgrade.txt
Damyon Wiese [Wed, 9 Oct 2013 06:42:23 +0000 (14:42 +0800)]
Merge branch 'w41_MDL-42047_m26_cohortdel' of https://github.com/skodak/moodle
Mark Nelson [Mon, 7 Oct 2013 09:25:44 +0000 (17:25 +0800)]
MDL-37181 backup: stopped setting the status of unscheduled backups to skipped
Damyon Wiese [Wed, 9 Oct 2013 05:30:40 +0000 (13:30 +0800)]
Merge branch 'MDL-41659_master' of https://github.com/totara/openbadges
Damyon Wiese [Wed, 9 Oct 2013 04:46:14 +0000 (12:46 +0800)]
Merge branch 'wip-MDL-41967-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 9 Oct 2013 04:09:10 +0000 (12:09 +0800)]
Merge branch 'wip-MDL-40844-master' of git://github.com/abgreeve/moodle
Damyon Wiese [Wed, 9 Oct 2013 04:03:54 +0000 (12:03 +0800)]
Merge branch 'MDL-41347-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 9 Oct 2013 03:48:14 +0000 (11:48 +0800)]
Merge branch 'wip-MDL-42098-master' of git://github.com/abgreeve/moodle
Jason Fowler [Tue, 24 Sep 2013 06:55:40 +0000 (14:55 +0800)]
MDL-39776 Javascript - enable formautosubmit from a select box on android
Sam Hemelryk [Wed, 9 Oct 2013 03:25:22 +0000 (16:25 +1300)]
Merge branch 'MDL-40046-master' of git://github.com/ankitagarwal/moodle
Ankit Agarwal [Wed, 9 Oct 2013 03:20:32 +0000 (11:20 +0800)]
MDL-40046 events: Use correct variable for page instance id
Dan Poltawski [Wed, 9 Oct 2013 03:16:34 +0000 (11:16 +0800)]
Merge branch 'MDL-41230-master' of git://github.com/FMCorz/moodle
Damyon Wiese [Wed, 9 Oct 2013 03:08:06 +0000 (11:08 +0800)]
MDL-41993 Atto: Always clean/update the textarea when the content is changed
Sam Hemelryk [Wed, 9 Oct 2013 02:57:30 +0000 (15:57 +1300)]
Merge branch 'wip-MDL-42016-master' of git://github.com/marinaglancy/moodle
Conflicts:
lib/db/install.xml
lib/db/upgrade.php
version.php
Paul Nicholls [Mon, 9 Sep 2013 02:37:53 +0000 (14:37 +1200)]
MDL-37153 - assign: Obey grade display settings in submission status
The assignment submission status screen was ignoring the grade item's
display setting, showing scores even if it's set to display letters only.
Dan Poltawski [Wed, 9 Oct 2013 02:54:24 +0000 (10:54 +0800)]
Merge branch 'wip-MDL-42089-master' of git://github.com/abgreeve/moodle
Dan Poltawski [Wed, 9 Oct 2013 02:27:07 +0000 (10:27 +0800)]
Merge branch 'mdl41908-master' of https://github.com/tlock/moodle
Damyon Wiese [Wed, 9 Oct 2013 01:39:09 +0000 (09:39 +0800)]
Merge branch 'MDL-29663_alt' of https://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 23:48:45 +0000 (01:48 +0200)]
Merge branch 'MDL-42026-master' of git://github.com/damyon/moodle
Conflicts:
lib/editor/atto/yui/build/moodle-editor_atto-editor/moodle-editor_atto-editor-min.js
Sam Hemelryk [Tue, 8 Oct 2013 23:41:36 +0000 (12:41 +1300)]
Merge branch 'MDL-41940' of https://github.com/merrill-oakland/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 23:29:17 +0000 (01:29 +0200)]
Merge branch 'MDL-41761-master' of git://github.com/jamiepratt/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 23:26:52 +0000 (01:26 +0200)]
Merge branch 'wip-MDL-42068-m26-showshortnamefilepicker' of git://github.com/henesnarfel/moodle
Petr Škoda [Tue, 8 Oct 2013 21:21:34 +0000 (23:21 +0200)]
MDL-40493 question: set real $USER before testing question walktrough
Petr Škoda [Tue, 8 Oct 2013 21:08:27 +0000 (23:08 +0200)]
MDL-41792 fix calendar test typos
Sam Hemelryk [Tue, 8 Oct 2013 20:23:53 +0000 (09:23 +1300)]
Merge branch 'w41_MDL-16073_m26_extdbtest_i' of https://github.com/skodak/moodle
Sam Hemelryk [Tue, 8 Oct 2013 19:54:46 +0000 (08:54 +1300)]
Merge branch 'MDL-41956_master' of https://github.com/totara/openbadges
Petr Škoda [Mon, 30 Sep 2013 20:39:21 +0000 (22:39 +0200)]
MDL-16073 add test for connection to external database for authentication and enrolments
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 19:25:46 +0000 (21:25 +0200)]
Merge branch 'MDL-42069' of https://github.com/appalachianstate/moodle
Eloy Lafuente (stronk7) [Tue, 8 Oct 2013 19:23:56 +0000 (21:23 +0200)]
Merge branch 'wip-MDL-42141-master' of git://github.com/marinaglancy/moodle