Dan Poltawski [Thu, 3 May 2012 08:11:00 +0000 (16:11 +0800)]
Merge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/moodle
Dan Poltawski [Thu, 3 May 2012 08:10:16 +0000 (16:10 +0800)]
MDL-31270 mod_assign: fix another whitespace issue
Dan Poltawski [Thu, 3 May 2012 08:05:58 +0000 (16:05 +0800)]
MDL-31270: mod_assign fix whitespace issues
Petr Skoda [Thu, 3 May 2012 07:34:35 +0000 (09:34 +0200)]
MDL-32587 fix --buildcomponentconfigs compatibility with Windows
Damyon Wiese [Thu, 3 May 2012 06:44:06 +0000 (14:44 +0800)]
MDL-31270 mod_assign: introducing the assignment module
* Includes an assignment upgrade tool to convert from the old mod_assignment.
* Hides mod_assignment on new installs
Aparup Banerjee [Thu, 3 May 2012 03:33:55 +0000 (11:33 +0800)]
Merge branch 'wip-MDL-32416-master' of git://github.com/marinaglancy/moodle
Marina Glancy [Thu, 3 May 2012 03:30:08 +0000 (11:30 +0800)]
MDL-32416: Picasa repository now returns path, also fixed album title retrieval
Eloy Lafuente (stronk7) [Wed, 2 May 2012 22:38:57 +0000 (00:38 +0200)]
MDL-32234 Library: usergetdate tests moved to assertSame()
(to check both type and value)
Eloy Lafuente (stronk7) [Wed, 2 May 2012 22:35:34 +0000 (00:35 +0200)]
Merge branch 'wip-mdl-32234' of git://github.com/rajeshtaneja/moodle
Dan Poltawski [Wed, 2 May 2012 10:01:40 +0000 (18:01 +0800)]
Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle
David Mudrak [Thu, 26 Apr 2012 09:55:25 +0000 (11:55 +0200)]
MDL-32638 fixing the area names and file_browser::get_file_info() API call
These two bug made the file browsing non-working in workshop 2.x
Dan Poltawski [Wed, 2 May 2012 08:54:54 +0000 (16:54 +0800)]
Merge branch 'MDL-32657-master-2' of git://git.luns.net.uk/moodle
Ruslan Kabalin [Wed, 2 May 2012 08:42:06 +0000 (09:42 +0100)]
MDL-32657: Add format.js for topics format and remove default
Using topics format as default is not a great idea, as we can end up
half-working dragdrop for some formats. With the current soiution, drag-drop
will not work for format, unless required js functions have been created in
format.js
Tim Hunt [Wed, 2 May 2012 07:19:06 +0000 (08:19 +0100)]
MDL-32721 quiz: missing message provider lang string from MDL-3030
Aparup Banerjee [Wed, 2 May 2012 05:55:39 +0000 (13:55 +0800)]
Merge branch 'MDL-28657-master' of https://github.com/mackensen/moodle
Sam Hemelryk [Wed, 2 May 2012 05:52:13 +0000 (17:52 +1200)]
Merge branch 'MDL-31762' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Wed, 2 May 2012 05:44:35 +0000 (17:44 +1200)]
Merge branch 'MDL-26275_large_grader' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Wed, 2 May 2012 02:41:11 +0000 (14:41 +1200)]
Merge branch 'MDL-32657-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 1 May 2012 23:48:24 +0000 (11:48 +1200)]
Merge branch 'w18_MDL-26028_m23_xsendfile' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 1 May 2012 22:25:09 +0000 (10:25 +1200)]
Merge branch 'w18_MDL-32595_m23_unsignedandlob' of git://github.com/skodak/moodle
Juan Leyva [Wed, 18 Apr 2012 08:08:24 +0000 (10:08 +0200)]
MDL-13130 webservices: Implementation of core_course_delete_courses
Andrew Davis [Tue, 1 May 2012 03:43:09 +0000 (10:43 +0700)]
MDL-26275 grade: made some equality checks more strict and added some explanatory comments
Dan Poltawski [Tue, 1 May 2012 03:27:16 +0000 (11:27 +0800)]
Merge branch 'w18_MDL-30686_m23_guessurl' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 1 May 2012 03:16:20 +0000 (11:16 +0800)]
Merge branch 'MDL-27508-workshop-groups' of git://github.com/mudrd8mz/moodle
Dan Poltawski [Tue, 1 May 2012 02:59:06 +0000 (10:59 +0800)]
Merge branch 'MDL-30986-attempt2' of git://github.com/mouneyrac/moodle
Dan Poltawski [Tue, 1 May 2012 02:30:43 +0000 (10:30 +0800)]
Merge branch 'MDL-32181' of https://github.com/ppichet/moodle
Dan Poltawski [Tue, 1 May 2012 02:19:17 +0000 (10:19 +0800)]
Merge branch 'w18_MDL-19071_m23_unicode' of git://github.com/skodak/moodle
Dan Poltawski [Tue, 1 May 2012 02:00:01 +0000 (10:00 +0800)]
Merge branch 'w18_MDL-32586_m23_glibciconv' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 1 May 2012 01:43:07 +0000 (13:43 +1200)]
Merge branch 'MDL-32009-master-3' of git://git.luns.net.uk/moodle
Sam Hemelryk [Tue, 1 May 2012 01:41:37 +0000 (13:41 +1200)]
Merge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 1 May 2012 01:34:08 +0000 (13:34 +1200)]
Merge branch 'w18_MDL-32607_m23_upgrade2' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 1 May 2012 01:29:39 +0000 (13:29 +1200)]
Merge branch 'w18_MDL-32612_m23_debug' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 1 May 2012 01:26:53 +0000 (13:26 +1200)]
Merge branch 'w18_MDL-32640_m23_forumstrict' of git://github.com/skodak/moodle
Sam Hemelryk [Tue, 1 May 2012 01:17:33 +0000 (13:17 +1200)]
Merge branch 'MDL-28955_master' of git://github.com/lazydaisy/moodle
Sam Hemelryk [Tue, 1 May 2012 00:38:37 +0000 (12:38 +1200)]
MDL-32012 Fixed white space
Sam Hemelryk [Tue, 1 May 2012 00:37:59 +0000 (12:37 +1200)]
Merge branch 'MDL-32012' of git://github.com/merrill-oakland/moodle
Sam Hemelryk [Mon, 30 Apr 2012 20:23:52 +0000 (08:23 +1200)]
Merge branch 'MDL-29264_zindex' of git://github.com/andyjdavis/moodle
Petr Skoda [Mon, 30 Apr 2012 15:54:24 +0000 (17:54 +0200)]
MDL-26028 fix invalid separator constant and support root dirs in aliases
Credit goes to Loic Jeannin, thanks.
Petr Skoda [Mon, 30 Apr 2012 13:52:42 +0000 (15:52 +0200)]
MDL-26028 implement Nginx X-Sendfile directory aliases setting
Tim Hunt [Mon, 30 Apr 2012 12:46:02 +0000 (13:46 +0100)]
Improve the wording of overdue messages. Thanks Phil.
Ruslan Kabalin [Thu, 12 Apr 2012 10:03:11 +0000 (11:03 +0100)]
MDL-32009 messaging: Fix using message processor term inconsistency.
Ruslan Kabalin [Tue, 3 Apr 2012 13:48:54 +0000 (14:48 +0100)]
MDL-32009 messaging: Add message processor uninstall functionality
Ruslan Kabalin [Mon, 12 Mar 2012 15:02:16 +0000 (15:02 +0000)]
MDL-32009 messaging: Add is_enabled method to plugintype_message
Ruslan Kabalin [Fri, 9 Mar 2012 16:18:58 +0000 (16:18 +0000)]
MDL-32009 messaging: Refator get_settings_url plugintype method
No need to duplicate checks since we have them in one place.
Dan Poltawski [Mon, 30 Apr 2012 09:00:23 +0000 (17:00 +0800)]
Merge branch 'w18_MDL-32589_m23_proxytest' of git://github.com/skodak/moodle
Jerome Mouneyrac [Wed, 18 Jan 2012 02:52:25 +0000 (10:52 +0800)]
MDL-30986 external API, check and update DocBlock
Conflicts:
group/externallib.php
Petr Skoda [Mon, 30 Apr 2012 06:35:16 +0000 (08:35 +0200)]
MDL-32589 remove bogus webproxy whitelisting
Thanks Dan Poltawski!
Dan Poltawski [Mon, 30 Apr 2012 06:29:40 +0000 (14:29 +0800)]
Merge branch 'MDL-32357' of git://github.com/timhunt/moodle
Dan Poltawski [Mon, 30 Apr 2012 04:54:22 +0000 (12:54 +0800)]
Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle
Dan Poltawski [Mon, 30 Apr 2012 02:24:02 +0000 (10:24 +0800)]
MDL-3030 mod_quiz: fix training whitespace
Dan Poltawski [Mon, 30 Apr 2012 03:05:19 +0000 (11:05 +0800)]
Merge branch 'MDL-3030' of git://github.com/timhunt/moodle
Rajesh Taneja [Thu, 29 Mar 2012 07:38:28 +0000 (15:38 +0800)]
MDL-32234 Library: usergetdate return different values when timezone is set
usergetdate should return consistent values for different timezone. There are
two return path
1. If timezone is servertime, it returns getdate
2. If timezone other then servertime, it use gmstrftime, which returns string and
values with leading zero.
In second case, leading zero's are removed and values are type casted. One major fix
is with yday, getdate returns 0 through 365, whereas %j returns 001 through 366. This
has been fixed as well.
Andrew Davis [Tue, 27 Mar 2012 02:14:23 +0000 (09:14 +0700)]
MDL-26257 grade: fixed the grader report edit mode ajax and fixed a spot in the grader report that should be using get_students_per_page()
Andrew Davis [Sun, 25 Mar 2012 03:01:13 +0000 (10:01 +0700)]
MDL-26275 grade: made the grader report retrieve the existing grades from the DB rather than sending them to the client which then returns them to the server
Andrew Davis [Thu, 1 Mar 2012 02:38:28 +0000 (09:38 +0700)]
MDL-26275 grade: added a safety check to avoid hitting PHP's max_input_var by reducing the number of students per page if necessary
Dan Poltawski [Mon, 30 Apr 2012 01:50:04 +0000 (09:50 +0800)]
Merge branch 'w18_MDL-32627_m23_userajax' of git://github.com/skodak/moodle
Dan Poltawski [Mon, 30 Apr 2012 01:30:24 +0000 (09:30 +0800)]
Merge branch 'MDL-32613' of git://github.com/timhunt/moodle
Sam Hemelryk [Mon, 30 Apr 2012 01:26:38 +0000 (13:26 +1200)]
Merge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/moodle
Sam Hemelryk [Mon, 30 Apr 2012 01:21:54 +0000 (13:21 +1200)]
Merge branch 'master_MDL-32597' of git://github.com/danmarsden/moodle
Sam Hemelryk [Mon, 30 Apr 2012 01:19:56 +0000 (13:19 +1200)]
Merge branch 'MDL-28735-master' of git://github.com/ankitagarwal/moodle
Dan Poltawski [Mon, 30 Apr 2012 01:16:24 +0000 (09:16 +0800)]
Merge branch 'w18_MDL-32651_m23_phpunit6' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:50:38 +0000 (12:50 +1200)]
Merge branch 'MDL-29044-master-3' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:46:48 +0000 (12:46 +1200)]
Merge branch 'MDL-26523_grader' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:33:05 +0000 (12:33 +1200)]
Merge branch 'MDL-31429_paypal_messages' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:26:07 +0000 (12:26 +1200)]
Merge branch 'w18_MDL-32676_m23_yuibootstrap' of git://github.com/skodak/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:16:35 +0000 (12:16 +1200)]
Merge branch 'MDL-19391-master-1' of git://git.luns.net.uk/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:13:00 +0000 (12:13 +1200)]
MDL-31510 grader report: Fixed whitespace
Sam Hemelryk [Mon, 30 Apr 2012 00:11:23 +0000 (12:11 +1200)]
Merge branch 'MDL-31510_group_activities' of git://github.com/andyjdavis/moodle
Sam Hemelryk [Mon, 30 Apr 2012 00:03:01 +0000 (12:03 +1200)]
Merge branch 'MDL-32238-master' of git://github.com/ankitagarwal/moodle
Sam Hemelryk [Sun, 29 Apr 2012 23:57:40 +0000 (11:57 +1200)]
Merge branch 'MDL-32624_master_wip' of git://github.com/grabs/moodle
Dan Marsden [Thu, 19 Apr 2012 04:31:03 +0000 (16:31 +1200)]
MDL-31731 - new grading form - Marking Guide
Petr Skoda [Sun, 29 Apr 2012 17:00:51 +0000 (19:00 +0200)]
MDL-32676 improve YUI init performance via combo loader caching
Petr Skoda [Sun, 29 Apr 2012 16:59:08 +0000 (18:59 +0200)]
MDL-26028 use X-Sendfile for theme images and javascript
Petr Skoda [Sat, 28 Apr 2012 23:16:53 +0000 (01:16 +0200)]
MDL-26028 send_file performance improvements
Includes X-Sendfile support, ETags for stored_files and general cleanup.
Tim Hunt [Fri, 6 Apr 2012 08:27:34 +0000 (09:27 +0100)]
MDL-32357 Try to fix unread post notification for blog-style forums.
I know that showing unread posts is not 100% blog-style, but I think
it is useful functionality, therefore, I chose to fix it, rather than,
say, disable it completely.
I think this fix will only affect blog-style forums since
forum_print_latest_discussions is only called with mode 'plain' in
three places:
1. Blog-style forums - the case we want to fix,
2. Site news forum, and
3. Social course format.
In all cases, having read tracking work properly seems like the
right thing to do.
Petr Skoda [Sat, 28 Apr 2012 16:00:06 +0000 (18:00 +0200)]
MDL-26028 cleanup all IE6 gzip hacks
Petr Skoda [Wed, 25 Apr 2012 07:17:13 +0000 (09:17 +0200)]
MDL-32612 prevent dir creation race condition notices in theme images
Petr Skoda [Wed, 25 Apr 2012 07:14:05 +0000 (09:14 +0200)]
MDL-32612 disable error displaying in theme files and javascript
The correct place to write errors and notices is log, we can let Javascript and binary files to be randomly modified.
Petr Skoda [Wed, 25 Apr 2012 07:08:10 +0000 (09:08 +0200)]
MDL-32612 respect NO_DEBUG_DISPLAY in scripts that need only config.php
Dan Poltawski [Sat, 28 Apr 2012 07:00:37 +0000 (15:00 +0800)]
MDL-32673 ajax: remove legacy debugging info
Mary Evans [Sat, 28 Apr 2012 01:28:37 +0000 (02:28 +0100)]
MDL-28955 theme_nimble: added css rules to display horizontal/vertical-menu-submenu-indicator
Eric Merrill [Fri, 20 Apr 2012 14:08:48 +0000 (10:08 -0400)]
MDL-32012 resource: flaw in restore from moodle 1.9 backups
ppichet [Fri, 27 Apr 2012 18:22:03 +0000 (14:22 -0400)]
MDL-32181 question/calculatedmulti validate multianswers
restructuring the validation function of edit_calculatedmulti_form.php
correcting attempt
defining = new stdClass() before using them : Strict standards
Tim Hunt [Tue, 24 Apr 2012 11:04:06 +0000 (12:04 +0100)]
MDL-32613 qbank: improve print_choose_qtype_to_add_form for contrib modules.
Tim Hunt [Thu, 26 Apr 2012 18:02:43 +0000 (19:02 +0100)]
MDL-3030 quiz overdue handling: allow access to summary during grace period
Tim Hunt [Thu, 26 Apr 2012 09:12:16 +0000 (10:12 +0100)]
MDL-3030 quiz statistics: fix stict syntax problem.
Tim Hunt [Wed, 25 Apr 2012 11:25:06 +0000 (12:25 +0100)]
MDL-3030 quiz overdue handling: cron to update overdue attempts.
Tim Hunt [Tue, 24 Apr 2012 14:01:12 +0000 (15:01 +0100)]
MDL-3030 quiz overdue handling: test state, not timefinish where applicable.
Tim Hunt [Fri, 20 Apr 2012 15:55:52 +0000 (16:55 +0100)]
MDL-3030 quiz overdue handling: ignore responses received much too late.
Tim Hunt [Fri, 20 Apr 2012 15:24:33 +0000 (16:24 +0100)]
MDL-3030 quiz overdue handling: catch the overdue event and send message.
Tim Hunt [Fri, 20 Apr 2012 13:51:15 +0000 (14:51 +0100)]
MDL-3030 quiz overdue handling: back-end code for the new transitions
Tim Hunt [Wed, 18 Apr 2012 18:18:55 +0000 (19:18 +0100)]
MDL-3030 quiz overdue handling: trigger automatic state transitions.
Here, we catch all the places where a student might be accessing their
own attempts, and make sure any automatic state transitions that
should happen, do happen, before the student sees the attempt.
The places where we need to check this are view.php, startattempt.php
and processattempt.php.
We do not really need to check attempt.php or summary.php, because if
the student is on one of those pages, the JavaScript timer will
auto-submit when time expires, taking them to processattempt.php,
which will do the acutal work.
We intentionally do not trigger state transition when a teacher is
looking at a student's quiz attemp. We will trigger state transitions
on cron, but that is still to do.
Also, the body of the process_... methods still needs to be written.
Tim Hunt [Wed, 18 Apr 2012 13:38:00 +0000 (14:38 +0100)]
MDL-3030 quiz overdue handling: show the attempt state in the reports.
Tim Hunt [Wed, 16 Nov 2011 16:48:51 +0000 (16:48 +0000)]
MDL-3030 quiz overdue handling: only finished attempts in stats.
Tim Hunt [Wed, 16 Nov 2011 16:42:38 +0000 (16:42 +0000)]
MDL-3030 quiz overdue handling: show attempt state in the reports.
Tim Hunt [Wed, 16 Nov 2011 16:37:14 +0000 (16:37 +0000)]
MDL-3030 quiz overdue handling: show attempt state on the review page.
Tim Hunt [Tue, 15 Nov 2011 17:25:26 +0000 (17:25 +0000)]
MDL-3030 quiz overdue handling: display message on the summary page.
This change also includes a clean-up of how we display and initialise the countdown timer.
Tim Hunt [Mon, 14 Nov 2011 15:35:46 +0000 (15:35 +0000)]
MDL-3030 quiz overdue handling: show attempt state on the view page
Tim Hunt [Thu, 10 Nov 2011 18:39:33 +0000 (18:39 +0000)]
MDL-3030 quiz overdue handling: backup and restore new settings.
Tim Hunt [Thu, 10 Nov 2011 18:32:34 +0000 (18:32 +0000)]
MDL-3030 quiz overdue handling: new capability