moodle.git
9 years agoMDL-32774: Require sesskey for all actions in the assignment upgrade tool
Damyon Wiese [Fri, 4 May 2012 06:36:06 +0000 (14:36 +0800)]
MDL-32774: Require sesskey for all actions in the assignment upgrade tool

9 years agoweekly release 2.3dev
Eloy Lafuente (stronk7) [Fri, 4 May 2012 11:10:40 +0000 (13:10 +0200)]
weekly release 2.3dev

9 years agoMerge branch 'install_master' of git://github.com/amosbot/moodle
Eloy Lafuente (stronk7) [Fri, 4 May 2012 11:06:42 +0000 (13:06 +0200)]
Merge branch 'install_master' of git://github.com/amosbot/moodle

9 years agoMDL-31731 gradeing form: Fix module name
Dan Marsden [Fri, 4 May 2012 08:05:29 +0000 (20:05 +1200)]
MDL-31731 gradeing form: Fix module name

9 years agoMDL-31731 Advanced Grading: Marking Guide - prevent negative scores when marking...
Dan Marsden [Fri, 4 May 2012 07:26:16 +0000 (19:26 +1200)]
MDL-31731 Advanced Grading: Marking Guide - prevent negative scores when marking users

9 years agoMerge branch 'MDL-32754' of git://github.com/netspotau/moodle-mod_assign
Eloy Lafuente (stronk7) [Fri, 4 May 2012 08:01:07 +0000 (10:01 +0200)]
Merge branch 'MDL-32754' of git://github.com/netspotau/moodle-mod_assign

9 years agoMDL-31731 gradeing form: Fix hardcoded module name
Dan Poltawski [Fri, 4 May 2012 06:02:39 +0000 (14:02 +0800)]
MDL-31731 gradeing form: Fix hardcoded module name

9 years agoMDL-32508 Add error when trying to access an unknown course section
Andrew Robert Nicols [Thu, 3 May 2012 14:02:10 +0000 (15:02 +0100)]
MDL-32508 Add error when trying to access an unknown course section

9 years agoMDL-32508 Trivial whitespace cleanup
Sam Hemelryk [Fri, 4 May 2012 05:13:36 +0000 (17:13 +1200)]
MDL-32508 Trivial whitespace cleanup

9 years agoMDL-32754: Add missing string for assign:addinstance capability
Damyon Wiese [Fri, 4 May 2012 04:05:58 +0000 (12:05 +0800)]
MDL-32754: Add missing string for assign:addinstance capability

AMOS BEGIN
    CPY [assignment:addinstance,mod_assignment],[assign:addinstance,mod_assign]
AMOS END

9 years agoMDL-32508 backup: coursedisplay now included in backup
Dan Poltawski [Fri, 4 May 2012 03:00:53 +0000 (11:00 +0800)]
MDL-32508 backup: coursedisplay now included in backup

9 years agoMDL-32508 Close the topic/week ul before showing the add section link
Andrew Robert Nicols [Thu, 3 May 2012 11:38:31 +0000 (12:38 +0100)]
MDL-32508 Close the topic/week ul before showing the add section link

9 years agoMDL-32508 course formats: make renderer methods protected
Dan Poltawski [Thu, 3 May 2012 11:09:02 +0000 (19:09 +0800)]
MDL-32508 course formats: make renderer methods protected

The renderer isn't a public API yet, its just reducing code duplication
and tidying things up. So not making the methods public for other plugins
to abuse. We hope to solve this properly in 2.4

9 years agoMDL-32508 course_formats: change format_renderer_base to format_section_renderer_base
Dan Poltawski [Thu, 3 May 2012 11:04:46 +0000 (19:04 +0800)]
MDL-32508 course_formats: change format_renderer_base to format_section_renderer_base

Make it clear that this isn't a golden supported API

9 years agoMDL-32505 course_formats: introduce upgrade.txt
Dan Poltawski [Thu, 3 May 2012 11:00:40 +0000 (19:00 +0800)]
MDL-32505 course_formats: introduce upgrade.txt

9 years agoMDL-32508 course_format: fix up some minor style issues
Dan Poltawski [Thu, 3 May 2012 10:43:26 +0000 (18:43 +0800)]
MDL-32508 course_format: fix up some minor style issues

Noticed whilst reviewing again

9 years agoMDL-32508 Remove debuggign warning about callback_format_get_section_url
Dan Poltawski [Thu, 3 May 2012 10:30:18 +0000 (18:30 +0800)]
MDL-32508 Remove debuggign warning about callback_format_get_section_url

It is not the time to deprecate this callback as we may be doing
major changes in 2.4 so removing the warning about it.

9 years agoMDL-32505 lib/tests: fix unit test using removed table
Dan Poltawski [Thu, 3 May 2012 10:13:46 +0000 (18:13 +0800)]
MDL-32505 lib/tests: fix unit test using removed table

9 years agoMDL-32505/MDL-32508 course: fix section_links block
Dan Poltawski [Mon, 30 Apr 2012 07:05:02 +0000 (15:05 +0800)]
MDL-32505/MDL-32508 course: fix section_links block

Now course_display has gone

9 years agoMDL-32508 navigation: show empty sections
Dan Poltawski [Mon, 30 Apr 2012 03:46:15 +0000 (11:46 +0800)]
MDL-32508 navigation: show empty sections

9 years agoMDL-32508 course/format: Display general section above title
Dan Poltawski [Mon, 30 Apr 2012 04:16:55 +0000 (12:16 +0800)]
MDL-32508 course/format: Display general section above title

9 years agoMDL-32508 course/format: Hide 'format outline' titles
Dan Poltawski [Mon, 30 Apr 2012 04:15:11 +0000 (12:15 +0800)]
MDL-32508 course/format: Hide 'format outline' titles

It is now hidden for for accessibility only

9 years agoMDL-32508 course/format: Only display topic number in topic format
Dan Poltawski [Mon, 30 Apr 2012 04:14:15 +0000 (12:14 +0800)]
MDL-32508 course/format: Only display topic number in topic format

9 years agoMDL-32508 course: turn editting on/off stays on current page
Dan Poltawski [Mon, 30 Apr 2012 03:23:37 +0000 (11:23 +0800)]
MDL-32508 course: turn editting on/off stays on current page

Rather than always going to the index page, we can edit on section page

9 years agoMDL-32508 course: Add basic 'add a section' button at the bottom of the course page
Dan Poltawski [Mon, 21 Nov 2011 15:11:35 +0000 (15:11 +0000)]
MDL-32508 course: Add basic 'add a section' button at the bottom of the course page

With thanks to LUNS who provided this code from when I did it working
there.

9 years agoMDL-32508 course/formats: Respect single page course display mode
Dan Poltawski [Fri, 27 Apr 2012 05:11:35 +0000 (13:11 +0800)]
MDL-32508 course/formats: Respect single page course display mode

Topics and weeks have been converted to use a shared renderer to output
their content.

Note, I started with good intentions but this renderer has mixed
paradgims due to fast and cheap winning out on the trinity.

AMOS BEGIN
   MOV [currenttopic,access],[currentsection,format_topics]
   MOV [currentweek,access],[currentsection,format_weeks]
AMOS END

9 years agoMDL-32508 course: make_editting_buttons now takes optionally returns to section
Dan Poltawski [Sat, 28 Apr 2012 05:56:35 +0000 (13:56 +0800)]
MDL-32508 course: make_editting_buttons now takes optionally returns to section

9 years agoMDL-32508 course/mod.php: Use $sectionreturn param
Dan Poltawski [Sat, 28 Apr 2012 06:04:39 +0000 (14:04 +0800)]
MDL-32508 course/mod.php: Use  $sectionreturn param

This param is now used so that users are returned to the
page they started at

9 years agoMDL-32508 course/editsection: add a sectionreturn param
Dan Poltawski [Sat, 28 Apr 2012 05:52:49 +0000 (13:52 +0800)]
MDL-32508 course/editsection: add a sectionreturn param

This is used so that when editing on a section page you
are returned to the section in question.

9 years agoMDL-32508 course: deprecate get_section_url format callback
Dan Poltawski [Fri, 27 Apr 2012 01:36:37 +0000 (09:36 +0800)]
MDL-32508 course: deprecate get_section_url format callback

9 years agoMDL-32508 course formats: Remove key callback
Dan Poltawski [Thu, 26 Apr 2012 13:53:25 +0000 (21:53 +0800)]
MDL-32508 course formats: Remove key callback

This was used by course formats but now there is a standardised
'section' param

9 years agoMDL-32508 course: Introduce course_get_url()
Dan Poltawski [Thu, 26 Apr 2012 13:36:02 +0000 (21:36 +0800)]
MDL-32508 course: Introduce course_get_url()

9 years agoMDL-32508 course: Switch to 'section' URL param
Dan Poltawski [Thu, 26 Apr 2012 12:49:36 +0000 (20:49 +0800)]
MDL-32508 course: Switch to 'section' URL param

This is a course format independent url param and replaces weekly/topic specific params.
By using a standardised param we are able to use this url consistenly across the codebase
and reduce the risk of param collision

9 years agoMDL-32508 course/view.php: action cleanup
Dan Poltawski [Sat, 28 Apr 2012 05:47:02 +0000 (13:47 +0800)]
MDL-32508 course/view.php: action cleanup

After doing actions redirect back to the 'real url' in order to
prevent problems with caching/bookmarking bad urls

9 years agoMDL-32508 course/view.php: moderise with MUST_EXIST
Dan Poltawski [Sun, 22 Apr 2012 02:57:41 +0000 (10:57 +0800)]
MDL-32508 course/view.php: moderise with MUST_EXIST

9 years agoMDL-32505 course formats: zooming feature be gone!
Dan Poltawski [Mon, 23 Apr 2012 13:17:41 +0000 (21:17 +0800)]
MDL-32505 course formats: zooming feature be gone!

9 years agoMDL-32505 course: drop course_display table and settings
Dan Poltawski [Mon, 23 Apr 2012 13:48:17 +0000 (21:48 +0800)]
MDL-32505 course: drop course_display table and settings

9 years agoMDL-32504 course: Add coursedisplay setting to course table
Dan Poltawski [Mon, 23 Apr 2012 12:25:12 +0000 (20:25 +0800)]
MDL-32504 course: Add coursedisplay setting to course table

This will replace the course_display database table

9 years agoMDL-32628 lib/filelib.php: Set user profile image expires to 1 year
Dan Poltawski [Fri, 4 May 2012 01:36:11 +0000 (09:36 +0800)]
MDL-32628 lib/filelib.php: Set user profile image expires to 1 year

This is to reduce the performance impact of user profile images
requests. Pictures are now referenced by a revision counter so
any changes in picture will not be badly cached any longer.

9 years agoMerge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle
Dan Poltawski [Fri, 4 May 2012 01:28:41 +0000 (09:28 +0800)]
Merge branch 'w18_MDL-32628_m23_avatarperf2' of git://github.com/skodak/moodle

Conflicts:
    lib/db/upgrade.php
version.php

9 years agoMerge branch 'MDL-32757' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 3 May 2012 23:30:45 +0000 (07:30 +0800)]
Merge branch 'MDL-32757' of git://github.com/timhunt/moodle

9 years agoMerge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle
Dan Poltawski [Thu, 3 May 2012 23:28:29 +0000 (07:28 +0800)]
Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle

9 years agoMDL-31731 Advanced Grading: Marking Guide display scale warning for higher max grade...
Dan Marsden [Thu, 3 May 2012 21:33:30 +0000 (09:33 +1200)]
MDL-31731 Advanced Grading: Marking Guide display scale warning for higher max grade as well as lower.

9 years agoMDL-31731 Advanced Grading: Marking Guide: fix bug with check to display warning...
Dan Marsden [Thu, 3 May 2012 21:12:29 +0000 (09:12 +1200)]
MDL-31731 Advanced Grading: Marking Guide: fix bug with check to display warning about discrepency between module maxgrade and number of marks in Marking Guide.

9 years agoMDL-32757 / MDL-3030 quiz: SQL typo breaks quiz editing.
Tim Hunt [Thu, 3 May 2012 18:45:18 +0000 (19:45 +0100)]
MDL-32757 / MDL-3030 quiz: SQL typo breaks quiz editing.

9 years agoMerge branch 'MDL-32738' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 3 May 2012 17:09:53 +0000 (01:09 +0800)]
Merge branch 'MDL-32738' of git://github.com/timhunt/moodle

9 years agoMDL-32738 quiz overdue handling cron: appease MySQL.
Tim Hunt [Thu, 3 May 2012 14:56:56 +0000 (15:56 +0100)]
MDL-32738 quiz overdue handling cron: appease MySQL.

Thanks to sam marshall for giving my the idea of using a subquery to
make the SQL work on all DBs.

9 years agoMerge branch 'MDL-32740' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 3 May 2012 16:58:00 +0000 (00:58 +0800)]
Merge branch 'MDL-32740' of git://github.com/timhunt/moodle

9 years agoMerge branch 'MDL-32693' of git://github.com/danpoltawski/moodle
Eloy Lafuente (stronk7) [Thu, 3 May 2012 16:22:05 +0000 (18:22 +0200)]
Merge branch 'MDL-32693' of git://github.com/danpoltawski/moodle

9 years agoMDL-32680 import latest TinyMCE 3.5
Petr Skoda [Thu, 3 May 2012 13:49:23 +0000 (15:49 +0200)]
MDL-32680 import latest TinyMCE 3.5

9 years agoMerge branch 'MDL-32739' of git://github.com/timhunt/moodle
Dan Poltawski [Thu, 3 May 2012 13:23:19 +0000 (21:23 +0800)]
Merge branch 'MDL-32739' of git://github.com/timhunt/moodle

9 years agoMerge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle
Dan Poltawski [Thu, 3 May 2012 12:43:28 +0000 (20:43 +0800)]
Merge branch 'master_MDL-31731' of git://github.com/danmarsden/moodle

9 years agoMDL-32740 / MDL-3030 quiz summary: no Return to attempt for overdue.
Tim Hunt [Thu, 3 May 2012 11:16:43 +0000 (12:16 +0100)]
MDL-32740 / MDL-3030 quiz summary: no Return to attempt for overdue.

9 years agoMDL-32739 quiz reports: process_actions broken. Regression from MDL-3030
Tim Hunt [Thu, 3 May 2012 11:02:29 +0000 (12:02 +0100)]
MDL-32739 quiz reports: process_actions broken. Regression from MDL-3030

9 years agoMerge branch 'w18_MDL-32697_m23_oci' of git://github.com/skodak/moodle
Eloy Lafuente (stronk7) [Thu, 3 May 2012 10:22:22 +0000 (12:22 +0200)]
Merge branch 'w18_MDL-32697_m23_oci' of git://github.com/skodak/moodle

9 years agoMDL-31731 Grading form Marking Guide - fix for test 6.2, checkboxes not saving state...
Dan Marsden [Thu, 3 May 2012 10:12:34 +0000 (22:12 +1200)]
MDL-31731 Grading form Marking Guide - fix for test 6.2, checkboxes not saving state when clearing both.

9 years agoMDL-31270 pluginlib: Add assign subplugins as standard modules
Dan Poltawski [Thu, 3 May 2012 09:21:49 +0000 (17:21 +0800)]
MDL-31270 pluginlib: Add assign subplugins as standard modules

9 years agoMDL-31270 mod_assign: now added to the standard plugin list
Dan Poltawski [Thu, 3 May 2012 09:11:38 +0000 (17:11 +0800)]
MDL-31270 mod_assign: now added to the standard plugin list

9 years agoMDL-32697 use current database sequences instead of global scope
Petr Skoda [Thu, 3 May 2012 08:52:19 +0000 (10:52 +0200)]
MDL-32697 use current database sequences instead of global scope

Credit goes to Eloy, thanks!

9 years agoMDL-31270 mod_assign: version dump
Dan Poltawski [Thu, 3 May 2012 08:42:51 +0000 (16:42 +0800)]
MDL-31270 mod_assign: version dump

Introduce depdency from assignmentupgrade to mod_assign

9 years agoMDL-31270 mod_assign: Fix another whitespace issue.
Dan Poltawski [Thu, 3 May 2012 08:35:06 +0000 (16:35 +0800)]
MDL-31270 mod_assign: Fix another whitespace issue.

Seems I didn't catch them all :(

9 years agoMerge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/moodle
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

9 years agoMDL-31270 mod_assign: fix another whitespace issue
Dan Poltawski [Thu, 3 May 2012 08:10:16 +0000 (16:10 +0800)]
MDL-31270 mod_assign: fix another whitespace issue

9 years agoMDL-31270: mod_assign fix whitespace issues
Dan Poltawski [Thu, 3 May 2012 08:05:58 +0000 (16:05 +0800)]
MDL-31270: mod_assign fix whitespace issues

9 years agoMDL-32587 fix --buildcomponentconfigs compatibility with Windows
Petr Skoda [Thu, 3 May 2012 07:34:35 +0000 (09:34 +0200)]
MDL-32587 fix --buildcomponentconfigs compatibility with Windows

9 years agoMDL-31270 mod_assign: introducing the assignment module
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

9 years agoMerge branch 'wip-MDL-32416-master' of git://github.com/marinaglancy/moodle
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

9 years agoMDL-32416: Picasa repository now returns path, also fixed album title retrieval
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

9 years agoAutomatically generated installer lang files
AMOS bot [Thu, 3 May 2012 00:31:27 +0000 (00:31 +0000)]
Automatically generated installer lang files

9 years agoMDL-32234 Library: usergetdate tests moved to assertSame()
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)

9 years agoMerge branch 'wip-mdl-32234' of git://github.com/rajeshtaneja/moodle
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

9 years agoMerge branch 'MDL-32638-workshop-files' of git://github.com/mudrd8mz/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

9 years agoMDL-32638 fixing the area names and file_browser::get_file_info() API call
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

9 years agoMerge branch 'MDL-32657-master-2' of git://git.luns.net.uk/moodle
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

9 years agoMDL-32657: Add format.js for topics format and remove default
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

9 years agoMDL-32721 quiz: missing message provider lang string from MDL-3030
Tim Hunt [Wed, 2 May 2012 07:19:06 +0000 (08:19 +0100)]
MDL-32721 quiz: missing message provider lang string from MDL-3030

9 years agoMerge branch 'MDL-28657-master' of https://github.com/mackensen/moodle
Aparup Banerjee [Wed, 2 May 2012 05:55:39 +0000 (13:55 +0800)]
Merge branch 'MDL-28657-master' of https://github.com/mackensen/moodle

9 years agoMerge branch 'MDL-31762' of git://github.com/mouneyrac/moodle
Sam Hemelryk [Wed, 2 May 2012 05:52:13 +0000 (17:52 +1200)]
Merge branch 'MDL-31762' of git://github.com/mouneyrac/moodle

9 years agoMerge branch 'MDL-26275_large_grader' of git://github.com/andyjdavis/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

9 years agoMerge branch 'MDL-32657-master-1' of git://git.luns.net.uk/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

9 years agoMerge branch 'w18_MDL-26028_m23_xsendfile' of git://github.com/skodak/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

9 years agoMerge branch 'w18_MDL-32595_m23_unsignedandlob' 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

9 years agoMDL-32697 improve MySQL and Oracle test reset performance
Petr Skoda [Tue, 1 May 2012 12:35:23 +0000 (14:35 +0200)]
MDL-32697 improve MySQL and Oracle test reset performance

9 years agoMDL-13130 webservices: Implementation of core_course_delete_courses
Juan Leyva [Wed, 18 Apr 2012 08:08:24 +0000 (10:08 +0200)]
MDL-13130 webservices: Implementation of core_course_delete_courses

9 years agoMDL-32693 webservice: fix typo in URL
Dan Poltawski [Tue, 1 May 2012 04:25:13 +0000 (12:25 +0800)]
MDL-32693 webservice: fix typo in URL

9 years agoMDL-26275 grade: made some equality checks more strict and added some explanatory...
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

9 years agoMerge branch 'w18_MDL-30686_m23_guessurl' of git://github.com/skodak/moodle
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

9 years agoMerge branch 'MDL-27508-workshop-groups' of git://github.com/mudrd8mz/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

9 years agoMerge branch 'MDL-30986-attempt2' of git://github.com/mouneyrac/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

9 years agoMerge branch 'MDL-32181' of https://github.com/ppichet/moodle
Dan Poltawski [Tue, 1 May 2012 02:30:43 +0000 (10:30 +0800)]
Merge branch 'MDL-32181' of https://github.com/ppichet/moodle

9 years agoMerge branch 'w18_MDL-19071_m23_unicode' of git://github.com/skodak/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

9 years agoMerge branch 'w18_MDL-32586_m23_glibciconv' 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

9 years agoMerge branch 'MDL-32009-master-3' of git://git.luns.net.uk/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

9 years agoMerge branch 'w18_MDL-32587_m23_phpunitindividual' of git://github.com/skodak/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

9 years agoMerge branch 'w18_MDL-32607_m23_upgrade2' 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

9 years agoMerge branch 'w18_MDL-32612_m23_debug' 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

9 years agoMerge branch 'w18_MDL-32640_m23_forumstrict' 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

9 years agoMerge branch 'MDL-28955_master' of git://github.com/lazydaisy/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

9 years agoMDL-32012 Fixed white space
Sam Hemelryk [Tue, 1 May 2012 00:38:37 +0000 (12:38 +1200)]
MDL-32012 Fixed white space

9 years agoMerge branch 'MDL-32012' of git://github.com/merrill-oakland/moodle
Sam Hemelryk [Tue, 1 May 2012 00:37:59 +0000 (12:37 +1200)]
Merge branch 'MDL-32012' of git://github.com/merrill-oakland/moodle